Commit Graph
13777 Commits
Author SHA1 Message Date
Nate Butler 931d6f0b61 Remove unused import 2023-11-02 11:02:46 -04:00
Nate Butler eddf9edda1 Use naive_format_distance_from_now in Notifications 2023-11-02 11:02:17 -04:00
Nate Butler 1b5160f0e1 Update naive_format_distance and tests 2023-11-02 10:37:33 -04:00
Nate Butler abce383ba0 Checkpoint - impl format_distance 2023-11-02 10:11:25 -04:00
Marshall Bowers 06597e894d Remove unneeded .intos 2023-11-01 22:01:59 -04:00
Marshall Bowers f8bea1d0dc Update scale accessors 2023-11-01 22:00:16 -04:00
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
Nate Butler 76e0bdc7f0 Merge branch 'main' into n/t2 2023-11-01 16:52:43 -04:00
Nate ButlerandMarshall 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 ButlerandMarshall 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
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
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 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 BrunsfeldandConrad 0fa13bb42a Comment out hanging project2 tests
Co-authored-by: Conrad <conrad@zed.dev>
2023-11-01 10:38:47 -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
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
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
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
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
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
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
Max BrunsfeldandMarshall b199bcb28b Merge branch 'main' into zed2-project-test
Co-authored-by: Marshall <marshall@zed.dev>
2023-10-31 11:50:56 -07:00
Max Brunsfeld c2091d7f6d 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] 45b08299f Conrad Irwin (origin/main, origin/HEAD, main) Merge
branch 'more-signing' (17 hours ago)
- [x] 6ac236800 Julia Limit language server reinstallation attempts
(#3177) (18 hours ago)
- [x] 4d8ec7975 Julia Capture language server stderr during startup/init
and log if failure (#3175) (21 hours ago)
- [x] 9bb633ddc Conrad Irwin Don't use function_name in vim tests
(#3171) (2 days ago)
- [x] ba82f7fe3 Mikayla Maki Rename IIFE to maybe (#3165) (2 days ago)
- [ ] ef83a44d3 Max Brunsfeld Remove logic for multiple channel parents
(#3162) (2 days ago)
- [ ] df648f3ca Conrad Irwin link to channel notes (#3167) (2 days ago)
- [ ] 837755b5c Conrad Irwin Fix panic by disallowing multiple room
joins (#3149) (3 days ago)
- [ ] dd85f6448 Max Brunsfeld Guest roles (#3140) (3 days ago)
- [x] f777e2ed7 Kirill Bulatov Rework prettier tests (#3160) (3 days
ago)
- [ ] b2b115ddd Kyle Caverly move keychain access into semantic index as
opposed to on init (#3158) (3 days ago)
- [x] 480c33efe Conrad Irwin Fix infinite loop in select all (#3154) (3
days ago)
- [ ] ef5933c48 Max Brunsfeld Add chat mentions and a notifications
panel (#3121) (4 days ago)
- [ ] 8f03faeb3 Kyle Caverly update semantic search to use keychain as
fallback (#3151) (6 days ago)
- [x] a7f4fce1e Kirill Bulatov Move prettier parsers data into languages
from LSP adapters (#3150) (6 days ago)
- [ ] d1bef9f6f Conrad Irwin pixel columns (#3052) (7 days ago)
- [x] f871762aa Julia Whoops (#3146) (7 days ago)
- [x] e49fec1b9 Julia Magic incantations for Tailwind autocomplete in
more languages (#3141) (7 days ago)
- [ ] 58950c1d1 Conrad Irwin Start writing role to database (#3120) (10
days ago)
- [ ] bbbab1c92 Kyle Caverly Introduce Context Retrieval in Inline
Assistant (#3097) (10 days ago)
- [x] 968aa29b0 Conrad Irwin New entitlements: (#3118) (10 days ago)
- [x] 15e11762c Joseph T. Lyons Fix telemetry-related crash on start up
(#3131) (11 days ago)
- [ ] e3e012b4b Julia Autocomplete docs (#3126) (2 weeks ago)
- [x] bec711c4a Kirill Bulatov Update diagnostics indicator when
diagnostics are udpated (#3128) (2 weeks ago)
- [ ] afe20e574 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
```
2023-10-31 10:12:17 -07:00