Commit log

09a4cfd git_ui: Panel Horizontal Scroll (#26402)

Click to expand commit body
Known Issues:
- When items can horizontal scroll, the right selected border is hidden

TODO:
- [ ] Width calculation is off
- [ ] When scrollbars should autohide they don't until hovering the
panel
- [ ] When switching to and from scrollbar track being visible we are
missing a notify somewhere.

Release Notes:

- Git Panel: Added horizontal scrolling in the git panel

---------

Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-authored-by: Cole Miller <m@cole-miller.net>
Co-authored-by: Cole Miller <cole@zed.dev>

Nate Butler , Max Brunsfeld , Cole Miller , and Cole Miller created

5d66c3d Git panel editor scroll (#26465)

Click to expand commit body
Release Notes:

- N/A

Conrad Irwin created

28f33d0 Fix conflict marker in project diff view (#26466)

Click to expand commit body
Closes #ISSUE

Release Notes:

- N/A

Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>

Conrad Irwin and Max Brunsfeld created

55a90f5 ui: Split up `ContextMenu::render` into smaller methods (#26489)

Click to expand commit body
This PR refactors the `ContextMenu::render` method to extract a couple
smaller methods from it.

The existing `render` method was suffering from its size, with some of
the `match` arms not being able to be formatted with `rustfmt`.

Release Notes:

- N/A

Marshall Bowers created

8d6abf6 Improve terminal hover tooltips (#26487)

Click to expand commit body
Follow-up of https://github.com/zed-industries/zed/pull/26174

* Fixes `./path/foo.bar` not properly parsed as valid open target
* Shows full open target's path in cmd-hover tooltips

Before:

<img width="864" alt="before_1"
src="https://github.com/user-attachments/assets/2575b887-6c4d-486e-8e92-dd76aedf8103"
/>
<img width="864" alt="before_2"
src="https://github.com/user-attachments/assets/ded1f203-523c-4b75-afe9-fe541c785798"
/>

After:

<img width="864" alt="after_1"
src="https://github.com/user-attachments/assets/c50d9ba3-5dfb-4cfb-aed6-00e6fa6f088e"
/>
<img width="864" alt="after_2"
src="https://github.com/user-attachments/assets/0cdc8f34-7faa-4aab-87f3-dc0c8b499842"
/>

Release Notes:



- N/A

Kirill Bulatov created

04961a0 Tweak stage/unstage-and-next to start a commit instead of wrapping in the project diff editor (#26434)

Click to expand commit body
Release Notes:

- Git Beta: improved the stage-and-next and unstage-and-next actions in
the project diff editor to start a commit after acting on the last hunk

Cole Miller created

fd7ab20 Don't clobber the user's upstream settings (#26486)

Click to expand commit body
It's not clobbering time :(

Release Notes:

- Git Beta: Fixed a bug where our push button would always overwrite the
current branch's upstream

Mikayla Maki created

7019aca git_ui: Truncate long repository and branch names for respective selectors in panel (#26483)

Click to expand commit body
This PR fixes a long repo name pushing the branch selector off the
screen, as well as just generally truncating them down in a way smarter
than a fixed character limit when long.

| Before | After |
|---------|-----------|
| ![CleanShot 2025-03-11 at 17 21
31@2x](https://github.com/user-attachments/assets/8762b5a7-883c-4080-a6cf-e8007c4737e7)
| ![CleanShot 2025-03-11 at 17 21
44@2x](https://github.com/user-attachments/assets/c3904c29-d939-445f-b700-5bf73f257256)
|


Release Notes:

- Git Panel: Smart truncate long branch and repository names in their
respective selectors

Nate Butler created

d43bcc0 assistant2: Remove "Tools" switch (#26485)

Click to expand commit body
This PR removes the "Tools" switch from Assistant 2, as we can manage
tools from the tool selector now.

Release Notes:

- N/A

Marshall Bowers created

2b94a35 Rework git toasts (#26420)

Click to expand commit body
The notifications from git output could take up variable amounts of
screen space, and they were quite obnoxious when a git command printed
lots of output, such as fetching many new branches or verbose push
hooks.

This change makes the push/pull/fetch buttons trigger a small
notification toast, based on the output of the command that was ran. For
errors or commands with more output the user may want to see, there's an
"Open Log" button which opens a new buffer with the output of that
command.

It also uses this behavior for long error notifications for other git
commands like `commit` and `checkout`. The output of those commands can
be quite long due to arbitrary githooks running.

Release Notes:

- N/A

---------

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>

Julia Ryan and Mikayla Maki created

e820864 assistant2: Show scripting tool in the tool selector (#26484)

Click to expand commit body
This PR adds the scripting tool to the tool selector.

Release Notes:

- N/A

Marshall Bowers created

a90f807 settings: Enable JSX tag auto-close by default (#26481)

Click to expand commit body
Based on conversation with @maxbrunsfeld. Enabling Tag auto closing by
default so that it is discoverable for new and existing users

Release Notes:

- Made it so JSX tag auto-closing is automatically enabled in supported
languages

Ben Kunkle created

4e6c37d assistant2: Add tool selector (#26480)

Click to expand commit body
This PR adds a tool selector to Assistant 2 to facilitate customizing
the tools that the model sees:

<img width="1297" alt="Screenshot 2025-03-11 at 4 25 31 PM"
src="https://github.com/user-attachments/assets/7a656343-83bc-4546-9430-6a5f7ff1fd08"
/>

Release Notes:

- N/A

Marshall Bowers created

0cf6259 Make nano save (`ctrl-o`) work by-default in terminal (linux) (#26479)

Click to expand commit body
Closes: https://github.com/zed-industries/zed/issues/15770

Release Notes:

- Make nano save (`ctrl-o`) work by-default in terminal (linux)

Peter Tripp created

5cb5e92 Bump aws-lc-rs to fix Windows release builds (#26477)

Click to expand commit body
Closes https://github.com/zed-industries/zed/discussions/24816

https://github.com/aws/aws-lc-rs/releases/tag/v1.12.6 release includes a
fix for https://github.com/aws/aws-lc-rs/issues/707

Release Notes:

- N/A

Kirill Bulatov created

da61a28 assistant_tool: Fix inaccurate parameter name (#26473)

Click to expand commit body
This PR fixes an inaccurate parameter name in the
`ToolWorkingSet::insert` method.

Release Notes:

- N/A

Marshall Bowers created

efdb769 terraform: Extract to zed-extensions/terraform repository (#26475)

Click to expand commit body
This PR extracts the Terraform extension to the
[zed-extensions/terraform](https://github.com/zed-extensions/terraform)
repository.

Release Notes:

- N/A

Marshall Bowers created

9cce5a6 assistant_tool: Add a `source` to the `Tool` trait (#26471)

Click to expand commit body
This PR adds a `source` method to the `Tool` trait.

This will allow us to track where a tool is coming from.

Release Notes:

- N/A

Marshall Bowers created

2021ca5 terraform: Do not add each string constraint to the outline (#26453)

Click to expand commit body
Closes #26336

Release Notes:

- N/A

Piotr Osiewicz created

1771250 Add 'Open Remote...' to File Menu (#26288)

Click to expand commit body
Added some spacers while I was at it.

Release Notes:

- Added 'Open Remote...' to File menu

Peter Tripp created

18259c0 chore: Bump `windows` crate version (#26455)

Click to expand commit body
Closes #ISSUE

Release Notes:

- N/A

张小白 created

41ddd1c editor: Fix text selection not visible on text background (#26454)

Click to expand commit body
Closes #25014

Previously, we painted in the order: highlights -> text background ->
text -> etc. This caused text selection to be invisible when the text
had a background.

This PR changes the painting order to: text background -> highlights ->
text -> etc.

Before:


https://github.com/user-attachments/assets/5d9647c4-3ab2-4960-b6b9-e399882a0c50

After:


https://github.com/user-attachments/assets/c699f5b9-4077-45f8-85e5-86c89130eb71

Release Notes:

- Fixed an issue where text selection was not visible on top of a text
background in the editor.

Smit Barmase created

e175878 macOS: Remove multi-keystroke rendering in title of menu item (#26448)

Click to expand commit body
Closes #25483

Currently, macOS doesn't support showing multi-keystroke shortcuts in
menu items. We can use an attributed string to differentiate them, but
that breaks consistency with traditional shortcuts.

This PR removes the hack of concatenating the multi-keystroke shortcut
to the title, as it looked a bit janky.

Release Notes:

- N/A

Smit Barmase created

1cfbfc1 windows: Fix tests (#26450)

Click to expand commit body
Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...

张小白 created

f59f2ca Fix tests on Windows (#26449)

Click to expand commit body
Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...

张小白 created

401342c assistant: Display edits from scripts in panel (#26441)

Click to expand commit body
https://github.com/user-attachments/assets/a486ff2a-4aa1-4c0d-be6c-1dea2a8d60c8
 
- [x] Track buffer changes in `ScriptingSession`
- [x] Show edited files in thread

Reviewing diffs and displaying line counts will be part of an upcoming
PR.

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>

Agus Zubiaga and Antonio Scandurra created

0df1e4a Address out-of-bounds panic in inline completion button (#26394)

Click to expand commit body
Closes #26350

Release Notes:

- Git Beta: Fixed a panic that could occur when using the project diff

Cole Miller created

9bd3e15 Fix enter binding in git panel's commit editor on Linux (#26427)

Click to expand commit body
Closes #26110 

Release Notes:

- Git Beta: fixed being unable to enter newline in the git panel's
commit editor on Linux

Cole Miller created

42c6557 Show a disabled stage all button for no entries (#26436)

Click to expand commit body
Closes #ISSUE

Release Notes:

- N/A

Conrad Irwin created

ff1d78d Go back to "create branch" in the list (#26433)

Click to expand commit body
Closes #ISSUE

Release Notes:

- N/A

Conrad Irwin created

c2e4fdf Git commit modal branch list (#26417)

Click to expand commit body
Closes #26273

Release Notes:

- git: Fixes opening the branch selector in the commit modal with
cmd-option-b
- git: Truncates the branch selector in the commit modal

Conrad Irwin created

bf11b88 scripting tool: Use project buffers in `io.open` (#26425)

Click to expand commit body
This PR makes `io.open` use our own implementation again, but instead of
the real filesystem, it will now use the project's to check file
metadata and perform read and writes using project buffers.

This also cleans up the `io.open` implementation by splitting it into
multiple methods, adds tests for various File I/O patterns, and fixes a
few bugs in read formats.

Release Notes:

- N/A

Agus Zubiaga created

d562f58 git_ui: Show more information in the branch picker (#25359)

Click to expand commit body
Final product:

![CleanShot 2025-02-26 at 9  08
17@2x](https://github.com/user-attachments/assets/e5db1932-b2c6-4b32-ab67-ef0a0d19f022)

Release Notes:

- Added more information about Git branches to the branch picker.

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Co-authored-by: Marshall Bowers <git@maxdeviant.com>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>

Angelk90 , Danilo Leal , Marshall Bowers , and Conrad Irwin created

94e4aa6 Use current upstream for permalink to line (#26398)

Click to expand commit body
Release Notes:

- git: Copy permalink to line now uses the upstream of the current
branch instead of "origin"

Conrad Irwin created

8ceba89 ui: Fix error code in button comment (#26423)

Click to expand commit body
Closes #ISSUE

Release Notes:
ui: Fix error code in button comment.

- N/A *or* Added/Fixed/Improved ...

lydiandy created

c37d6d5 Unwind deprecated permalinks code (#26395)

Click to expand commit body
Release Notes:

- N/A

Conrad Irwin created

1a3597d Fix race conditions in updating buffer diffs on git changes (#26409)

Click to expand commit body
Release Notes:

- N/A

---------

Co-authored-by: Cole Miller <m@cole-miller.net>

Max Brunsfeld and Cole Miller created

c747ccc Revert "Return back a proper `resolved` value (#26406)" (#26419)

Click to expand commit body
This reverts commit 1f8b14f4f11e0aab9cd6754690b8315af3ab4757.

Release Notes:

- N/A

Kirill Bulatov created

d81e768 Use proper order of `Completion::Source` field to have sane default (#26416)

Click to expand commit body
Follow-up of https://github.com/zed-industries/zed/pull/26300

Release Notes:

- N/A

Kirill Bulatov created

8b29ee6 Add `variable.special` color to Gruvbox themes (#26271)

Click to expand commit body
This adds the `variable.special` color to the Gruvbox family of themes,
which colors special variables (in Rust's case `self`) differently than
normal ones. The colors were taken from the old Gruvbox `variable`
highlighting (see https://github.com/zed-industries/zed/pull/25464).

before:

![image](https://github.com/user-attachments/assets/3f329ac0-fbdf-480c-9074-5db99591f4e1)

![image](https://github.com/user-attachments/assets/43efdddd-7daf-440f-8c11-d6279330912a)

after:

![image](https://github.com/user-attachments/assets/052c05b8-55c5-495a-a9cc-a5f73aa5aa00)

![image](https://github.com/user-attachments/assets/f598b75f-8d2d-4710-b804-9282de9f8d15)

fixes half of https://github.com/zed-industries/zed/issues/26206. Since
I don't use the Ayu themes I'd prefer someone who knows what looks good
there does those changes.

Release Notes:

- Gruvbox themes: Added a color for `@variable.special` syntax
highlights.

edwloef created

96a75e0 Fix panic opening branch picker in commit modal (#26407)

Click to expand commit body
Closes #ISSUE

Release Notes:

- N/A

Conrad Irwin created

06cbff6 assistant2: Remove excess padding around scripting tool inputs (#26412)

Click to expand commit body
This PR removes some excess padding around the rendered scripting tool
inputs.

Release Notes:

- N/A

Marshall Bowers created

ce05813 assistant2: Render scripting tool inputs when opening past threads (#26408)

Click to expand commit body
This PR makes it so we render the scripting tool inputs to Markdown when
opening past threads.

Release Notes:

- N/A

Marshall Bowers created

4d1d8d6 Git commit modal command (#26405)

Click to expand commit body
Fix KeyBinding::for_action() to use the active focus handle instead of
what was
rendered last.

This makes the UI consistently chose the cmd-escape binding for close
(because escape in the editor is editor::Cancel?),
so force it to be "escape"

Release Notes:

- git: Fixed escape tooltip in commit modal

Conrad Irwin created

1f8b14f Return back a proper `resolved` value (#26406)

Click to expand commit body
Follow-up of https://github.com/zed-industries/zed/pull/26300


https://github.com/zed-industries/zed/pull/26300/files#diff-a3da3181e4ab4f73aa1697d7b6dc0caa0c17b2a187fb83b076dfc0234ec91f54L16900
changed the snippets' `resolved` value but it should have not.

Release Notes:

- N/A

Kirill Bulatov created

082cc61 assistant2: Persist scripting tool uses in saved threads (#26404)

Click to expand commit body
This PR makes it so the scripting tool uses are persisted to and
restored from saved threads.

Release Notes:

- N/A

Marshall Bowers created

6cfc4dc gpui: Fix transparent titlebar in fullscreen mode on macOS (#26403)

Click to expand commit body
Closes #23735

This PR fixes an issue where Zed shows a transparent title bar in
fullscreen mode on macOS instead of the default gray one.

When switching to fullscreen mode, we change the title bar appearance to
opaque. When exiting fullscreen mode, we check the existing
`appears_transparent` flag that we pass to gpui to decide whether to
change the title bar back to transparent or not.

Note: Regardless of the `appears_transparent` flag, gpui should always
show an opaque title bar in fullscreen mode to prevent a broken
appearance, as macOS always displays the title bar in fullscreen mode
upon mouse interaction.


https://github.com/user-attachments/assets/211fb185-239b-454e-ac7f-b93b25d33805

Release Notes:

- Fixed issue where Zed showed transparent titlebar in fullscreen mode
on macOS.

Smit Barmase created

b9c4868 terminal: Support trailing `:description or error message` after file path (#26401)

Click to expand commit body
Closes #25086

Release Notes:

- Fixed a bug where file paths in the built in terminal of the format
`path/to/file.ext:row:col:description or error message` would not be
correctly identified as file paths due to the colon & additional text at
the end

Ben Kunkle created

570c396 assistant2: Remove unneeded `pub` on field (#26399)

Click to expand commit body
This PR removes an unneeded `pub` on a field in the `ContextStrip`, as
it was never accessed externally.

Release Notes:

- N/A

Marshall Bowers created

5fd034e docs: Add documentation for using debuggers with Zed (#26391)

Click to expand commit body
Just some basic documentation for using debuggers in Zed development.
Goes over configuring cargo to include full debug info, attaching to an
instance of Zed, and using a debugger to debug panics and crashes

Release Notes:

- N/A

Ben Kunkle created