Commit Graph
39175 Commits
Author SHA1 Message Date
Kirill Bulatov 880f5f278b WIP
Uncomment more methods in workspace2.rs
2023-11-01 14:47:29 +02:00
Antonio Scandurra b016be65fb WIP 2023-11-01 12:47:19 +01: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
Nathan Sobo 3a939de217 WIP 2023-10-31 22:32:18 -06: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
Nathan Sobo 2c092ec44d Remove one todo from the critical path 2023-10-31 21:19:32 -06: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
Nathan Sobo b520adfc1a WIP 2023-10-31 16:15:30 -06: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
Nathan Sobo 0eecaa18ad Remove Reference 2023-10-31 11:29:13 -06:00
Nathan Sobo e786bc9351 Checkpoint 2023-10-31 11:27:08 -06:00
Nathan Sobo 07c7624e91 Checkpoint 2023-10-31 11:22:40 -06:00
Nathan Sobo a8afca8ad8 Checkpoint 2023-10-31 11:16:08 -06: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
Nathan Sobo 80996e6b64 WIP 2023-10-31 11:03:01 -06: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
KCaverly 8dcbe21096 wip 2023-10-31 12:00:45 -04:00
Conrad Irwin 9d28ac6ab3 Fix block to allow for sync progress 2023-10-31 15:57:01 +00:00
KCaverly db2190a3fc Merge branch 'zed2' of github.com:zed-industries/zed into zed2-workspace 2023-10-31 11:39:34 -04:00
KCaverly 52a4261de9 wip 2023-10-31 11:32:56 -04: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
KCaverlyandKirill c6a6361921 workspace2 is compiling
Co-Authored-By: Kirill <kirill@zed.dev>
2023-10-31 11:14:43 -04:00
KCaverly 1cf52fdeae small window change 2023-10-31 10:50:28 -04:00
KCaverly 0384a0c7b3 wip progress 2023-10-31 10:49:51 -04:00
Conrad Irwin 801b81d06f Call flush_effects in test context update()
In gpui1 we used to do this even outside of top-level contexts, but not
sure we should make tests work that differently to the main app.
2023-10-31 14:24:12 +00:00
KCaverly 60b85d6219 wip 2023-10-31 10:12:40 -04:00
KCaverly 1456ebb218 wip 2023-10-31 10:04:04 -04:00
KCaverlyandKirill dfd672953c dock compiling with todos outstanding
Co-Authored-By: Kirill <kirill@zed.dev>
2023-10-31 09:25:36 -04:00
Conrad Irwin 78f2ea9ec1 Fix entity map drop behavior
The entity map needs to be able to distinguish between the case when
the entity_id is waiting to be dropped, and when it is completely gone.

Before 04cd2fa75, it assumed that entity_ids in dropped_entity_ids could
be re-used. This caused `take_dropped` to error because the slot had
been overwritten. The fix there caused weak handles to allow upgrading
a reference count from 0, which could resurrect items in
`dropped_entity_ids` which caused them to be dropped twice.

We could allow weak items to upgrade from 0, and delete from
dropped_entity_ids, but that seemed more complicated than necessary.
2023-10-31 13:09:35 +00:00
Antonio Scandurra 87b6acb941 WIP 2023-10-31 14:04:59 +01:00
Antonio Scandurra ae251b346a WIP: Make the item module compile again 2023-10-31 13:56:48 +01:00
Antonio Scandurra bb36c30456 Allow WeakView<T> to be hashed and compared 2023-10-31 13:34:54 +01:00
Antonio Scandurra 9d997f3a8c Allow View<T> to be hashed and compared 2023-10-31 13:34:29 +01:00
Antonio Scandurra e8773891f7 Introduce {Window,View}Context::defer 2023-10-31 13:17:05 +01:00
Kirill Bulatov 32784226d7 Remove TODOs 2023-10-31 13:08:18 +02:00
Antonio Scandurra 7be4861efe WIP 2023-10-31 11:56:55 +01: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 c50d9d1b4e Merge branch 'zed2' into zed2-workspace 2023-10-31 10:20:03 +01: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