Commit log

edb2f60 Use the correct icons in AssistantPanel header

Antonio Scandurra created

02bd4fb Simplify focus management in AssistantPanel

Antonio Scandurra created

e96197d Ensure editor gets focused when selecting conversation

Antonio Scandurra created

d02ff42 Dismiss theme_selector on esc (#3502)

Federico Dionisi created

f798b19 WIP

Nate Butler created

197f355 Add `row-reverse` and `col-reverse` to styled

Nate Butler created

7a1eb54 checkpoint

Nate Butler created

42a3da4 Update pickers (#3529)

Click to expand commit body
[[PR Description]]

- Update the size of all pickers
- Additional styling fixes for File Finder and Outline palettes
- Extend the ui prelude to include common imports

Release Notes:

- N/A

Nate Butler created

84aaeb4 Fix incorrect text style in outline palette, use background highlights for matches

Nate Butler created

da3ba35 add `color_alpha` function

Nate Butler created

2a68a61 Remove remnants from conflict resolution (#3528)

Click to expand commit body
Fixes a couple of things that slipped through when going through the
last merge conflict

Release Notes:

- N/A

Joseph T. Lyons created

fffe4f5 Update pickers to have a consistently larger size

Nate Butler created

27e1787 Feedback 2 (#3527)

Click to expand commit body
Ports feedback crate over to zed2. Introduces modal feedback. Feedback
submission works, but there are some TODOs in the code for things that
need to be done (needs a UI pass, dismissing the modal in certain cases,
etc), but I might merge this to reduce chances of conflicts (aleady had
to deal with a few).

<img width="1378" alt="SCR-20231206-udgp"
src="https://github.com/zed-industries/zed/assets/19867440/99f9e843-ac9c-4df1-b600-2522863e6459">

Release Notes:

- N/A

Joseph T. Lyons created

9e6103f Merge branch 'main' into update-pickers

Nate Butler created

d2362d7 Merge branch 'main' into feedback-2

Joseph T. Lyons created

79e0d8c WIP

Joseph T. Lyons created

ee45db8 Use `when_else()`

Joseph T. Lyons created

8fc15c0 Introduce `when_else()`

Joseph T. Lyons created

256f030 Renove unused code

Joseph T. Lyons created

d62b151 Improve character limit bounds indicator

Joseph T. Lyons created

b2a0c32 Terminal2 (#3449)

Click to expand commit body
Release Notes:

-

Mikayla Maki created

668f5ac Highlight whole modal as needing UI tweaks

Joseph T. Lyons created

66b9321 Fix selection backgrounds

Mikayla created

57a9f02 Remove email address from local database if user removes it

Joseph T. Lyons created

22cd622 Tear out drag event listener

Mikayla created

bbe9986 Start work to add a confirmation when exiting feedback containing text

Joseph T. Lyons created

1abc980 Switch to if let statement

Joseph T. Lyons created

034c11c Hook up community repo button

Joseph T. Lyons created

0885fa6 Hook up submit

Joseph T. Lyons created

c8cb114 Clean up how we open the recent projects picker (#3526)

Click to expand commit body
This PR performs some light cleanup of how we open the recent projects
picker, to bring it more in-line with our other picker code.

Release Notes:

- N/A

Marshall Bowers created

c092cfb Fix bug with IME

Click to expand commit body
Adjust how IME works in the terminal

co-authored-by: nathan <nathan@zed.dev>

Mikayla and nathan created

a4b271e Port `recent_projects` to Zed2 (#3525)

Click to expand commit body
This PR ports the `recent_projects` crate to Zed2 (`recent_projects2`).

Absent from this PR is wiring up the "Recent Projects" item in the title
bar. We'll come back to that soon.

Release Notes:

- N/A

Marshall Bowers created

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