a5d37d3
Remove two more hanging tests
Conrad Irwin created
a5d37d3
Remove two more hanging tests
Conrad Irwin created
6f38eb3
Finish main merge
Mikayla created
51ecf8e
collab 0.28.0
Joseph T. Lyons created
e82d8eb
Merge branch 'main' into zed2-workspace
Mikayla created
1c1b53e
WIP
Mikayla created
78f47f1
Rename live kit bridge to 2 (#3201)
Release Notes: - N/A
Mikayla Maki created
6aaeb23
Rename live kit bridge to 2
Mikayla created
cfe0ddc
More unused imports
Conrad Irwin created
c467fa9
Comment out hanging project2 tests
Co-authored-by: Conrad <conrad@zed.dev>
Max Brunsfeld and Conrad created
337a79e
WIP
Antonio Scandurra created
b910bbf
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
Marshall Bowers created
8dafd5f
Allow ListHeader to take a `meta`
Nate Butler created
bd61d71
Finish port of livekit client and call2 (#3198)
Mikayla Maki created
7d300d3
v0.112.x dev
Joseph T. Lyons created
1568ecb
Add back room code to call2
Mikayla created
c3a8bab
WIP
Antonio Scandurra created
51fa80e
ported example app, live_kit_client2 is done
Mikayla created
b7625d8
Port `multi_buffer` to gpui2 (#3193)
Release Notes: - N/A
Julia created
147db60
WIP
Antonio Scandurra created
6ed6076
Merge branch 'n/t2' of github.com:zed-industries/zed into n/t2
Marshall Bowers created
3189cd7
Remove unused impl
Marshall Bowers created
5d66075
Continue refining default syntax theme
Nate Butler created
d2a8f97
Fix return type
Marshall Bowers created
8fb7c17
Merge branch 'main' into n/t2
Marshall Bowers created
bbe5389
Return `ColorScaleSet`s 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
Marshall Bowers created
b8547e9
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`.
Marshall Bowers created
1b9619c
added parsing support for <|S| |E|> spans (#3184)
added parsing support for <|S| and |E|> spans for inline generation
Kyle Caverly created
e8857d9
WIP
Kirill Bulatov created
a9d7c86
WIP
Kirill Bulatov created
73c97d0
WIP
Uncomment more methods in workspace2.rs
Kirill Bulatov created
4d320f0
WIP
Antonio Scandurra created
3bcc2fa
Update notifications panel
Nate Butler created
bfb1f5e
Continue refining theme, update tabs & tab bar
Nate Butler created
0efd69c
Refine default colors
Nate Butler created
e0cb95b
Add From<&str> for Hsla
Nate Butler created
d47ef64
WIP
Nathan Sobo created
272f856
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
Marshall Bowers created
4da8ee1
Remove one todo from the critical path
Nathan Sobo created
36a73d6
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
Marshall Bowers created
1843105
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>
Marshall Bowers , Nate Butler , and Marshall Bowers created
795369a
Port `multi_buffer` to gpui2
Julia created
0ecf6bd
WIP
Nathan Sobo created
244e8ce
WIP - make livekit work in GPUI2
Mikayla created
291d35f
Merge branch 'main' into zed2-project-test
Co-authored-by: Marshall <marshall@zed.dev>
Max Brunsfeld and Marshall created
fd15551
Remove Reference
Nathan Sobo created
8f1000e
Checkpoint
Nathan Sobo created
9798d65
Checkpoint
Nathan Sobo created
90601fe
Checkpoint
Nathan Sobo created
ed5f1d3
zed2 (#3174)
PR to get zed2 into main. Because we have taken the approach of porting crates by renaming them to `-2` we will need to manually reapply any changes that were made to ported crates since the `zed2` branch diverged from master. I think this is the list of PRs that may need changes ported manually. Any changes to the following crates may need to be moved from crate `x` to `x2` for each of the following crates: `audio call client copilot db feature_flags fs fuzzy gpui install_cli language lsp prettier project rpc settings storybook terminal theme ui zed`. - [x] f75eb3f62 Conrad Irwin (origin/main, origin/HEAD, main) Merge branch 'more-signing' (17 hours ago) - [x] 832026a0a Julia Limit language server reinstallation attempts (#3177) (18 hours ago) - [x] 4539cef6d Julia Capture language server stderr during startup/init and log if failure (#3175) (21 hours ago) - [x] e6f2288a0 Conrad Irwin Don't use function_name in vim tests (#3171) (2 days ago) - [x] f67f42779 Mikayla Maki Rename IIFE to maybe (#3165) (2 days ago) - [ ] 90f65ec9f Max Brunsfeld Remove logic for multiple channel parents (#3162) (2 days ago) - [ ] 4f859e025 Conrad Irwin link to channel notes (#3167) (2 days ago) - [ ] b8bd070a8 Conrad Irwin Fix panic by disallowing multiple room joins (#3149) (3 days ago) - [ ] cc9e92857 Max Brunsfeld Guest roles (#3140) (3 days ago) - [x] b090cefdd Kirill Bulatov Rework prettier tests (#3160) (3 days ago) - [ ] ff497810d Kyle Caverly move keychain access into semantic index as opposed to on init (#3158) (3 days ago) - [x] 2b95db087 Conrad Irwin Fix infinite loop in select all (#3154) (3 days ago) - [ ] a5836b033 Max Brunsfeld Add chat mentions and a notifications panel (#3121) (4 days ago) - [ ] ef1a69156 Kyle Caverly update semantic search to use keychain as fallback (#3151) (6 days ago) - [x] 26638748b Kirill Bulatov Move prettier parsers data into languages from LSP adapters (#3150) (6 days ago) - [ ] 0dae0f602 Conrad Irwin pixel columns (#3052) (7 days ago) - [x] cc7df91cc Julia Whoops (#3146) (7 days ago) - [x] 808976ee2 Julia Magic incantations for Tailwind autocomplete in more languages (#3141) (7 days ago) - [ ] cc390ba86 Conrad Irwin Start writing role to database (#3120) (10 days ago) - [ ] 2795091f0 Kyle Caverly Introduce Context Retrieval in Inline Assistant (#3097) (10 days ago) - [x] b168bded1 Conrad Irwin New entitlements: (#3118) (10 days ago) - [x] 247cdb1e1 Joseph T. Lyons Fix telemetry-related crash on start up (#3131) (11 days ago) - [ ] 2323fd17b Julia Autocomplete docs (#3126) (2 weeks ago) - [x] 16d9d77d8 Kirill Bulatov Update diagnostics indicator when diagnostics are udpated (#3128) (2 weeks ago) - [ ] 634202340 Kirill Bulatov Remove zed -> ... -> semantic_index -> zed Cargo dependency cycle (#3127) (2 weeks ago) Note: this list does not include any PRs that did not change crates that have been converted; it also does not include any commits that were pushed directly to master. ### To figure out what needs migrating, run: ``` git diff COMMIT^..COMMIT -- crates/audio crates/call crates/client crates/copilot crates/db crates/feature_flags crates/fs crates/fuzzy crates/gpui crates/install_cli crates/language crates/lsp crates/prettier crates/project crates/rpc crates/settings crates/storybook crates/terminal crates/theme crates/ui crates/zed ```
Max Brunsfeld created
0a2fde8
WIP
Nathan Sobo created