Commit Graph
32 Commits
Author SHA1 Message Date
Antonio Scandurra 305c7b29a2 Merge remote-tracking branch 'origin/main' into editor2 2023-11-03 14:47:49 +01:00
Kirill Bulatov 24a215e4fd Uncomment persistence tests 2023-11-03 12:38:09 +02:00
Nathan Sobo 63d08003aa Merge remote-tracking branch 'origin/rich_text2' into editor2 2023-11-02 20:34:52 -06:00
Conrad Irwin 5e2813d913 git -> git3
This is needed for the editor.
2023-11-02 19:18:01 -06:00
Nathan Sobo 7ebf696940 WIP 2023-11-02 16:47:14 -06:00
Conrad Irwin 0fca49be33 WIP 2023-11-02 15:27:49 -06:00
Mikayla d8b8390702 Remove the 2s from source code 2023-11-02 10:55:02 -07:00
Nathan Sobo c5a361d12b Merge remote-tracking branch 'origin/main' into gpui2-no-send 2023-11-01 21:10:31 -06:00
Nathan Sobo c3ff8609e8 Get language2 tests passing by not blocking on a foreground task 2023-11-01 21:04:17 -06:00
Nathan Sobo 8b342b1332 Split out a foreground and background executor 2023-11-01 13:53:45 -06:00
Max Brunsfeld 1da07b7433 wip 2023-11-01 13:53:45 -06:00
455983d912 Start removing the Send impl for App
Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Nathan <nathan@zed.dev>
2023-11-01 13:53:45 -06:00
Marshall Bowers 59b536af38 Remove old Theme definition (#3195)
This PR removes the old `Theme` definition in favor of the new
`ThemeVariant`s.

The new `SyntaxStyles` have been reverted to the old `SyntaxTheme` that
operates by storing the syntax styles as a vector of
`gpui2::HighlightStyle`s.

This is necessary for the intended usage by `language2`, where we find
the longest key in the theme's syntax styles that matches the capture
name:

https://github.com/zed-industries/zed/blob/766d5959beffcbb82352d5c64d704141aa24f21d/crates/language2/src/highlight_map.rs#L15-L41
2023-10-31 23:05:50 -04:00
Julia 6e45e454ff Port zed/src/languages to zed2 2023-10-30 21:52:29 -04:00
Antonio Scandurra 3895aba120 Rename Handle to Model 2023-10-30 19:44:01 +01:00
Conrad Irwin 6ea9068437 Port changes from #3154 to zed2 2023-10-27 13:24:37 +02:00
Conrad Irwin 4ab44fa554 Get cargo test --workspace compiling again 2023-10-27 11:03:30 +02:00
Julia bd39ce050f Limit language server reinstallation attempts
zed2 electric boogaloo
2023-10-26 17:16:04 +02:00
Max Brunsfeld dfc66d2d56 Get remaining language2 tests passing 2023-10-26 16:38:50 +02:00
Max BrunsfeldandConrad 8ba6c2a488 Get most of the language2 tests passing
Co-authored-by: Conrad <conrad@zed.dev>
2023-10-26 15:57:12 +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
Julia 60f62f030f Capture language server stderr during startup/init and log if failure
zed2 electric boogaloo
2023-10-26 13:50:24 +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
Conrad Irwin 155ee01c0a Revert "Fix settings2 crate tests"
This reverts commit 979132da04.
2023-10-26 11:33:58 +02:00
Conrad Irwin 979132da04 Fix settings2 crate tests 2023-10-26 11:27:23 +02:00
Antonio Scandurra 0f6f227d4e Fix errors in passing TestAppContext in async gpui2 tests 2023-10-25 21:08:00 +02:00
Marshall Bowers b219cfad15 Load themes from settings and rework Settings trait 2023-10-25 20:37:55 +02:00
Marshall Bowers 29e72d4d10 Rename cx.global_default_mut to cx.global_default 2023-10-24 17:58:14 +02:00
Marshall Bowers 6b926ac077 Checkpoint 2023-10-24 17:29:03 +02:00
Antonio Scandurra 83413aad6f WIP 2023-10-23 11:43:08 +02:00
Antonio Scandurra 72103622e7 Checkpoint 2023-10-23 10:59:29 +02:00
Antonio Scandurra 2a0c083d00 WIP 2023-10-22 19:56:25 +02:00