Commit Graph
13735 Commits
Author SHA1 Message Date
Mikayla d7707dfb31 Rename live kit bridge to 2 2023-11-01 10:52:15 -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
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 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
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
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 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
Antonio Scandurra b2615c691d Call initialize on the rendered element on AnyView 2023-10-31 17:17:42 +01:00
Antonio ScandurraandNathan Sobo 4227873b20 Introduce AnyWeakView
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-10-31 16:19:46 +01:00
Antonio ScandurraandNathan Sobo d3d5e91601 Simplify AnyView
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-10-31 16:16:30 +01:00
Kirill Bulatov 32784226d7 Remove TODOs 2023-10-31 13:08:18 +02:00
Kirill Bulatov b4ca92ca83 Fix prettier errors around Zed's settings.json/keymap.json files
Ports https://github.com/zed-industries/zed/pull/3191 to zed2

Deals with zed-industries/community#2191
Fix Zed starting too many prettier installations in the beginning, and not being able to format the config files.
2023-10-31 12:26:49 +02:00
Kirill Bulatov e90fb81ac1 Fix prettier errors around Zed's settings.json/keymap.json files (#3191)
Deals with https://github.com/zed-industries/community/issues/2191

Fix Zed starting too many prettier installations in the beginning, and
not being able to format the config files.

Release Notes:

- Fixed prettier not being able to format Zed's config files and spawning excessive prettier installations
2023-10-31 12:05:32 +02:00
Kirill Bulatov 90df9c22d0 Enqueue default prettier installations 2023-10-31 11:54:40 +02:00
Antonio Scandurra e4877fa064 Zed2 entities (#3189)
Adds an `Entity` trait for abstracting over `View`s and `Model`s, and
implements it for the `subscribe()` and `observe()` APIs.

The last commit also includes a fun experiment I added, using the
`Result` type to return the owned model handles back to the caller in
the case of downcast failure, inspired by the `binary_search*` methods.
2023-10-31 10:11:25 +01:00
Kirill Bulatov 33f5f5f42b Only process diagnostics if corresponding project is alive
Part of https://github.com/zed-industries/zed/pull/3128 that is possible
to apply now.
2023-10-31 10:40:49 +02:00
Julia e542407b14 Port zed/src/languages to zed2 (#3190)
@SomeoneToIgnore I had to port
https://github.com/zed-industries/zed/pull/3150 to zed2 in the process,
giving you a heads-up
2023-10-30 22:04:54 -04:00
Julia 6e45e454ff Port zed/src/languages to zed2 2023-10-30 21:52:29 -04:00
Mikayla 1b2f9c6eec experiment with a way to recover the any entities when downcasting fails 2023-10-30 18:08:38 -07:00
Mikayla f9657a8660 Change model to downcast with ownership 2023-10-30 18:00:37 -07:00
Mikayla c9e77d2918 Add the entity trait and implement for models, views, subscriptions, and observations 2023-10-30 17:50:21 -07:00
Max Brunsfeld d3fd1731fa Merge branch 'zed2-render' into zed2 2023-10-30 15:37:00 -07:00
Max Brunsfeld 8910cb29c2 Add missing dev-dependency feature for editor multi_buffer dependency 2023-10-30 15:32:52 -07:00
badfb586e6 Introduce a Render trait, make views implement it
Don't pass a render function separately from the view.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Antonio <as-cii@zed.dev>
2023-10-30 15:19:40 -07:00
Joseph T. Lyons e2f8910dc7 Remove print statement 2023-10-30 18:14:04 -04:00
Joseph T. Lyons e98a3732d8 Add script to get crate-level completion status 2023-10-30 18:13:18 -04:00
Joseph T. Lyons 244378be87 Port PR #3131 to zed2 (#3187)
Part of: 

- https://github.com/zed-industries/zed/pull/3174

Release Notes:

- N/A
2023-10-30 17:47:00 -04:00
Marshall Bowers 9f328318bc Tweak style for color scale story 2023-10-30 17:45:37 -04:00
Joseph T. Lyons f12c384d4c Port PR #3131 to zed2 2023-10-30 17:41:26 -04:00
Marshall Bowers eb51192664 theme2: Correctly reference the dark alpha scale 2023-10-30 17:35:13 -04:00
Marshall Bowers a921e7ab06 Merge branch 'theme-color-scales' into zed2 2023-10-30 17:31:51 -04:00
Marshall Bowers 61b3fcafcf Add a story showcasing the color scales 2023-10-30 17:31:15 -04:00
Marshall Bowers d673be04ed Fix alpha channel values for color scales 2023-10-30 17:20:43 -04:00
Marshall Bowers 95cb0ad4d6 Add type alias for steps in color scales 2023-10-30 17:08:37 -04:00
Marshall Bowers a24b93badc Register all of the color scales 2023-10-30 17:03:33 -04:00
Marshall Bowers 87b7f9ffb0 Define all color scales 2023-10-30 17:00:46 -04:00
Kirill Bulatov e431b20d39 Return proper full paths for single file workspaces 2023-10-30 22:33:44 +02:00
Kirill Bulatov c5d357890a Start message numbering during prettier init, log error message text 2023-10-30 22:26:06 +02:00
Marshall Bowers 0dfa1839d6 Start work on defining color scales 2023-10-30 16:21:59 -04:00
KCaverly 9d0f7e4925 update prettier2, call2 and project2 to use fs2 2023-10-30 16:21:58 -04:00
Kirill Bulatov 7031d548f9 Remember default prettier and its plugin installation 2023-10-30 22:09:36 +02:00
Antonio Scandurra 2680820a95 WIP 2023-10-30 20:36:48 +01:00