Marshall Bowers
31cfb83723
Merge branch 'main' into import-theme
2023-11-06 12:08:46 -05:00
Piotr Osiewicz
3560f8a7bc
chore: Update vue.js parser (fixes wonky HTML parsing) ( #3238 )
...
Vue.js defined a bunch of symbols in it's scanner that collided with
those defined in HTML Tree-sitter grammar. I simply removed them as they
were meant for consumption by the external parties interested in HTML
parser with Vue support - since we handle that ourselves this is not
really necessary to preserve anymore. cc was firing up a bunch of
warnings about unused symbols when I've marked those functions as
`static`, so yeah.
Release Notes:
- Fixed HTML highlighting breaking in presence of <!-- --> comments
(fixes zed-industries/community#2166 ).
2023-11-06 16:16:46 +01:00
Piotr Osiewicz
cfa516caee
chore: Update vue.js parser (fixes wonky HTML parsing)
...
Vue.js defined a bunch of symbols in it's scanner that collided with those defined in HTML Tree-sitter grammar. I simply removed them as they were meant for consumption by the external parties interested in HTML parser with Vue support - since we handle that ourselves this is not really necessary to preserve anymore. cc was firing up a bunch of warnings about unused symbols, so yeah.
2023-11-05 22:56:35 +01:00
Kirill Bulatov
321872095c
Parallelize diagnostics filling, add more logs
2023-11-05 15:06:39 +02:00
Kirill Bulatov
3592b98e8f
Refresh diagnostics inside the tab
2023-11-03 21:51:12 +02:00
Marshall Bowers
f9701564ce
Merge branch 'main' into import-theme
2023-11-03 15:41:12 -04:00
Max Brunsfeld and Marshall
eeaa7c7685
Add channel2 crate
...
Co-authored-by: Marshall <marshall@zed.dev >
2023-11-03 10:41:41 -07:00
Marshall Bowers
ca64641b26
Merge branch 'main' into import-theme
2023-11-03 10:11:35 -04:00
Antonio Scandurra
327a700c80
Don't depend on gpui2 in text
2023-11-03 14:53:08 +01:00
Antonio Scandurra
305c7b29a2
Merge remote-tracking branch 'origin/main' into editor2
2023-11-03 14:47:49 +01:00
Kirill Bulatov
5b401b32e9
Move journal2 to workspace2
2023-11-03 12:55:06 +02:00
Antonio Scandurra
a5b53ca825
Uncomment Editor::report_editor_event
2023-11-03 10:53:55 +01:00
Kirill Bulatov
f104a3a48a
Add prettier workspace resolution test
2023-11-03 11:02:50 +02:00
Antonio Scandurra
595ccad409
Remove dependency from gpui from editor2
2023-11-03 09:05:58 +01:00
Nathan Sobo
b7dfb4eeb4
WIP
2023-11-02 22:56:04 -06:00
Nathan Sobo
7c2b802283
WIP
2023-11-02 21:03:29 -06:00
Nathan Sobo
63d08003aa
Merge remote-tracking branch 'origin/rich_text2' into editor2
2023-11-02 20:34:52 -06:00
Conrad Irwin
f9cee6b4cf
Convert rich_text2
2023-11-02 19:30:33 -06:00
Conrad Irwin
bd8b5d2318
Add rich_text2
2023-11-02 19:19:18 -06:00
Conrad Irwin
5e2813d913
git -> git3
...
This is needed for the editor.
2023-11-02 19:18:01 -06:00
Nate Butler
7d5e80d90a
Merge branch 'main' into import-theme
2023-11-02 20:16:09 -04: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
Nate Butler and Marshall Bowers
538664e784
Scaffold out new theme-importer crate
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-02 17:21:11 -04:00
Conrad Irwin
fdeff77625
Merge remote-tracking branch 'origin/main' into zed2-workspace
2023-11-02 13:16:24 -06:00
Mikayla
d8b8390702
Remove the 2s from source code
2023-11-02 10:55:02 -07:00
Conrad Irwin
d8f6dd8d39
WIP
2023-11-02 11:34:31 -06:00
Conrad Irwin
6da8bb337f
Merge remote-tracking branch 'origin/main' into zed2-workspace
2023-11-02 09:44:38 -06:00
Joseph T. Lyons
699176b2c6
Fix missing commit (collab version bump)
2023-11-02 09:22:12 -04:00
Nathan Sobo
8582cb05c8
WIP: Merge branch 'main' into zed2-workspace
2023-11-01 22:35:02 -06:00
KCaverly
e4403876a2
port text2 to zed2
2023-11-01 16:13:53 -04:00
Joseph T. Lyons
5a045efa3e
collab 0.28.0
2023-11-01 14:50:29 -04:00
Mikayla
9be2b21c0e
Merge branch 'main' into zed2-workspace
2023-11-01 11:46:28 -07:00
Marshall Bowers
3a6d95b185
Add ui_font_size setting ( #3199 )
...
This PR adds a new `ui_font_size` setting that can be used to control
the scale of the entire UI.
We use the value in this setting to set the base rem size of the window.
Release Notes:
- N/A
2023-11-01 13:11:12 -04:00
Mikayla Maki
5a775fe7d3
Finish port of livekit client and call2 ( #3198 )
2023-11-01 09:37:40 -07:00
Joseph T. Lyons
ddc65b7182
v0.112.x dev
2023-11-01 12:34:26 -04:00
Julia
51997f65e8
Port multi_buffer to gpui2 ( #3193 )
...
Release Notes:
- N/A
2023-11-01 11:45:44 -04: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
766d5959be
Rework theme2 with new theme structure ( #3194 )
...
This PR reworks the theme definition in the `theme2` crate to be based
off of the new theme work that @iamnbutler has been working on.
We're still developing the new theme system, but it is complete enough
that we can now load the default theme and use it to theme the storybook
(albeit with some further refining of the color palette required).
---------
Co-authored-by: Nate Butler <iamnbutler@gmail.com >
Co-authored-by: Marshall Bowers <marshall@zed.dev >
2023-10-31 22:23:00 -04:00
Julia
6db30335b1
Port multi_buffer to gpui2
2023-10-31 18:34:36 -04:00
Mikayla
79069e5b77
WIP - make livekit work in GPUI2
2023-10-31 14:04:03 -07:00
Antonio Scandurra
c50d9d1b4e
Merge branch 'zed2' into zed2-workspace
2023-10-31 10:20:03 +01:00
Julia
6e45e454ff
Port zed/src/languages to zed2
2023-10-30 21:52:29 -04:00
Mikayla
0244be8819
Merge branch 'zed2' into zed2-workspace
2023-10-30 16:53:21 -07:00
KCaverly
9d0f7e4925
update prettier2, call2 and project2 to use fs2
2023-10-30 16:21:58 -04:00
KCaverly
84fffd7599
port ai crate to ai2, with all tests passing
2023-10-30 14:40:31 -04:00
Marshall Bowers
03dfee7a52
Add menu2 crate
2023-10-30 12:56:23 -04:00
Marshall Bowers
00bd9e05c4
Emit all themes at once
2023-10-30 11:04:03 -04:00
Antonio Scandurra
4ec2b9a12c
Merge branch 'zed2' into zed2-workspace
2023-10-30 12:16:34 +01:00
Joseph T. Lyons
02a7548566
Port journal to GPUI2
2023-10-28 11:37:25 -04:00
Marshall Bowers