Marshall Bowers
a1a7797439
Merge branch 'main' into n/t2
2023-11-01 21:54:10 -04:00
Marshall Bowers
88ab95a68a
Make indexing into ColorScales safe ( #3205 )
...
This PR makes indexing into `ColorScale`s safe by constraining the
`ColorScaleStep`s to a set of known values.
Release Notes:
- N/A
2023-11-01 21:52:42 -04:00
Marshall Bowers
af09948a2c
Fix underflow when indexing into ColorScales
2023-11-01 21:15:06 -04:00
Marshall Bowers
c9b94196cd
Merge branch 'main' into n/t2
2023-11-01 21:11:26 -04:00
Marshall Bowers
faecc27eb5
Adjust ColorScale representation ( #3204 )
...
This PR adjusts the representations of `ColorScale`s to allow us to
remove an unsafe `From` impl when converting from the statically-defined
representation of the scale.
Release Notes:
- N/A
2023-11-01 21:10:50 -04:00
Max Brunsfeld
f738d16c4d
WIP - flush_fs_events
2023-11-01 17:45:38 -07:00
Max Brunsfeld and Nathan Sobo
1a627a1b96
Fix hangs in new dispatcher
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2023-11-01 17:11:42 -07:00
Conrad Irwin
e3c633ac57
beautiful diff
2023-11-01 15:31:37 -06:00
Nate Butler
76e0bdc7f0
Merge branch 'main' into n/t2
2023-11-01 16:52:43 -04:00
Nate Butler and Marshall Bowers
73578fa334
Add additional notifications and style tweaks
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-01 16:50:59 -04:00
Nate Butler and Marshall Bowers
7de3c470b0
Implement Notifications
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-01 16:34:42 -04:00
Conrad Irwin
1583375d99
Uncomment project2 tests ( #3200 )
2023-11-01 20:27:53 +00:00
Conrad Irwin
21d0376cbb
Use run_until_parked instead of blocked in tests
2023-11-01 14:27:25 -06:00
Kyle Caverly
6dc998a17a
port text2 to zed2 ( #3202 )
...
port text2 to zed2
Release Notes:
- NA
2023-11-01 16:27:08 -04:00
Nate Butler
b52624eb51
WIP
2023-11-01 16:19:49 -04:00
KCaverly
e4403876a2
port text2 to zed2
2023-11-01 16:13:53 -04:00
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
Marshall Bowers