Nathan Sobo
15b6f40fa1
Checkpoint
2023-11-01 14:00:26 -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
Conrad Irwin
5e06344d85
And more unused imports
2023-11-01 13:51:42 -06:00
Conrad Irwin
eb6cec1be5
Remove two more hanging tests
2023-11-01 13:26:12 -06:00
Mikayla
eb82028b76
Finish main merge
2023-11-01 11:52:14 -07: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
Mikayla
432f10621c
WIP
2023-11-01 11:45:31 -07:00
Mikayla Maki
6a7472a22f
Rename live kit bridge to 2 ( #3201 )
...
Release Notes:
- N/A
2023-11-01 11:40:40 -07:00
Mikayla
d7707dfb31
Rename live kit bridge to 2
2023-11-01 10:52:15 -07:00
Conrad Irwin
e122bf83d7
More unused imports
2023-11-01 11:43:06 -06:00
Max Brunsfeld and Conrad
0fa13bb42a
Comment out hanging project2 tests
...
Co-authored-by: Conrad <conrad@zed.dev >
2023-11-01 10:38:47 -07:00
Antonio Scandurra
216eac9e5e
WIP
2023-11-01 18:34:51 +01: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
Nate Butler
95ebec7f46
Allow ListHeader to take a meta
2023-11-01 12:43:25 -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
Mikayla
8a1a02bf2f
Add back room code to call2
2023-11-01 09:29:54 -07:00
Antonio Scandurra
acf3e89ba7
WIP
2023-11-01 17:21:58 +01:00
Mikayla
17a46cf279
ported example app, live_kit_client2 is done
2023-11-01 09:19:32 -07:00
Julia
51997f65e8
Port multi_buffer to gpui2 ( #3193 )
...
Release Notes:
- N/A
2023-11-01 11:45:44 -04:00
Antonio Scandurra
26d0f11f23
WIP
2023-11-01 16:24:19 +01:00
Marshall Bowers
304a0278b9
Merge branch 'n/t2' of github.com:zed-industries/zed into n/t2
2023-11-01 10:52:29 -04:00
Marshall Bowers
ecd3d7d02d
Remove unused impl
2023-11-01 10:52:25 -04:00
Nate Butler
a54450cd69
Continue refining default syntax theme
2023-11-01 10:50:00 -04:00
Marshall Bowers
1c407cf235
Fix return type
2023-11-01 10:48:23 -04:00
Marshall Bowers
55f084975e
Merge branch 'main' into n/t2
2023-11-01 10:46:27 -04:00
Marshall Bowers
a015c469bb
Return ColorScaleSets from individual color scale functions ( #3197 )
...
This PR adjusts the individual color scale functions to return
`ColorScaleSet`s instead of `DefaultColorScaleSet`s.
We only use the `DefaultColorScaleSet`s to simplify the construction of
the scales, so it isn't necessary to surface them outside of the
function.
Release Notes:
- N/A
2023-11-01 10:45:42 -04:00
Marshall Bowers
62c634f646
Remove blanket From<&str> impl for Hsla
...
Since this is a fallible operation we don't want to have a blanket
infallible conversion from any arbitrary `&str` to an `Hsla`.
2023-11-01 10:31:03 -04:00
Kyle Caverly
eb26a3eb3d
added parsing support for <|S| |E|> spans ( #3184 )
...
added parsing support for <|S| and |E|> spans for inline generation
2023-11-01 10:26:01 -04:00
Kirill Bulatov
1393f33c56
WIP
2023-11-01 16:10:07 +02:00
Kirill Bulatov
0bb1b28bd5
WIP
2023-11-01 15:37:51 +02:00
Kirill Bulatov
880f5f278b
WIP
...
Uncomment more methods in workspace2.rs
2023-11-01 14:47:29 +02:00
Antonio Scandurra
b016be65fb
WIP
2023-11-01 12:47:19 +01:00
Nate Butler
ed603b3b45
Update notifications panel
2023-11-01 02:10:23 -04:00
Nate Butler
048f0bc2b4
Continue refining theme, update tabs & tab bar
2023-11-01 01:41:33 -04:00
Nate Butler
a8519a8cc4
Refine default colors
2023-11-01 00:51:57 -04:00
Nate Butler
13b8e82a5a
Add From<&str> for Hsla
2023-11-01 00:51:47 -04:00
Nathan Sobo
3a939de217
WIP
2023-10-31 22:32:18 -06:00
Marshall Bowers
c1fd535c70
Use Refineable for ThemeStyles ( #3196 )
...
This PR updates the `ThemeStyles` struct to use the `Refineable` trait
instead of a custom declarative macro for generating refinements.
Release Notes:
- N/A
2023-10-31 23:33:51 -04:00
Nathan Sobo
2c092ec44d
Remove one todo from the critical path
2023-10-31 21:19:32 -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
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
Nathan Sobo
b520adfc1a
WIP
2023-10-31 16:15:30 -06:00
Mikayla
79069e5b77
WIP - make livekit work in GPUI2
2023-10-31 14:04:03 -07:00
Max Brunsfeld and Marshall
b199bcb28b
Merge branch 'main' into zed2-project-test
...
Co-authored-by: Marshall <marshall@zed.dev >
2023-10-31 11:50:56 -07:00
Nathan Sobo
0eecaa18ad
Remove Reference
2023-10-31 11:29:13 -06:00
Nathan Sobo