oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,317 Commits 1 Branch 0 Tags
8db6b78fddb062ccb6b097792c28da375f949555
Commit Graph
13317 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Conrad Irwin 8db6b78fdd Implement start/finish waiting for gpui2 
I'm not sure these are strictly necessary, but it will make porting
tests easier to have them.
 2023-10-31 16:14:10 +00:00
Conrad Irwin 0e9a82711c Actually deliver test events to subscribers 2023-10-31 16:04:33 +00:00
Conrad Irwin 81f8e81e48 Fix block to allow for sync progress 2023-10-31 15:57:01 +00:00
Conrad Irwin b8e007c6ec 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
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
Conrad Irwin adc426b668 v1 2023-10-26 18:19:57 +02:00
Marshall Bowers 452006560e Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-26 17:14:49 +02:00
Marshall Bowers ed233d583f ui2: Remove ElementExt trait 2023-10-26 15:59:18 +02:00
Max BrunsfeldandConrad b3ad8c1c3e Get most of the language2 tests passing 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-10-26 15:57:12 +02:00
Max BrunsfeldandConrad 3cc91e5742 Add missing seed variable for gpui2 test macro 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-10-26 15:57:12 +02:00
Marshall Bowers 6784ccd9fe Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-26 15:54:48 +02:00
Marshall Bowers 1887f3b594 Rename S type to V 2023-10-26 15:54:43 +02:00
Max BrunsfeldandConrad 8bc2071414 Fix gpui2 bugs 
* Compile error for tests that take StdRng
* Dynamic type dowcasting error when emitting events
* Slot error when dropping handles

Co-authored-by: Conrad <conrad@zed.dev>
 2023-10-26 15:54:19 +02:00
Antonio Scandurra 58e8012d8c Make zed2 compile again 2023-10-26 15:45:30 +02:00
Marshall Bowers 8a70ef3e8f Remove unused state_type 2023-10-26 15:45:08 +02:00
Marshall Bowers eb19071d84 ui2: Clean up takes 2023-10-26 15:44:39 +02:00
Marshall Bowers 7b4a895ab9 ui2: Clean up drains 2023-10-26 15:41:29 +02:00
Marshall Bowers d62c51a4b8 Merge branch 'gpui2-element-renderer' into zed2 2023-10-26 15:23:02 +02:00
Marshall Bowers fccc4ca85c Initialize element before layout 2023-10-26 15:22:48 +02:00
Marshall Bowers 42095f0673 Remove debug from derive Component proc macro 2023-10-26 15:22:38 +02:00
Marshall Bowers 88ef74ec8f Checkpoint: Compiling after view type removal 2023-10-26 15:20:38 +02:00
Max BrunsfeldandJospeh 6fe393db2a Fix compile errors with lsp2 
Co-authored-by: Jospeh <joseph@zed.dev>
 2023-10-26 14:48:04 +02:00
Max BrunsfeldConradKyleJoseph
 		69e5ecc015 Enable client tests 
* implement Executor::advance_clock

Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by:  Kyle <kyle@zed.dev>
Co-authored-by:  Joseph <joseph@zed.dev>
 2023-10-26 14:44:13 +02:00
Marshall Bowers c9c9db903d Fix Component derive macro 2023-10-26 14:20:25 +02:00
Julia 0eafb8886d zed2: Capture language server stderr during startup/init and log if failure (#3176) 
zed2 electric boogaloo

Release Notes:

- N/A
 2023-10-26 13:59:04 +02:00
Kirill Bulatov 27d2accb51 Fix the formatting 2023-10-26 13:52:04 +02:00
Kirill Bulatov 0a04c5734b Update mouse position during file drag and drop 2023-10-26 13:50:35 +02:00
Julia 8a0fb668f7 Capture language server stderr during startup/init and log if failure 
zed2 electric boogaloo
 2023-10-26 13:50:24 +02:00
Nathan Sobo f4cff69729 WIP: Macro not working fully yet 2023-10-26 13:18:58 +02:00
Max Brunsfeld a4b7e3c9f6 Merge branch 'zed2-hangs' into zed2 2023-10-26 12:48:35 +02:00
Conrad IrwinConradKyle
 		065d26f5b2 Get RPC2 tests passing 
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Kyle <kyle@zed.dev>
 2023-10-26 12:47:37 +02:00
Nathan Sobo 0285284ae1 Rename IntoAnyElement trait to Component 2023-10-26 12:46:52 +02:00
Nathan Sobo 8ecfea55cd Replace derive Element with derive IntoAnyElement everywhere 2023-10-26 12:38:23 +02:00
Nathan Sobo 315744ec20 Add derive macro for IntoAnyElement 2023-10-26 12:20:46 +02:00
Antonio ScandurraMikaylaKirill
 		06c22206af Add install_cli2 
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-Authored-By: Kirill <kirill@zed.dev>
 2023-10-26 12:09:54 +02:00
Antonio Scandurra 6172cd9015 Merge branch 'zed2-room' into zed2 2023-10-26 11:57:11 +02:00
Antonio ScandurraKirill BulatovMikayla Maki
 		3bcae6d7de Add call2 
Co-Authored-By: Kirill Bulatov <kirill@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2023-10-26 11:56:34 +02:00
Nathan Sobo 927278e20d Remove IntoAnyElement bound from Element trait 2023-10-26 11:49:36 +02:00
Conrad Irwin 71ad3e1b20 Add rpc2 2023-10-26 11:48:25 +02:00
Conrad Irwin 693246ba26 Fix fs2 import on zed 2023-10-26 11:41:15 +02:00
Conrad Irwin b875be9689 Fix settings2 tests 2023-10-26 11:39:32 +02:00
Conrad Irwin 07b9ec29e6 Revert "Fix settings2 crate tests" 
This reverts commit 6e9c779c51.
 2023-10-26 11:33:58 +02:00
Nathan Sobo db15db45ce WIP 2023-10-26 11:31:47 +02:00
Conrad Irwin 6e9c779c51 Fix settings2 crate tests 2023-10-26 11:27:23 +02:00
Kirill Bulatov 483ac9491a Start fixing room2 2023-10-26 11:27:12 +02:00
Conrad Irwin 6cf7d0b81c Fix macro some more 2023-10-26 11:27:03 +02:00
Conrad Irwin 6185c935a6 Fix small bugs in gpui2::test 2023-10-26 11:23:07 +02:00
Nathan Sobo 45a8aea0f0 Make FnOnces that render elements IntoAnyElement 2023-10-26 11:21:42 +02:00
Nathan Sobo db7d12f628 WIP 2023-10-26 10:59:27 +02:00
Marshall Bowers 4266ead958 WIP: Trait bounds 2023-10-26 10:46:02 +02:00