Commit Graph
21558 Commits
Author SHA1 Message Date
Nathan Sobo 11b6d9e33a Split out a foreground and background executor 2023-11-01 13:53:45 -06:00
Max Brunsfeld dd1a2a9e44 wip 2023-11-01 13:53:45 -06:00
57ffa8201e 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 ea7fdef417 And more unused imports 2023-11-01 13:51:42 -06:00
Conrad Irwin a5d37d3510 Remove two more hanging tests 2023-11-01 13:26:12 -06:00
Mikayla 6f38eb3252 Finish main merge 2023-11-01 11:52:14 -07: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
Mikayla 1c1b53ecf6 WIP 2023-11-01 11:45:31 -07:00
Mikayla Maki 78f47f179a Rename live kit bridge to 2 (#3201)
Release Notes:

- N/A
2023-11-01 11:40:40 -07:00
Mikayla 6aaeb23157 Rename live kit bridge to 2 2023-11-01 10:52:15 -07:00
Conrad Irwin cfe0ddc61a More unused imports 2023-11-01 11:43:06 -06:00
Max BrunsfeldandConrad c467fa955b Comment out hanging project2 tests
Co-authored-by: Conrad <conrad@zed.dev>
2023-11-01 10:38:47 -07:00
Antonio Scandurra 337a79e35f WIP 2023-11-01 18:34:51 +01: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
Nate Butler 8dafd5f1f3 Allow ListHeader to take a meta 2023-11-01 12:43:25 -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
Mikayla 1568ecbe1e Add back room code to call2 2023-11-01 09:29:54 -07:00
Antonio Scandurra c3a8bab4d2 WIP 2023-11-01 17:21:58 +01:00
Mikayla 51fa80ef06 ported example app, live_kit_client2 is done 2023-11-01 09:19:32 -07:00
Julia b7625d81e8 Port multi_buffer to gpui2 (#3193)
Release Notes:

- N/A
2023-11-01 11:45:44 -04:00
Antonio Scandurra 147db607c7 WIP 2023-11-01 16:24:19 +01:00
Marshall Bowers 6ed60769ac Merge branch 'n/t2' of github.com:zed-industries/zed into n/t2 2023-11-01 10:52:29 -04:00
Marshall Bowers 3189cd779e Remove unused impl 2023-11-01 10:52:25 -04:00
Nate Butler 5d660759bf Continue refining default syntax theme 2023-11-01 10:50:00 -04:00
Marshall Bowers d2a8f972f3 Fix return type 2023-11-01 10:48:23 -04:00
Marshall Bowers 8fb7c174b0 Merge branch 'main' into n/t2 2023-11-01 10:46:27 -04:00
Marshall Bowers bbe53895ef 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 b8547e926d 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 1b9619ca7f 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 e8857d959b WIP 2023-11-01 16:10:07 +02:00
Kirill Bulatov a9d7c86307 WIP 2023-11-01 15:37:51 +02:00
Kirill Bulatov 73c97d0c10 WIP
Uncomment more methods in workspace2.rs
2023-11-01 14:47:29 +02:00
Antonio Scandurra 4d320f065e WIP 2023-11-01 12:47:19 +01:00
Nate Butler 3bcc2fa17b Update notifications panel 2023-11-01 02:10:23 -04:00
Nate Butler bfb1f5ecf0 Continue refining theme, update tabs & tab bar 2023-11-01 01:41:33 -04:00
Nate Butler 0efd69c60f Refine default colors 2023-11-01 00:51:57 -04:00
Nate Butler e0cb95b334 Add From<&str> for Hsla 2023-11-01 00:51:47 -04:00
Nathan Sobo d47ef6470b WIP 2023-10-31 22:32:18 -06:00
Marshall Bowers 272f856460 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 4da8ee1e1d Remove one todo from the critical path 2023-10-31 21:19:32 -06: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:

https://github.com/zed-industries/zed/blob/18431051d9d750d9e66284a71f7a55a1e31c1374/crates/language2/src/highlight_map.rs#L15-L41
2023-10-31 23:05:50 -04:00
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
Nathan Sobo 0ecf6bde73 WIP 2023-10-31 16:15:30 -06:00
Mikayla 244e8ce101 WIP - make livekit work in GPUI2 2023-10-31 14:04:03 -07:00
Max BrunsfeldandMarshall 291d35f337 Merge branch 'main' into zed2-project-test
Co-authored-by: Marshall <marshall@zed.dev>
2023-10-31 11:50:56 -07:00
Nathan Sobo fd15551d97 Remove Reference 2023-10-31 11:29:13 -06:00
Nathan Sobo 8f1000ea10 Checkpoint 2023-10-31 11:27:08 -06:00