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
Conrad Irwin
a1fb3523d3
Merge branch 'main' into zed2
2023-10-27 10:55:15 +02:00
Joseph T. Lyons
315c1e6022
Revert "Add activity_indicator2"
...
This reverts commit 456c659c2a
2023-10-26 17:13:40 +02:00
Marshall Bowers
2cfbcb3db7
ui2: Remove dependency on theme crate
2023-10-26 16:50:04 +02:00
Marshall Bowers
2db19e3d6e
ui2: Remove dependency on settings crate
2023-10-26 16:50:04 +02:00
Joseph T. Lyons
456c659c2a
Add activity_indicator2
2023-10-26 16:49:39 +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
Antonio Scandurra
c5fb0e6c1f
Merge branch 'zed2' into zed2-workspace
2023-10-26 15:34:55 +02:00
Julia
4d8ec79759
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
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
Max Brunsfeld
e49b849e27
Merge branch 'zed2-hangs' into zed2
2023-10-26 12:48:35 +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
Julia
b13da646e8
Capture language server stderr during startup/init and log if failure
2023-10-26 12:29:22 +02:00
Antonio Scandurra
7e8f0bb328
WIP
2023-10-26 12:27:20 +02:00
15afa23430
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
cef3c660b9
Merge branch 'zed2-room' into zed2
2023-10-26 11:57:11 +02:00
917bce77e8
Add call2
...
Co-Authored-By: Kirill Bulatov <kirill@zed.dev >
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2023-10-26 11:56:34 +02:00
Conrad Irwin
ff365a21c8
Fix fs2 import on zed
2023-10-26 11:41:15 +02:00
Conrad Irwin
5a339b9864
Fix settings2 tests
2023-10-26 11:39:32 +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
Kirill Bulatov
11aade66f8
Start fixing room2
2023-10-26 11:27:12 +02:00
9547714720
Introduce a gpui2::test macro
...
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com >
Co-Authored-By: Max Brunsfeld <max@zed.dev >
Co-Authored-By: Kyle <kyle@zed.dev >
2023-10-25 21:08:00 +02:00
Marshall Bowers
a3a72b77cc
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
2023-10-25 20:38:03 +02:00
Marshall Bowers
b219cfad15
Load themes from settings and rework Settings trait
2023-10-25 20:37:55 +02:00
Piotr Osiewicz
d1c8772592
Extract multi_buffer module out of editor ( #3170 )
...
Release Notes:
- N/A
2023-10-25 19:31:47 +02:00
18c036f7ae
Add fs2
...
Co-Authored-By: Max <max@zed.dev >
Co-Authored-By: Conrad <conrad.irwin@gmail.com >
Co-Authored-By: Kyle <kyle@zed.dev >
2023-10-25 19:17:50 +02:00
Antonio Scandurra
de8fde7026
Stop depending on gpui in client2 and settings2
2023-10-25 18:47:03 +02:00
Joseph T. Lyons