Commit log

e0cb95b Add From<&str> for Hsla

Nate Butler created

d47ef64 WIP

Nathan Sobo created

272f856 Use `Refineable` for `ThemeStyles` (#3196)

Click to expand commit body
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)

Click to expand commit body
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)

Click to expand commit body
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

Click to expand commit body
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)

Click to expand commit body
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

66b520a Call initialize on the rendered element on AnyView

Antonio Scandurra created

8db6b78 Implement start/finish waiting for gpui2

Click to expand commit body
I'm not sure these are strictly necessary, but it will make porting
tests easier to have them.

Conrad Irwin created

0e9a827 Actually deliver test events to subscribers

Conrad Irwin created

fed391f wip

KCaverly created

81f8e81 Fix block to allow for sync progress

Conrad Irwin created

551171a Merge branch 'zed2' of github.com:zed-industries/zed into zed2-workspace

KCaverly created

68a1c7c wip

KCaverly created

0aa9c6b Introduce `AnyWeakView`

Click to expand commit body
Co-Authored-By: Nathan Sobo <nathan@zed.dev>

Antonio Scandurra and Nathan Sobo created

7b6514b Simplify `AnyView`

Click to expand commit body
Co-Authored-By: Nathan Sobo <nathan@zed.dev>

Antonio Scandurra and Nathan Sobo created

5550e80 workspace2 is compiling

Click to expand commit body
Co-Authored-By: Kirill <kirill@zed.dev>

KCaverly and Kirill created

e315e1b small window change

KCaverly created

663e8ae wip progress

KCaverly created

b8e007c Call flush_effects in test context update()

Click to expand commit body
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.

Conrad Irwin created

eb4ac2c wip

KCaverly created

efce38f wip

KCaverly created

8d0905e dock compiling with todos outstanding

Click to expand commit body
Co-Authored-By: Kirill <kirill@zed.dev>

KCaverly and Kirill created

3e53795 Fix entity map drop behavior

Click to expand commit body
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 8bc207141, 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.

Conrad Irwin created

bbe2dd1 WIP

Antonio Scandurra created

14a6199 WIP: Make the item module compile again

Antonio Scandurra created

e8eea52 Allow WeakView<T> to be hashed and compared

Antonio Scandurra created

46a99c5 Allow View<T> to be hashed and compared

Antonio Scandurra created

163fa3f Introduce {Window,View}Context::defer

Antonio Scandurra created

6a3974d Remove TODOs

Kirill Bulatov created

538a9e1 WIP

Antonio Scandurra created

84c5494 Fix prettier errors around Zed's settings.json/keymap.json files

Click to expand commit body
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.

Kirill Bulatov created

45e695c Fix prettier errors around Zed's settings.json/keymap.json files (#3191)

Click to expand commit body
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

Kirill Bulatov created

6ee9bee Enqueue default prettier installations

Kirill Bulatov created

00c92ae Merge branch 'zed2' into zed2-workspace

Antonio Scandurra created

88875fd Zed2 entities (#3189)

Click to expand commit body
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.

Antonio Scandurra created

c98a811 Only process diagnostics if corresponding project is alive

Click to expand commit body
Part of https://github.com/zed-industries/zed/pull/3128 that is possible
to apply now.

Kirill Bulatov created

bcf3bac Port `zed/src/languages` to zed2 (#3190)

Click to expand commit body
@SomeoneToIgnore I had to port
https://github.com/zed-industries/zed/pull/3150 to zed2 in the process,
giving you a heads-up

Julia created

db34de6 Port `zed/src/languages` to zed2

Julia created

f5b1307 experiment with a way to recover the any entities when downcasting fails

Mikayla created

6f1197e Change model to downcast with ownership

Mikayla created