Commit Graph
13301 Commits
Author SHA1 Message Date
Marshall Bowers d4e762d9db ui2: Clean up drains 2023-10-26 15:41:29 +02:00
Marshall Bowers b9028699c5 Merge branch 'gpui2-element-renderer' into zed2 2023-10-26 15:23:02 +02:00
Marshall Bowers f6af9f4cd8 Initialize element before layout 2023-10-26 15:22:48 +02:00
Marshall Bowers 8f15cc06ab Remove debug from derive Component proc macro 2023-10-26 15:22:38 +02:00
Marshall Bowers 523394ea18 Checkpoint: Compiling after view type removal 2023-10-26 15:20:38 +02:00
Max BrunsfeldandJospeh bcfa9b7b9c Fix compile errors with lsp2
Co-authored-by: Jospeh <joseph@zed.dev>
2023-10-26 14:48:04 +02:00
83d4b6c2a0 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 016fa595b0 Fix Component derive macro 2023-10-26 14:20:25 +02:00
Julia 738e6d242b 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 ca4ade4ba2 Fix the formatting 2023-10-26 13:52:04 +02:00
Kirill Bulatov d034ce4541 Update mouse position during file drag and drop 2023-10-26 13:50:35 +02:00
Julia 60f62f030f Capture language server stderr during startup/init and log if failure
zed2 electric boogaloo
2023-10-26 13:50:24 +02:00
Nathan Sobo 7a1bca5b42 WIP: Macro not working fully yet 2023-10-26 13:18:58 +02:00
Max Brunsfeld e49b849e27 Merge branch 'zed2-hangs' into zed2 2023-10-26 12:48:35 +02:00
41d2ad8205 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 ebe52d3335 Rename IntoAnyElement trait to Component 2023-10-26 12:46:52 +02:00
Nathan Sobo a60a6f7498 Replace derive Element with derive IntoAnyElement everywhere 2023-10-26 12:38:23 +02:00
Nathan Sobo 3c90027c67 Add derive macro for IntoAnyElement 2023-10-26 12:20:46 +02:00
15afa23430 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 cef3c660b9 Merge branch 'zed2-room' into zed2 2023-10-26 11:57:11 +02:00
917bce77e8 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 ebdd15281b Remove IntoAnyElement bound from Element trait 2023-10-26 11:49:36 +02:00
Conrad Irwin e834b0a7a7 Add rpc2 2023-10-26 11:48:25 +02:00
Conrad Irwin ff365a21c8 Fix fs2 import on zed 2023-10-26 11:41:15 +02:00
Conrad Irwin 5a339b9864 Fix settings2 tests 2023-10-26 11:39:32 +02:00
Conrad Irwin 155ee01c0a Revert "Fix settings2 crate tests"
This reverts commit 979132da04.
2023-10-26 11:33:58 +02:00
Nathan Sobo 8e28c7c72b WIP 2023-10-26 11:31:47 +02:00
Conrad Irwin 979132da04 Fix settings2 crate tests 2023-10-26 11:27:23 +02:00
Kirill Bulatov 11aade66f8 Start fixing room2 2023-10-26 11:27:12 +02:00
Conrad Irwin c807e57b6b Fix macro some more 2023-10-26 11:27:03 +02:00
Conrad Irwin 7646631167 Fix small bugs in gpui2::test 2023-10-26 11:23:07 +02:00
Nathan Sobo 69b35d0624 Make FnOnces that render elements IntoAnyElement 2023-10-26 11:21:42 +02:00
Nathan Sobo 707caf33e6 WIP 2023-10-26 10:59:27 +02:00
Marshall Bowers 8ff0dd20f3 WIP: Trait bounds 2023-10-26 10:46:02 +02:00
Conrad Irwin 9784163922 Use quit to end tests 2023-10-26 10:40:04 +02:00
Conrad Irwin 20aba94a6b Clearer error on importing both gpui and gpui2 2023-10-26 10:39:52 +02:00
Marshall Bowers 9d6181b1f4 Merge branch 'remove-view-state-associated-type' into gpui2-element-renderer 2023-10-26 10:10:17 +02:00
Marshall Bowers 9dfacec277 Merge branch 'zed2' into gpui2-element-renderer 2023-10-26 10:10:10 +02:00
Marshall Bowers 53ad8f444b Checkpoint: Compiling 2023-10-26 10:08:39 +02:00
Marshall Bowers 3e0cd5eadc WIP: Fix compilation of gpui2 2023-10-26 09:51:33 +02:00
Marshall Bowers 794adc2d57 WIP: Pass in V to Element 2023-10-26 09:45:26 +02:00
Marshall Bowers 587773f7f3 Use Display instead of custom to_string 2023-10-26 09:30:21 +02:00
Marshall Bowers 0f1abb18c8 Removed unused ui2::color module 2023-10-26 09:26:22 +02:00
Marshall Bowers 71b54eddcf WIP: ElementRenderer 2023-10-25 21:08:34 +02:00
Antonio Scandurra 0f6f227d4e Fix errors in passing TestAppContext in async gpui2 tests 2023-10-25 21:08:00 +02:00
9547714720 Introduce a gpui2::test macro
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Kyle <kyle@zed.dev>
2023-10-25 21:08:00 +02:00
Marshall Bowers cd3bb9bdc3 Fix z-index targeting for drag and drop 2023-10-25 20:49:40 +02:00
Marshall Bowers 2b71c49fa6 Clean up some warnings 2023-10-25 20:40:50 +02:00
Marshall Bowers a3a72b77cc Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-25 20:38:03 +02:00
Marshall Bowers b219cfad15 Load themes from settings and rework Settings trait 2023-10-25 20:37:55 +02:00