de020af
Fix duplicate hunk controls after splitting DisplayDiffHunk (#24893)
Click to expand commit body
This PR fixes expanded modification hunks having two sets of hunk
controls after #24834.
Release Notes:
- N/A
Cole Miller
created
610158b
Force manual publishing of preview (#24894)
Click to expand commit body
This is just a temporary change to help us debug with some weird issues
happening:
- Discord release not firing for certain builds
- Random blank release drafts showing up
Release Notes:
- N/A
Joseph T. Lyons
created
2046023
Fix scroll to top on multibuffer save (#24885)
Closes #12519.
Release Notes:
- Added support for Mistral to the Assistant.
---------
Co-authored-by: Marshall Bowers <git@maxdeviant.com>
Shidfar Hodizoda
and
Marshall Bowers
created
5c5caf1
linux: Fix reload hangs for several minutes (#24882)
Click to expand commit body
Closes #22666
This PR fixes the long wait time to open Zed (2 mins in my case) after
reloading on Linux.
This bug fix is funny:
1. We were using TCP for Zed instances to talk to each other. Reload was
broken here too due to TCP connections not being killed on time.
2. [#11488](https://github.com/zed-industries/zed/pull/11488) PR fixed
the TCP connection issue by adding a wait until it gets killed. I
suppose at that time, this wait time was small.
3. Later, we changed how Zed talks to each other in
[#11585](https://github.com/zed-industries/zed/pull/11585) by using
Datagram and removing TCP. The new approach simply uses a `.sock` file
and a file descriptor to check if some program is listening to it.
4. TCP check is now unnecessary, and it still wait for a long time (I
suppose, TIME_WAIT time, don't quote me on this), even though we donβt
use TCP anymore for this.
This PR just removes that unnecessary TCP wait.
Release Notes:
- Fixed issue where reload hangs for several minutes on Linux.
smit
created
39c9b1f
Gutter-highlight removed and added portions of expanded diff hunks separately (#24834)
Click to expand commit body
cc @iamnbutler
Release Notes:
- Color gutter highlights separately for removed and deleted portions of
git modification hunks
Co-authored-by: Conrad <conrad@zed.dev>
Agus Zubiaga
,
Danilo Leal
,
Antonio Scandurra
, and
Marshall Bowers
created
744579e
Move git status updates to a background thread #2 (#24722)
Click to expand commit body
Follow-up of https://github.com/zed-industries/zed/pull/24307
Brings back the PR and fixes the issue with the git status not
propagated, if computed too slow.
Now, git repo update
* waits in the background for all `scan_dir` repo status updates and
triggers another status update send afterwards
* ensures that the update sent is reported correctly (`scanning = true`)
if either FS or status scan is running still
* during worktree's git statuses updates, bumps `status_scan_id` to
ensure the repo update is reported to all subscribers
Release Notes:
- Improved project panel's speed in large projects
Release Notes:
- Fixed a panic when displaying a whitespace-only line in the edit
prediction preview
---------
Co-authored-by: Antonio <antonio@zed.dev>
Agus Zubiaga
and
Antonio
created
a618830
project: Fine-grained language server management (#24038)
Click to expand commit body
Closes #ISSUE
https://github.com/zed-industries/zed/pull/23804
Release Notes:
- Improved detection of project roots for use by language servers.
Closes #ISSUE
Release Notes:
- N/A *or* Added/Fixed/Improved ...
---------
Co-authored-by: smit <0xtimsb@gmail.com>
Co-authored-by: Henrikh Kantuni <henrikh.kantuni@gmail.com>
Co-authored-by: Caleb! <48127194+kaf-lamed-beyt@users.noreply.github.com>
Co-authored-by: Marshall Bowers <git@maxdeviant.com>
Co-authored-by: Kirill Bulatov <kirill@zed.dev>
Co-authored-by: Agus Zubiaga <agus@zed.dev>
Co-authored-by: Danilo <danilo@zed.dev>
Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Piotr Osiewicz
,
smit
,
Henrikh Kantuni
,
Caleb!
,
Marshall Bowers
,
Kirill Bulatov
,
Agus Zubiaga
,
Danilo
, and
Nate Butler
created
We were disabling edit predictions altogether when
`show_edit_predictions` was set to `false`. However, even in that case,
`editor::ShowEditPrediction` is supposed to let your request a
prediction manually.
Release Notes:
- Fixed `editor::ShowEditPrediction` when `show_edit_predictions` is set
to `false`.
Agus Zubiaga
created
79ee01e
theme: Fix icon theme switching changing the theme (#24849)
Click to expand commit body
Closes #24846
Release Notes:
- Fixed an issue where changing the icon theme would change the theme.
Sanjeev Shrestha
created
3b91de8
Adds a way to toggle font size without settings adjustments (#24857)
Click to expand commit body
Closes https://github.com/zed-industries/zed/issues/23505
Now `zed::IncreaseBufferFontSize` (and all the same UI- and
Buffer-related settings) action is parameterized with `{ "persist": true
}` (default).
Using `"persist": false` brings back resizing behavior prior to
https://github.com/zed-industries/zed/pull/23265
Release Notes:
- Added a way to toggle font size without settings adjustments
Kirill Bulatov
created
2f734cb
Fix missing hunks in project diff (#24847)
Click to expand commit body
Release Notes:
- N/A
Cole Miller
created
5ac8216
Attempt to fix issue_response script (#24842)
This might require a few follow-up commits to get this to work! π
Release Notes:
- N/A
Joseph T. Lyons
created
9094f53
Disable edit prediction in Cloudflare Workers `.dev.vars` files (#24838)
Click to expand commit body
This PR adds `.dev.vars` files as a default exclusion for edit
prediction.
These files are used by Cloudflare Workers and are likely to contain
secrets.
Release Notes:
- Excluded Cloudflare Workers `.dev.vars` files from edit prediction.
Marshall Bowers
created
5d26ce1
Centralize the `CopyPath` and `CopyRelativePath` actions to `zed_actions` (#24836)
Click to expand commit body
I spent an hour with @marcospb19 this morning debugging an issue with
adding `Copy Path` and `Copy Relative Path` actions to the editor
context menu. Turned out that the problem was using
`workspace::CopyPath` in the menu and `editor::CopyPath` in the action
handler.
This is an easy mistake to make, so let's fix it for everyone.
Release Notes:
- N/A
Mikayla Maki
created
28c667a
Fix issue with `vim::PushOperator` documentation (#24825)
Click to expand commit body
Closes: #24718
Release Notes:
- N/A
Ben Kunkle
created
c38deb1
zeta: Remove `predict-edits-launch` feature flag (#24829)
Click to expand commit body
This PR removes the `predict-edits-launch` feature flag that was added
in #24720.
We don't need this anymore now that we've launched!
Release Notes:
- N/A
Marshall Bowers
created
8af54c5
zeta: Update URL to edit prediction blog post (#24828)
Click to expand commit body
This PR updates the URL to the edit prediction blog post.
Release Notes:
- N/A
8c202b3
editor: Update git hunk indicators to show staging status when hunk is expanded (#24818)
Click to expand commit body
- Update git hunk indicators to show staging status when hunk is
expanded
- Updates uses of status colors to the new version control theme colors
- Adds new version control theme colors to included themes
Before:

After:

(Colors here are from before theme colors were added)
Release Notes:
- N/A *or* Added/Fixed/Improved ...
---------
Co-authored-by: cole-miller <m@cole-miller.net>
Supercedes #24561
Closes #21059
Before this change we would skip saving multibuffers regardless of the
save intent. Now we correctly save them.
Along the way:
* Prompt to save when closing the last singleton copy of an item (even
if it's still open in a multibuffer).
* Update our file name prompt to pull out dirty project items from
multibuffers instead of counting multibuffers as untitled files.
* Fix our prompt test helpers to require passing the button name instead
of the index. A few tests were passing invalid responses to save
prompts.
* Refactor the code a bit to hopefully clarify it for the next bug.
Release Notes:
- Fixed edge-cases when closing multiple items including multibuffers.
Previously no prompt was generated when closing an item that was open in
a multibuffer, now you will be prompted.
- vim: Fix :wq in a multibuffer
Conrad Irwin
created
8c780ba
Fix branches with slashes in their names not being listed (#24809)
Click to expand commit body
`refs/heads/*` doesn't match e.g. `refs/heads/cole/branch-with-slash`
(thanks fnmatch), but `refs/heads/**/*` does. This also works for
several levels of slash.
Release Notes:
- N/A
Cole Miller
created
de0d9d6
Save open buffers before staging or unstaging their backing files (#24767)
Click to expand commit body
Release Notes:
- N/A
Cole Miller
created
2db5eed
edit predictions: Do not use conflict context for other providers (#24807)
Click to expand commit body
This is to avoid confusing copilot/supermaven users when the cursor is
on leading whitespace.
Release Notes:
- N/A
The MultiWrite struct is defined in the function scope and is allowed to
have a concrete type, which means we can throw away the extra Box.
PathBuf::exists is known to be prone to invalid usage. It doesn't take
into account permissions errors and just returns false, additionally it
introduces a time-of-check time-of-use bug. While extremely unlikely,
why not fix it anyway.
Release Notes:
- remove unnecessary Box
- prevent time-of-check time-of-use bug
7186709
Migrate edit_prediction_provider setting before updating its value to 'zed' during onboarding (#24781)
Click to expand commit body
This fixes a bug where we'd update your settings to an invalid state if
you were using the old `inline_completion_provider` setting, then
onboarded to Zeta, then migrated your settings.
Release Notes:
- N/A
Co-authored-by: Michael Sloan <mgsloan@gmail.com>
Co-authored-by: Agus Zubiaga <hi@aguz.me>
Max Brunsfeld
,
Michael Sloan
, and
Agus Zubiaga
created
3d68dba
edit predictions: Iterate on onboarding modal copywriting (#24779)
f0cd71e
Update cloudflare/wrangler-action digest to 392082e (#24753)
Click to expand commit body
This PR contains the following updates:
| Package | Type | Update | Change |
|---|---|---|---|
|
[cloudflare/wrangler-action](https://redirect.github.com/cloudflare/wrangler-action)
| action | digest | `7a5f8bb` -> `392082e` |
---
### Configuration
π **Schedule**: Branch creation - "after 3pm on Wednesday" in timezone
America/New_York, Automerge - At any time (no schedule defined).
π¦ **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.
β» **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.
π **Ignore**: Close this PR and you won't be reminded about this update
again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box
---
Release Notes:
- N/A
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNjcuMSIsInVwZGF0ZWRJblZlciI6IjM5LjE2Ny4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate[bot]
and
renovate[bot]
created
a13c2ba
Improve error message for `AcceptEditPredictions` - add docs link (#24772)
Click to expand commit body
The docs have not been updated yet, this is anticipating their presence
soon.

Release Notes:
- N/A
Michael Sloan
created
7ba1492
file_icons: Add separate icon key for Bicep files (#24757)
Click to expand commit body
This PR adds support for bicep file icon:
Release Notes:
- Icon themes: Added the ability to change the file icon for Bicep
(`.bicep`) files.
Michal Vrbata
created
0a68122
edit predictions: Enable blog post link behind a feature flag (#24720)
Click to expand commit body
This PR updates the blog post link in the onboarding modal to be behind
the `predict-edits-launch` feature flag instead of a staff flag.
This will allow us to enable the blog post link once we're live.
Release Notes:
- N/A
---------
Co-authored-by: Marshall Bowers <git@maxdeviant.com>
This PR makes it so Zeta respects the `x-zed-minimum-required-version`
header sent back from the server.
If the current Zed version is strictly less than the indicated minimum
required version, we show an error indicating that an update is required
in order to continue using Zeta:
<img width="472" alt="Screenshot 2025-02-12 at 6 15 44β―PM"
src="https://github.com/user-attachments/assets/51b85dff-23a0-464c-ae4b-5b8f46b5915c"
/>
Release Notes:
- N/A
Marshall Bowers
created
0e42a69
Update dependency danger to v12.3.4 (#24770)
Click to expand commit body
This PR contains the following updates:
| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [danger](https://redirect.github.com/danger/danger-js) | [`12.3.3` ->
`12.3.4`](https://renovatebot.com/diffs/npm/danger/12.3.3/12.3.4) |
[](https://docs.renovatebot.com/merge-confidence/)
|
[](https://docs.renovatebot.com/merge-confidence/)
|
[](https://docs.renovatebot.com/merge-confidence/)
|
[](https://docs.renovatebot.com/merge-confidence/)
|
---
### Release Notes
<details>
<summary>danger/danger-js (danger)</summary>
###
[`v12.3.4`](https://redirect.github.com/danger/danger-js/blob/HEAD/CHANGELOG.md#1234)
[Compare
Source](https://redirect.github.com/danger/danger-js/compare/12.3.3...12.3.4)
- Ensure that [babel ignores](https://babeljs.io/docs/options#ignore) do
not cause the transpiler to fall over, by supporting the
`null` return from `loadOptions` which occurs when a file is ignored.
- Allow absolute paths for a Dangerfile
</details>
---
### Configuration
π **Schedule**: Branch creation - "after 3pm on Wednesday" in timezone
America/New_York, Automerge - At any time (no schedule defined).
π¦ **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.
β» **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.
π **Ignore**: Close this PR and you won't be reminded about this update
again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box
---
Release Notes:
- N/A
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNjcuMSIsInVwZGF0ZWRJblZlciI6IjM5LjE2Ny4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate[bot]
and
renovate[bot]
created
b014afa
Add an undo button to the git panel (#24593)
Click to expand commit body
Also prep infrastructure for pushing a commit
Release Notes:
- N/A
---------
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Mikayla Maki
,
Conrad Irwin
,
Conrad
, and
Nate Butler
created
This PR fixes autoscroll flickering issue caused by recent
[#24735](https://github.com/zed-industries/zed/pull/24735) which fixes
soft wrap scroll issues. No release notes, as this was few hours ago.
Adding vertical scrollbar width to viewport width, so that autoscroll
function don't try to that much pixels extra.
Release Notes:
- N/A
smit
created
5dc3c23
workspace: Do not reuse window for sub directory (only for root directory and sub files) (#24560)
Click to expand commit body
Closes #10232
Context:
We have three ways to open files or dirs in Zed: `zed`, `zed --new`, and
`zed --add`. `--new` forces the project to open in a new window, while
`--add` forces it to open in an existing window (even if the dir isnβt a
subdir of an existing project or the file isnβt part of it).
Using just `zed` tries to open it in an existing window based on similar
logic of `--add`, but if no related project is found the dir, opens in a
new window.
Problem:
Right now, subdirs that are part of an existing project open in the
existing window when using `zed`. By default, subdirs should open in a
new window instead. If someone wants to open it in the existing window,
they can explicitly use `--add`. After this PR, only root dir and files
will focus on existing window, when `zed ` is used.
Fix:
For the `zed` case, weβve filtered out subdirs in the logic that assigns
them to an existing window.
Release Notes:
- Fixed an issue where subdirectories of an already opened project, when
opened via the terminal, would open in the existing project instead of a
new window.
smit
created
c771ca4
Fix <1px gap between diff popover and accept keybindingg (#24756)