Kirill Bulatov
c5bcd65546
Pass proper theme colors for inlays and suggestions
2023-12-06 21:48:39 +02:00
Julia
d12fcc9b37
Avoid panic with outline highlight ranges
...
Previously we were using a function in `editor` to combine syntax
highlighting and fuzzy match positions, it would operate on the full
text as put into the label. However we now have a method `ranges` on
`StringMatch` itself which operates on just the match text.
The outline view has some pretty specific behavior around path/normal
matches and how they are highlighted. So let's just give the match the
full text before it leaves the search function so it can freely index
2023-12-04 15:37:34 -05:00
Kirill Bulatov
b0c1c5c98e
Port to gpui2
2023-11-30 13:07:47 +02:00
Max Brunsfeld
4dbfdfdf02
Upgrade Tree-sitter for stack-overflow bugfix
2023-11-27 13:16:50 -08:00
Antonio Scandurra
b9e3ba496a
Merge branch 'main' into editor2-autocomplete
2023-11-17 11:03:25 +01:00
Max Brunsfeld
b15356f133
Don't update file's saved mtime when reload is aborted
2023-11-16 18:02:49 -08:00
Max Brunsfeld
a59c1eabe2
Fix race conditions and bugs in Buffer::reload
2023-11-16 16:03:14 -08:00
Max Brunsfeld
daba2e4e5d
Label the buffer's diff task so it can be deprioritized in tests
2023-11-16 16:03:13 -08:00
Max Brunsfeld
416222e547
Combine adjacent edits in buffer's diff
2023-11-16 16:03:05 -08:00
Antonio Scandurra
cb97d1569d
Add back Completion::documentation
2023-11-16 14:47:45 +01:00
Mikayla
8dcdc67bd1
Merge branch 'main' into editor-tests
2023-11-13 09:54:02 -08:00
Max Brunsfeld
785a835091
Duplicate buffer test changes in language2 version
2023-11-09 11:09:49 -08:00
Mikayla
9e6bd21fe8
checkpoint
2023-11-08 23:16:04 -08:00
Mikayla
9fd7066ac1
Get workspace compiling with new event emitters
2023-11-08 19:29:00 -08:00
Antonio Scandurra
800a03407c
Merge remote-tracking branch 'origin/main' into editor-movement
2023-11-07 18:48:08 +01:00
Marshall Bowers
a9db13e190
Rename ThemeVariant to Theme ( #3252 )
...
This PR renames the `ThemeVariant` type to `Theme`.
This better reflects its purpose, as well as matches the same name as we
had before, which should make porting crates slightly easier.
Release Notes:
- N/A
2023-11-07 10:41:36 -05:00
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 Brunsfeld and Conrad
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
Kirill Bulatov