yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
31406 Commits
Author SHA1 Message Date
KCaverly 1cf52fdeae small window change 2023-10-31 10:50:28 -04:00
KCaverly 0384a0c7b3 wip progress 2023-10-31 10:49:51 -04:00
Conrad Irwin 801b81d06f Call flush_effects in test context update() 
In gpui1 we used to do this even outside of top-level contexts, but not
sure we should make tests work that differently to the main app.
 2023-10-31 14:24:12 +00:00
KCaverly 60b85d6219 wip 2023-10-31 10:12:40 -04:00
KCaverly 1456ebb218 wip 2023-10-31 10:04:04 -04:00
KCaverlyandKirill dfd672953c dock compiling with todos outstanding 
Co-Authored-By: Kirill <kirill@zed.dev>
 2023-10-31 09:25:36 -04:00
Conrad Irwin 78f2ea9ec1 Fix entity map drop behavior 
The entity map needs to be able to distinguish between the case when
the entity_id is waiting to be dropped, and when it is completely gone.

Before 04cd2fa75, it assumed that entity_ids in dropped_entity_ids could
be re-used. This caused `take_dropped` to error because the slot had
been overwritten. The fix there caused weak handles to allow upgrading
a reference count from 0, which could resurrect items in
`dropped_entity_ids` which caused them to be dropped twice.

We could allow weak items to upgrade from 0, and delete from
dropped_entity_ids, but that seemed more complicated than necessary.
 2023-10-31 13:09:35 +00:00
Antonio Scandurra 87b6acb941 WIP 2023-10-31 14:04:59 +01:00
Antonio Scandurra ae251b346a WIP: Make the item module compile again 2023-10-31 13:56:48 +01:00
Antonio Scandurra bb36c30456 Allow WeakView<T> to be hashed and compared 2023-10-31 13:34:54 +01:00
Antonio Scandurra 9d997f3a8c Allow View<T> to be hashed and compared 2023-10-31 13:34:29 +01:00
Antonio Scandurra e8773891f7 Introduce {Window,View}Context::defer 2023-10-31 13:17:05 +01:00
Kirill Bulatov 32784226d7 Remove TODOs 2023-10-31 13:08:18 +02:00
Antonio Scandurra 7be4861efe WIP 2023-10-31 11:56:55 +01:00
Kirill Bulatov b4ca92ca83 Fix prettier errors around Zed's settings.json/keymap.json files 
Ports https://github.com/zed-industries/zed/pull/3191 to zed2

Deals with zed-industries/community#2191
Fix Zed starting too many prettier installations in the beginning, and not being able to format the config files.
 2023-10-31 12:26:49 +02:00
Kirill Bulatov e90fb81ac1 Fix prettier errors around Zed's settings.json/keymap.json files (#3191) 
Deals with https://github.com/zed-industries/community/issues/2191

Fix Zed starting too many prettier installations in the beginning, and
not being able to format the config files.

Release Notes:

- Fixed prettier not being able to format Zed's config files and spawning excessive prettier installations
 2023-10-31 12:05:32 +02:00
