Commit log

110612b Reduce amount of state being stored

Joseph T. Lyons created

fd31e42 Merge branch 'main' into terminal-element

Mikayla created

12e7f61 Fix a porting bugs for terminal2

Click to expand commit body
co-authored-by: Nathan <nathan@zed.dev>

Mikayla and Nathan created

1a747c8 Upgrade async-compression dep (#3524)

Click to expand commit body
Fixes a build failure on CI:


https://github.com/zed-industries/zed/actions/runs/7120057787/job/19387718091

```
2023-12-06 21:26:40.468791 +00:00:00 [ERROR] `cargo metadata` exited with an error:     Updating crates.io index
error: failed to select a version for `async-compression`.
    ... required by package `zed2 v2.0.0-nightly (/Users/administrator/actions-runner-2/_work/zed/zed/crates/zed2)`
versions that meet the requirements `^0.3` (locked to 0.3.15) are: 0.3.15

the package `zed2` depends on `async-compression`, with features: `futures-bufread-nightly` but `async-compression` does not have these features.
```

Max Brunsfeld created

2d18b94 Upgrade async-compression dep

Max Brunsfeld created

46c998c WIP

Joseph T. Lyons created

a8d9679 Enable buffer font size adjustment in zed2 (#3523)

Max Brunsfeld created

b72c54f Don't load the Vim keymap temporarily (#3522)

Click to expand commit body
This PR removes the loading of the Vim keymap temporarily.

This cuts down on the noise from all of the Vim-related action warnings.

We can resume loading the Vim keymap once we're ready to add Vim
support.

Release Notes:

- N/A

Marshall Bowers created

89c8a7c Enable buffer font size adjustment in zed2

Click to expand commit body
Co-authored-by: Nathan <nathan@zed.dev>

Max Brunsfeld and Nathan created

41fc30f Always show tooltips on buttons (#3521)

Click to expand commit body
This PR fixes an issue where tooltips weren't being shown on selected
buttons.

We now always show tooltips on buttons that have one.

Release Notes:

- N/A

Marshall Bowers created

f4c7b13 temp

Joseph T. Lyons created

f7c995c Add "Toggle Inlay Hints" quick action (#3520)

Click to expand commit body
This PR adds the "Toggle Inlay Hints" quick action to the toolbar.

Release Notes:

- N/A

Marshall Bowers created

cd818f5 Wire up inline assist quick action (#3519)

Click to expand commit body
This PR wires up the inline assist quick action in the toolbar.

Release Notes:

- N/A

Marshall Bowers created

dba94c5 Bring back channel notes (#3506)

Max Brunsfeld created

dbb501d Add gap between label and keybinding in `Tooltip`

Marshall Bowers created

d711087 Wire up inline assist quick action

Marshall Bowers created

ebddb61 Do not run the same workflow concurrently on non-main branches (#3518)

Click to expand commit body
<img width="1376" alt="image"
src="https://github.com/zed-industries/zed/assets/2690773/681cca85-e1b9-4a99-8363-60c931ba1393">

For any push (or force-push) into a branch, a separate CI workflow is
run.
This is rather worker-consuming, esp. given the fact that GitHub will
wait for the last job to update PR's status.
So cancel every old job for the same branch if it's not `main`.
CI run on `main` might catch a regression brought in by specific PR
merged, so run CI on every commit due to that.


Release Notes:

- N/A

Kirill Bulatov created

62c41e2 Use distinct version for zed2, append git hash to its nightly version (#3507)

Click to expand commit body
Current panic reports are now harder to tell apart by the following
criteria:
* nightly or preview or stable
* zed2 or zed1
 

![image](https://github.com/zed-industries/zed/assets/2690773/d12c8272-9f78-403c-ba49-e5f05982c0f5)

Current PR adds uses a different version for zed2 (2.0.0, selected
relatively arbitrary as zed2 is nothing officially released now) and
adds a `-nightly` suffix to the version number of the nightly bundle.

Release Notes:

- N/A

Kirill Bulatov created

b94c335 Do not run the same workflow concurrently on non-main branches

Kirill Bulatov created

6bbb164 Fix propagation of active item to followers

Click to expand commit body
Enable channel buffer integration tests.

Max Brunsfeld created

e9dcca7 Initialize channel notes to register the view as followable

Max Brunsfeld created

1ec81e0 Allow opening channel notes from the channel list

Max Brunsfeld created

bcdefb8 Bring back channel notes

Max Brunsfeld created

5644815 Use a better name for zed2 inlay style field

Kirill Bulatov created

9e1d797 Use distinct version for zed2, append git hash to its nightly version

Kirill Bulatov created

ec798e6 Pass proper theme colors for inlays and suggestions (#3517)

Click to expand commit body
<img width="1728" alt="image"
src="https://github.com/zed-industries/zed/assets/2690773/f6f1e24f-71fe-4a2e-9bcf-9e98861c0da4">


![image](https://github.com/zed-industries/zed/assets/2690773/8434d8a1-ee7e-49c1-9e88-362363225d96)

Now inlays are visible in all zed2 themes, but 
* always have a blue color which is the same as some theme colors
* not other hint-related style changes like font width, background, etc.
seem to exist in the theme, ergo not propagated.

In general though, people want those style changes applied to their
hints, so we might want to do something about it later.
I've left a `// todo!("what about the rest of the highlight style parts
for inlays and suggestions?")` in the corresponding places for that.

Release Notes:

- N/A

Kirill Bulatov created

d7473ad Document geometry module and replace `zero` method with `default` (#3515)

Click to expand commit body
Nothing earth-shattering here, but all our geometry types are now fully
documented.

Release Notes:

- N/A

Nathan Sobo created

5ebf1d9 Put ToggleZoom key binding back into the block with no context (#3516)

Click to expand commit body
Fixes a regression in zed1 from
https://github.com/zed-industries/zed/pull/3491

Max Brunsfeld created

f76e1cf Pass proper theme colors for inlays and suggestions

Kirill Bulatov created

489c25a Put ToggleZoom key binding back into the block with no context

Max Brunsfeld created

ac07e23 Document geometry

Nathan Sobo created

147c99f Fix layout for terminal tabs (#3514)

Click to expand commit body
This PR fixes the layout for terminal tabs.

We need to use an `h_stack` here to get the icon and the label to
position themselves next to each other instead of one on top of the
other.

Release Notes:

- N/A

Marshall Bowers created

02a6a2e Revert "Delete feedback_modal.rs"

Click to expand commit body
This reverts commit eff925cb6a37df6eab2253c4a6904b51e118a224.

Joseph T. Lyons created

4863c9a WIP

Joseph T. Lyons created

2c350a7 Port `assistant` crate to Zed2 (#3513)

Click to expand commit body
This PR contains the initial port of the `assistant` crate to Zed2.

Release Notes:

- N/A

Marshall Bowers created

fdd6483 Update inline assist styles

Marshall Bowers created

eff925c Delete feedback_modal.rs

Joseph T. Lyons created

7e2ff63 Paint blocks on top of the editor

Click to expand commit body
This ensures blocks get mouse events before the editor beneath
them.

Co-Authored-By: Marshall <marshall@zed.dev>

Antonio Scandurra and Marshall created

cc9eff8 Use a handler instead of an action for clicks

Click to expand commit body
This prevents dispatching actions on buttons that were not the target of the click.

Co-Authored-By: Marshall <marshall@zed.dev>

Antonio Scandurra and Marshall created

e4884f1 Move assistant actions to the top of the crate

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

Antonio Scandurra and Marshall created

02e7a06 Merge branch 'main' of https://github.com/zed-industries/zed

Joseph T. Lyons created

5ae2060 collab 0.30.0

Joseph T. Lyons created

14def2a Merge remote-tracking branch 'origin/main' into assistant-2

Click to expand commit body
# Conflicts:
#	crates/ui2/src/components/icon.rs

Antonio Scandurra created

7c9e2f6 Introduce app menus in `zed2` (#3511)

Click to expand commit body
Release Notes:

- N/A

Antonio Scandurra created

f6a7a6c v0.117.x dev

Marshall Bowers created

2aee3e3 Make `Node::context` optional as well

Click to expand commit body
This was an oversight in d09dfe0.

Co-Authored-By: Marshall <marshall@zed.dev>

Antonio Scandurra and Marshall created

5e558e2 Make more menu-related platform methods no-ops

Antonio Scandurra created

80f3151 Add key context to ConversationEditor

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

Antonio Scandurra and Marshall created

80c8fd1 Fix toolbar not appearing for initial pane (#3512)

Click to expand commit body
This PR fixes an issues where the toolbar would not appear for the
center pane when Zed2 initially loads.

We resolved this by adding a call to initialize the center pane when the
workspace is initialized

Due to changes in the way subscriptions work we can on longer observe an
event that is emitted in the same event cycle in which the subscription
is created.

Because of this we need to explicitly initialize the center pane, as it
won't get performed by the subscription.

Release Notes:

- N/A

---------

Co-authored-by: Antonio <antonio@zed.dev>

Marshall Bowers and Antonio created

886ec79 Make TestPlatform::set_menus a no-op

Antonio Scandurra created