oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,839 Commits 1 Branch 0 Tags
94293b3bf92fb5a85eb28f157f17052d41bf526e
Commit Graph
16839 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
KCaverlyandKirill 8d0905e479 dock compiling with todos outstanding 
Co-Authored-By: Kirill <kirill@zed.dev>
 2023-10-31 09:25:36 -04:00
Conrad Irwin 3e5379526e 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 8bc207141, 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 bbe2dd1f8f WIP 2023-10-31 14:04:59 +01:00
Antonio Scandurra 14a6199b4b WIP: Make the item module compile again 2023-10-31 13:56:48 +01:00
Antonio Scandurra e8eea52d0f Allow WeakView<T> to be hashed and compared 2023-10-31 13:34:54 +01:00
Antonio Scandurra 46a99c5c41 Allow View<T> to be hashed and compared 2023-10-31 13:34:29 +01:00
Antonio Scandurra 163fa3ff16 Introduce {Window,View}Context::defer 2023-10-31 13:17:05 +01:00
Kirill Bulatov 6a3974ddbb Remove TODOs 2023-10-31 13:08:18 +02:00
Antonio Scandurra 538a9e1392 WIP 2023-10-31 11:56:55 +01:00
Kirill Bulatov 84c5494949 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 45e695c906 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 6ee9beed73 Enqueue default prettier installations 2023-10-31 11:54:40 +02:00
Antonio Scandurra 00c92ae407 Merge branch 'zed2' into zed2-workspace 2023-10-31 10:20:03 +01:00
Antonio Scandurra 88875fd006 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 c98a811c0b 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 bcf3bac168 Port zed/src/languages to zed2 (#3190) 
@SomeoneToIgnore I had to port
https://github.com/zed-industries/zed/pull/3150 to zed2 in the process,
giving you a heads-up
 2023-10-30 22:04:54 -04:00
Julia db34de6be4 Port zed/src/languages to zed2 2023-10-30 21:52:29 -04:00
Mikayla f5b13071f1 experiment with a way to recover the any entities when downcasting fails 2023-10-30 18:08:38 -07:00
Mikayla 6f1197e00c Change model to downcast with ownership 2023-10-30 18:00:37 -07:00
Mikayla 327a2f9967 Add the entity trait and implement for models, views, subscriptions, and observations 2023-10-30 17:50:21 -07:00
Mikayla 3dadfb8ba8 Merge branch 'zed2' into zed2-workspace 2023-10-30 16:53:21 -07:00
Max Brunsfeld 58446c2715 Merge branch 'zed2-render' into zed2 2023-10-30 15:37:00 -07:00
Max Brunsfeld d6abd8a2b4 Add missing dev-dependency feature for editor multi_buffer dependency 2023-10-30 15:32:52 -07:00
Max BrunsfeldNathan SoboMikaylaAntonio
 		30dffbb409 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 f33fc1b6fa Remove print statement 2023-10-30 18:14:04 -04:00
Joseph T. Lyons d219ddbdaf Add script to get crate-level completion status 2023-10-30 18:13:18 -04:00
Joseph T. Lyons b76ce65a63 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 607813e646 Tweak style for color scale story 2023-10-30 17:45:37 -04:00
Joseph T. Lyons 613afd3f66 Port PR #3131 to zed2 2023-10-30 17:41:26 -04:00
Marshall Bowers 49571127da theme2: Correctly reference the dark alpha scale 2023-10-30 17:35:13 -04:00
Marshall Bowers 609836397b Merge branch 'theme-color-scales' into zed2 2023-10-30 17:31:51 -04:00
Marshall Bowers a02d806715 Add a story showcasing the color scales 2023-10-30 17:31:15 -04:00
Marshall Bowers 991f58409e Fix alpha channel values for color scales 2023-10-30 17:20:43 -04:00
Marshall Bowers e0f68c77b0 Add type alias for steps in color scales 2023-10-30 17:08:37 -04:00
Marshall Bowers b128377cd2 Register all of the color scales 2023-10-30 17:03:33 -04:00
Marshall Bowers ccccf84867 Define all color scales 2023-10-30 17:00:46 -04:00
Kirill Bulatov fd6f6cc9f8 Return proper full paths for single file workspaces 2023-10-30 22:33:44 +02:00
Kirill Bulatov 29a32039ba Start message numbering during prettier init, log error message text 2023-10-30 22:26:06 +02:00
Marshall Bowers 7841a56a11 Start work on defining color scales 2023-10-30 16:21:59 -04:00
KCaverly b34f0c3bee update prettier2, call2 and project2 to use fs2 2023-10-30 16:21:58 -04:00
Kirill Bulatov 033d0ae610 Remember default prettier and its plugin installation 2023-10-30 22:09:36 +02:00
Antonio Scandurra 0128079de0 WIP 2023-10-30 20:36:48 +01:00
Marshall Bowers 78573fb140 Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-30 15:17:16 -04:00
Marshall Bowers 942167e046 Format ui2 2023-10-30 15:17:11 -04:00
Kyle Caverly 0efbc81b0f port ai to zed2 (#3186) 
port ai to zed2
 2023-10-30 20:09:49 +01:00
KCaverly c17b246bac updated for model handle rename 2023-10-30 15:04:16 -04:00
Antonio ScandurraMaxMikayla
 		bc4f8fbf4e 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 5ff70f7dba keeping this bad boy green during fmt checks 2023-10-30 14:49:31 -04:00
Marshall Bowers ba789fc0c4 Remove old theme constructs 2023-10-30 14:47:44 -04:00
KCaverly d5077d9d0c Merge branch 'zed2' of github.com:zed-industries/zed into zed2-ai 2023-10-30 14:47:13 -04:00