Kirill Bulatov 90df9c22d0 Enqueue default prettier installations 2023-10-31 11:54:40 +02:00
Antonio Scandurra c50d9d1b4e Merge branch 'zed2' into zed2-workspace 2023-10-31 10:20:03 +01:00
Antonio Scandurra e4877fa064 Zed2 entities (#3189) 
Adds an `Entity` trait for abstracting over `View`s and `Model`s, and
implements it for the `subscribe()` and `observe()` APIs.

The last commit also includes a fun experiment I added, using the
`Result` type to return the owned model handles back to the caller in
the case of downcast failure, inspired by the `binary_search*` methods.
 2023-10-31 10:11:25 +01:00
Kirill Bulatov 33f5f5f42b Only process diagnostics if corresponding project is alive 
Part of https://github.com/zed-industries/zed/pull/3128 that is possible
to apply now.
 2023-10-31 10:40:49 +02:00
Julia 6e45e454ff Port zed/src/languages to zed2 2023-10-30 21:52:29 -04:00
Mikayla 1b2f9c6eec experiment with a way to recover the any entities when downcasting fails 2023-10-30 18:08:38 -07:00
Mikayla f9657a8660 Change model to downcast with ownership 2023-10-30 18:00:37 -07:00
Mikayla c9e77d2918 Add the entity trait and implement for models, views, subscriptions, and observations 2023-10-30 17:50:21 -07:00
Mikayla 0244be8819 Merge branch 'zed2' into zed2-workspace 2023-10-30 16:53:21 -07:00
Max Brunsfeld d3fd1731fa Merge branch 'zed2-render' into zed2 2023-10-30 15:37:00 -07:00
Max Brunsfeld 8910cb29c2 Add missing dev-dependency feature for editor multi_buffer dependency 2023-10-30 15:32:52 -07:00
Max BrunsfeldNathan SoboMikaylaAntonio
 		badfb586e6 Introduce a Render trait, make views implement it 
Don't pass a render function separately from the view.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Antonio <as-cii@zed.dev>
 2023-10-30 15:19:40 -07:00
Joseph T. Lyons 244378be87 Port PR #3131 to zed2 (#3187) 
Part of: 

- https://github.com/zed-industries/zed/pull/3174

Release Notes:

- N/A
 2023-10-30 17:47:00 -04:00
Marshall Bowers 9f328318bc Tweak style for color scale story 2023-10-30 17:45:37 -04:00
Joseph T. Lyons f12c384d4c Port PR #3131 to zed2 2023-10-30 17:41:26 -04:00
Marshall Bowers eb51192664 theme2: Correctly reference the dark alpha scale 2023-10-30 17:35:13 -04:00
Marshall Bowers a921e7ab06 Merge branch 'theme-color-scales' into zed2 2023-10-30 17:31:51 -04:00
Marshall Bowers 61b3fcafcf Add a story showcasing the color scales 2023-10-30 17:31:15 -04:00
Marshall Bowers d673be04ed Fix alpha channel values for color scales 2023-10-30 17:20:43 -04:00
Marshall Bowers 95cb0ad4d6 Add type alias for steps in color scales 2023-10-30 17:08:37 -04:00
Marshall Bowers a24b93badc Register all of the color scales 2023-10-30 17:03:33 -04:00
Marshall Bowers 87b7f9ffb0 Define all color scales 2023-10-30 17:00:46 -04:00
Kirill Bulatov e431b20d39 Return proper full paths for single file workspaces 2023-10-30 22:33:44 +02:00
Kirill Bulatov c5d357890a Start message numbering during prettier init, log error message text 2023-10-30 22:26:06 +02:00
Marshall Bowers 0dfa1839d6 Start work on defining color scales 2023-10-30 16:21:59 -04:00
KCaverly 9d0f7e4925 update prettier2, call2 and project2 to use fs2 2023-10-30 16:21:58 -04:00
Kirill Bulatov 7031d548f9 Remember default prettier and its plugin installation 2023-10-30 22:09:36 +02:00
Antonio Scandurra 2680820a95 WIP 2023-10-30 20:36:48 +01:00
Kyle Caverly ba5d486706 port ai to zed2 (#3186) 
port ai to zed2
 2023-10-30 20:09:49 +01:00
KCaverly f3a081158c updated for model handle rename 2023-10-30 15:04:16 -04:00
Antonio ScandurraMaxMikayla
 		2a8cdf3638 Rename other references from "handle" to "model" 
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Mikayla <mikayla@zed.dev>
 2023-10-30 19:54:32 +01:00
KCaverly 5b9e284984 keeping this bad boy green during fmt checks 2023-10-30 14:49:31 -04:00
Marshall Bowers 8fc8f80403 Remove old theme constructs 2023-10-30 14:47:44 -04:00
KCaverly db45e39e18 Merge branch 'zed2' of github.com:zed-industries/zed into zed2-ai 2023-10-30 14:47:13 -04:00