Kirill Bulatov
f76e1cfd91
Pass proper theme colors for inlays and suggestions
2023-12-06 21:48:39 +02:00
Julia
9a2fd18425
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
f052329a6b
Port to gpui2
2023-11-30 13:07:47 +02:00
Max Brunsfeld
1c62abbf79
Upgrade Tree-sitter for stack-overflow bugfix
2023-11-27 13:16:50 -08:00
Antonio Scandurra
27cd7b204d
Merge branch 'main' into editor2-autocomplete
2023-11-17 11:03:25 +01:00
Max Brunsfeld
17b2b112bc
Don't update file's saved mtime when reload is aborted
2023-11-16 18:02:49 -08:00
Max Brunsfeld
5f1acae0d3
Fix race conditions and bugs in Buffer::reload
2023-11-16 16:03:14 -08:00
Max Brunsfeld
89d73f713a
Label the buffer's diff task so it can be deprioritized in tests
2023-11-16 16:03:13 -08:00
Max Brunsfeld
b2451d9dd6
Combine adjacent edits in buffer's diff
2023-11-16 16:03:05 -08:00
Antonio Scandurra
781a95d2e3
Add back Completion::documentation
2023-11-16 14:47:45 +01:00
Mikayla
4c5d5105f3
Merge branch 'main' into editor-tests
2023-11-13 09:54:02 -08:00
Max Brunsfeld
e50318e7e1
Duplicate buffer test changes in language2 version
2023-11-09 11:09:49 -08:00
Mikayla
43eb7f28d1
checkpoint
2023-11-08 23:16:04 -08:00
Mikayla
a97c8bf58f
Get workspace compiling with new event emitters
2023-11-08 19:29:00 -08:00
Antonio Scandurra
d7e86eb1c1
Merge remote-tracking branch 'origin/main' into editor-movement
2023-11-07 18:48:08 +01:00
Marshall Bowers
74853ea55f
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
097171b9b8
Merge remote-tracking branch 'origin/main' into editor2
2023-11-03 14:47:49 +01:00
Kirill Bulatov
eb8a0e7148
Uncomment persistence tests
2023-11-03 12:38:09 +02:00
Nathan Sobo
2a12e8f307
Merge remote-tracking branch 'origin/rich_text2' into editor2
2023-11-02 20:34:52 -06:00
Conrad Irwin
cbd902658c
git -> git3
...
This is needed for the editor.
2023-11-02 19:18:01 -06:00
Nathan Sobo
7b712ac68f
WIP
2023-11-02 16:47:14 -06:00
Conrad Irwin
583c36e24b
WIP
2023-11-02 15:27:49 -06:00
Mikayla
d11ff14b57
Remove the 2s from source code
2023-11-02 10:55:02 -07:00
Nathan Sobo
db9ccd7f34
Merge remote-tracking branch 'origin/main' into gpui2-no-send
2023-11-01 21:10:31 -06:00
Nathan Sobo
57dfc50687
Get language2 tests passing by not blocking on a foreground task
2023-11-01 21:04:17 -06:00
Nathan Sobo
11b6d9e33a
Split out a foreground and background executor
2023-11-01 13:53:45 -06:00
Max Brunsfeld
dd1a2a9e44
wip
2023-11-01 13:53:45 -06:00
Max Brunsfeld
57ffa8201e
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
36a73d657a
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:
18431051d9/crates/language2/src/highlight_map.rs (L15-L41)
2023-10-31 23:05:50 -04:00
Julia
db34de6be4
Port zed/src/languages to zed2
2023-10-30 21:52:29 -04:00
Antonio Scandurra
1a54ac0d69
Rename Handle to Model
2023-10-30 19:44:01 +01:00
Conrad Irwin
ba189f2af1
Port changes from #3154 to zed2
2023-10-27 13:24:37 +02:00
Conrad Irwin
d2ab0d651e
Get cargo test --workspace compiling again
2023-10-27 11:03:30 +02:00
Julia
a23e05c20b
Limit language server reinstallation attempts
...
zed2 electric boogaloo
2023-10-26 17:16:04 +02:00
Max Brunsfeld
65045b9c52
Get remaining language2 tests passing
2023-10-26 16:38:50 +02:00
Max Brunsfeld
b3ad8c1c3e
Get most of the language2 tests passing
...
Co-authored-by: Conrad <conrad@zed.dev>
2023-10-26 15:57:12 +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
Julia
8a0fb668f7
Capture language server stderr during startup/init and log if failure
...
zed2 electric boogaloo
2023-10-26 13:50:24 +02:00
Conrad Irwin
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
Conrad Irwin
07b9ec29e6
Revert "Fix settings2 crate tests"
...
This reverts commit 6e9c779c51
2023-10-26 11:33:58 +02:00
Conrad Irwin
6e9c779c51
Fix settings2 crate tests
2023-10-26 11:27:23 +02:00
Antonio Scandurra
c5763cdb99
Fix errors in passing TestAppContext in async gpui2 tests
2023-10-25 21:08:00 +02:00
Marshall Bowers
e67048ee7b
Load themes from settings and rework Settings trait
2023-10-25 20:37:55 +02:00
Marshall Bowers
d6bd000aa8
Rename cx.global_default_mut to cx.global_default
2023-10-24 17:58:14 +02:00
Marshall Bowers
4740d6ed61
Checkpoint
2023-10-24 17:29:03 +02:00
Antonio Scandurra
0de4a93ec7
WIP
2023-10-23 11:43:08 +02:00
Antonio Scandurra
56462ef793
Checkpoint
2023-10-23 10:59:29 +02:00
Antonio Scandurra
a0b667a2ca
WIP
2023-10-22 19:56:25 +02:00
