Marshall Bowers
a7edd380e3
Merge branch 'main' into import-theme
2023-11-03 10:11:35 -04:00
Kirill Bulatov
f1fc07de94
Move journal2 to workspace2
2023-11-03 12:55:06 +02:00
Kirill Bulatov
d673efebd2
Add prettier workspace resolution test
2023-11-03 11:02:50 +02:00
Conrad Irwin
0b3932f38c
Convert rich_text2
2023-11-02 19:30:33 -06:00
Conrad Irwin
6ecb4805f7
Add rich_text2
2023-11-02 19:19:18 -06:00
Conrad Irwin
cbd902658c
git -> git3
...
This is needed for the editor.
2023-11-02 19:18:01 -06:00
Nate Butler
b4e2368943
Merge branch 'main' into import-theme
2023-11-02 20:16:09 -04:00
Nate Butler
058981350c
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
269a72464d
Merge remote-tracking branch 'origin/main' into zed2-workspace
2023-11-02 13:16:24 -06:00
Mikayla
d11ff14b57
Remove the 2s from source code
2023-11-02 10:55:02 -07:00
Conrad Irwin
5a41eed120
WIP
2023-11-02 11:34:31 -06:00
Conrad Irwin
0bab1a92df
Merge remote-tracking branch 'origin/main' into zed2-workspace
2023-11-02 09:44:38 -06:00
Joseph T. Lyons
5412f20e35
Fix missing commit (collab version bump)
2023-11-02 09:22:12 -04:00
Nathan Sobo
3e7df82977
WIP: Merge branch 'main' into zed2-workspace
2023-11-01 22:35:02 -06:00
KCaverly
77dbb15aa3
port text2 to zed2
2023-11-01 16:13:53 -04:00
Joseph T. Lyons
51ecf8e6b4
collab 0.28.0
2023-11-01 14:50:29 -04:00
Mikayla
e82d8eb5b8
Merge branch 'main' into zed2-workspace
2023-11-01 11:46:28 -07:00
Marshall Bowers
b910bbf002
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
bd61d71018
Finish port of livekit client and call2 ( #3198 )
2023-11-01 09:37:40 -07:00
Joseph T. Lyons
7d300d3f5b
v0.112.x dev
2023-11-01 12:34:26 -04:00
Julia
b7625d81e8
Port multi_buffer to gpui2 ( #3193 )
...
Release Notes:
- N/A
2023-11-01 11:45:44 -04: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
Marshall Bowers
18431051d9
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
795369a1e3
Port multi_buffer to gpui2
2023-10-31 18:34:36 -04:00
Mikayla
244e8ce101
WIP - make livekit work in GPUI2
2023-10-31 14:04:03 -07:00
Antonio Scandurra
00c92ae407
Merge branch 'zed2' into zed2-workspace
2023-10-31 10:20:03 +01:00
Julia
db34de6be4
Port zed/src/languages to zed2
2023-10-30 21:52:29 -04:00
Mikayla
3dadfb8ba8
Merge branch 'zed2' into zed2-workspace
2023-10-30 16:53:21 -07:00
KCaverly
b34f0c3bee
update prettier2, call2 and project2 to use fs2
2023-10-30 16:21:58 -04:00
KCaverly
04ab68502b
port ai crate to ai2, with all tests passing
2023-10-30 14:40:31 -04:00
Marshall Bowers
b31a004def
Add menu2 crate
2023-10-30 12:56:23 -04:00
Marshall Bowers
3591ffe4a7
Emit all themes at once
2023-10-30 11:04:03 -04:00
Antonio Scandurra
bd750fbbe2
Merge branch 'zed2' into zed2-workspace
2023-10-30 12:16:34 +01:00
Joseph T. Lyons
6b65d76014
Port journal to GPUI2
2023-10-28 11:37:25 -04:00
Conrad Irwin
4a6a17d866
Merge branch 'main' into zed2
2023-10-27 10:55:15 +02:00
Joseph T. Lyons
98d03f6e7a
Revert "Add activity_indicator2"
...
This reverts commit 88a3a57789
2023-10-26 17:13:40 +02:00
Marshall Bowers
973ca8d4f0
ui2: Remove dependency on theme crate
2023-10-26 16:50:04 +02:00
Marshall Bowers
692aeff263
ui2: Remove dependency on settings crate
2023-10-26 16:50:04 +02:00
Joseph T. Lyons
88a3a57789
Add activity_indicator2
2023-10-26 16:49:39 +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
Antonio Scandurra
821fe0f5b5
Merge branch 'zed2' into zed2-workspace
2023-10-26 15:34:55 +02:00
Julia
4539cef6d7
Capture language server stderr during startup/init and log if failure ( #3175 )
...
Gives us some more debugging information
Release Notes:
- N/A
2023-10-26 14:17:29 +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
Max Brunsfeld
a4b7e3c9f6
Merge branch 'zed2-hangs' into zed2
2023-10-26 12:48:35 +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
Julia
170ebd8221
Capture language server stderr during startup/init and log if failure
2023-10-26 12:29:22 +02:00
Antonio Scandurra
c8b5b085f4
WIP
2023-10-26 12:27:20 +02:00
Antonio Scandurra
06c22206af
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
6172cd9015
Merge branch 'zed2-room' into zed2
2023-10-26 11:57:11 +02:00
