Commit Graph
13772 Commits
Author SHA1 Message Date
Antonio Scandurra b1eb400566 Remove more Send bounds and simplify view rendering (#3207)
This pull request removes more `Send` bounds from GPUI2 after #3206 and
simplifies some internals. Specifically:

- The `Reference` enum was removed, as we always capture mutable
references anyway.
- A few GATs from `Context` and `VisualContext` were removed, as they're
unnecessary now that `MainThread` isn't a thing.
- View rendering was greatly simplified (we were able to remove
`EraseViewState` and `ViewObject`)

Release Notes:

- N/A
2023-11-02 10:04:28 +01:00
Antonio Scandurra fb2f5f1fcc Add back Send and Sync to AssetSource 2023-11-02 09:58:53 +01:00
Antonio Scandurra a92e8751bb Remove stray todo 2023-11-02 09:56:45 +01:00
Antonio Scandurra 51d3b4f8f8 Fix compile errors 2023-11-02 09:47:21 +01:00
Antonio Scandurra 10dac9979c Remove more Send bounds and simplify view rendering 2023-11-02 09:44:16 +01:00
Nathan Sobo d11478464c Restore foreground/background distinction and confine application state to the main thread (#3206)
The potential for deadlock and other complexity ended up convincing us
that the benefits of making the app state accessible from any thread
were not worth their cost. We probably could have gone back to the old
executors, but we decided to fix forward and continue to get the
benefits of the new dispatcher.
2023-11-01 21:29:28 -06:00
Nathan Sobo c015aee641 Fix prod compile error 2023-11-01 21:19:06 -06:00
Nathan Sobo ef3a1ff26e Fix post-merge compile errors 2023-11-01 21:16:41 -06:00
Nathan Sobo c5a361d12b Merge remote-tracking branch 'origin/main' into gpui2-no-send 2023-11-01 21:10:31 -06:00
Nathan Sobo c3ff8609e8 Get language2 tests passing by not blocking on a foreground task 2023-11-01 21:04:17 -06:00
Nathan Sobo d2d9430fc8 Get project2 tests green 2023-11-01 20:14:40 -06: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 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 BrunsfeldandNathan 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
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
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 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
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 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
Antonio Scandurra b2615c691d Call initialize on the rendered element on AnyView 2023-10-31 17:17:42 +01:00
Conrad Irwin 498eb16dd5 Implement start/finish waiting for gpui2
I'm not sure these are strictly necessary, but it will make porting
tests easier to have them.
2023-10-31 16:14:10 +00:00
Conrad Irwin 7550c0b14d Actually deliver test events to subscribers 2023-10-31 16:04:33 +00:00
Conrad Irwin 9d28ac6ab3 Fix block to allow for sync progress 2023-10-31 15:57:01 +00:00
Antonio ScandurraandNathan Sobo 4227873b20 Introduce AnyWeakView
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-10-31 16:19:46 +01:00