7ba6f39
Fix macros on x11 sometimes resulting in incorrect input (#44234)
Click to expand commit body
Closes #40678
The python file below simulates the macros at various timings and can be
run by running:
1. `sudo python3 -m pip install evdev --break-system-packages`
2. `sudo python3 zed_shift_brace_replayer.py`
Checked timings for hold=0.1, =0.01 and =0.001 with the latter two no
longer causing incorrect inputs.
[zed_shift_brace_replayer.py](https://github.com/user-attachments/files/23560570/zed_shift_brace_replayer.py)
Release Notes:
- linux: fixed a race condition where the macros containing modifier +
key would sometimes be processed without the modifier
Related to:
- #44510
- #44407
Previously we were searching for hyperlinks on every scroll, even if Cmd
was not held. With this PR,
- We only search for hyperlinks on scroll if Cmd is held
- We now clear `last_hovered_word` in all cases where Cmd is not held
- Renamed `word_from_position` -> `schedule_find_hyperlink`
- Simplified logic in `schedule_find_hyperlink`
Performance measurements
The test scrolls up and down 20,000x in a loop. However, since this PR
is just removing a code path that was very dependent on the length of
the line in terminal, it's not super meaningful as a comparison. The
test uses a line length of "long line ".repeat(1000), and in main the
performance is directly proportional to the line length, so for
benchmarking it in main it only scrolls up and down 20x. I think all
that is really useful to say is that currently scrolling is slow, and
proportional to the line length, and with this PR it is buttery-smooth
and unaffected by line length. I've included a few data points below
anyway. At least the test can help catch future regressions.
| Branch | Command | Scrolls | Iter/sec | Mean [ms] | SD [ms] |
Iterations | Importance (weight) |
|:---|:---|---:|---:|---:|---:|---:|---:|
| main | tests::perf::scroll_long_line_benchmark | 40 | 16.85 | 712.00 |
2.80 | 12 | average (50) |
| this PR | tests::perf::scroll_long_line_benchmark | 40 | 116.22 |
413.60 | 0.50 | 48 | average (50) |
| this PR | tests::perf::scroll_long_line_benchmark | 40,000 | 9.19 |
1306.40 | 7.00 | 12 | average (50) |
| only overhead | tests::perf::scroll_long_line_benchmark | 0 | 114.29 |
420.90 | 2.00 | 48 | average (50) |
Release Notes:
- terminal: Improved scroll performance
Dave Waggoner
created
1104ac7
Revert windows implementation of "Multiple priority scheduler (#44701)" (#44990)
Click to expand commit body
This reverts the windows part of commit
636d11ebec8e74f0f0c173e858597fb57ccfa0b9.
Release Notes:
- N/A
Yara 🏳️⚧️
created
da0960b
languages: Correctly calculate ranges in `label_for_completion` (#44925)
Click to expand commit body
Closes #44825
Release Notes:
- Fixed a case where an incorrect match could be generated in
label_for_completion
---------
Co-authored-by: Kirill Bulatov <mail4score@gmail.com>
Nereuxofficial
and
Kirill Bulatov
created
81519ae
collab: Add `copilot` name alias to the `GET /contributor` endpoint (#44958)
Click to expand commit body
Although the copilot bot integration is referred to by
`copilot-swe-agent[bot]`
(https://api.github.com/users/copilot-swe-agent[bot]), GitHub parses the
copilot identity as @\copilot in some cases, e.g.
https://github.com/zed-industries/zed/pull/44915#issuecomment-3657567754.
This causes the CLA check to still fail despite Copilot being added to
the CLA endpoint (and https://api.github.com/users/copilot returning a
404 for that very name..).
This PR fixes this by also considering the name alias of Copilot for the
`contributor` endpoint.
Release Notes:
- N/A
Finn Evers
created
5f054e8
agent_ui: Create components for the model selector (#44993)
Click to expand commit body
This PR introduces a few components for the model selector pickers.
Given we're still maintaining two flavors of it due to one of them being
wired through ACP and the other through the language model registry,
having one source of truth for the UI should help with maintenance
moving forward, considering that despite the internal differences, they
look and behave the same from the standpoint of the UI.
Release Notes:
- N/A
## Summary
This fixes a minor bug I found #44981
- Fix percent-encoded filenames appearing in agent mentions after
message submission.
- Decode file:// paths in MentionUri::parse using the existing
urlencoding crate (already used elsewhere in the codebase).
- Add tests for non-ASCII file URIs.
## Screenshots
<img width="409" height="116" alt="image"
src="https://github.com/user-attachments/assets/32ef033b-6232-47c5-80c7-d5247d5dae88"
/>
Daiki Takagi
created
37bd27b
diagnostics: Respect toolbar breadcrumbs setting in diagnostics panel (#44974)
Click to expand commit body
## Summary
The diagnostics panel was ignoring the user's `toolbar.breadcrumbs`
setting and always showing breadcrumbs. This makes both
`BufferDiagnosticsEditor` and `ProjectDiagnosticsEditor` check the
`EditorSettings` to determine whether to display breadcrumbs.
## Changes
- `buffer_diagnostics.rs`: Updated `breadcrumb_location` to check
`EditorSettings::get_global(cx).toolbar.breadcrumbs`
- `diagnostics.rs`: Updated `breadcrumb_location` to check
`EditorSettings::get_global(cx).toolbar.breadcrumbs`
This follows the same pattern used by the regular `Editor` in
`items.rs`.
## Test plan
1. Set `toolbar.breadcrumbs` to `false` in settings.json
2. Open a file with diagnostics
3. Run `diagnostics: deploy current file`
4. Verify that breadcrumbs are hidden in the diagnostics panel
Fixes #43020
I had previously added `flex_none` to the Divider and that caused it to
grow beyond the container's width in some cases (project panel, agent
panel's restore to check point button, etc.).
Release Notes:
- N/A
Danilo Leal
created
90d7ccf
agent_ui: Search models only by name (#44984)
Click to expand commit body
We were previously matching the search on both model name and provider
ID. In most cases, this would yield an okay result, but if you search
for "Opus", for example, you'd see the Sonnet models in the search
result, which was very confusing. This was because we were matching to
both provider ID and model name. "Sonnet" and "Opus" share the same
provider ID, so they both contain "Anthropic" as a prefix. Then, "Opus"
contains the letter P, as well as Anthropic, thus the match.
Now, we're only matching by model name, which I think most of the time
will yield more accurate results.
Release Notes:
- agent: Improved the model search quality in the model picker.
Danilo Leal
created
68295ba
markdown: Fix Markdown table not rendering in hover popover (#44712)
Click to expand commit body
Closes #44306
This PR makes two changes:
- Uses the new `grid_cols_min_content` API. See more here:
https://github.com/zed-industries/zed/pull/44973.
- Changes Markdown table rendering to use a single grid instead of
creating a new grid per row, so column widths stay consistent across
rows.
Release Notes:
- Fixed an issue where Markdown tables wouldn't render in the hover
popover.
Smit Barmase
created
5152fd8
agent_ui: Add scroll to most recent user prompt button (#44961)
Click to expand commit body
Release Notes:
- Added a button to the agent thread view that scrolls to the most
recent prompt
Lukas Wirth
created
4e48228
agent_ui: Add keybinding to cycle through profiles (#44979)
Click to expand commit body
Similar to the mode selector in external agents, it will now be possible
to use `shift-tab` to cycle through profiles.
<img width="500" height="384" alt="Screenshot 2025-12-16 at 9 04@2x"
src="https://github.com/user-attachments/assets/11e8824e-9fad-4aab-9e19-53878096db52"
/>
Release Notes:
- Added the ability to use `shift-tab` to cycle through profiles for the
built-in Zed agent.
Danilo Leal
created
30deb22
agent_ui: Add the ability to delete a profile through the UI (#44977)
Click to expand commit body
It was only possible to delete profiles through the `settings.json`, but
now you can do it through the UI:
<img width="500" height="1954" alt="Screenshot 2025-12-16 at 8 42@2x"
src="https://github.com/user-attachments/assets/077ecdf5-1e80-4b70-86c9-177cc3741e77"
/>
Release Notes:
- agent: Added the ability to delete a profile through the "Manage
Profiles" modal.
Danilo Leal
created
f358b95
gpui: Add grid repeat min content API (#44973)
Click to expand commit body
Required for https://github.com/zed-industries/zed/pull/44712
We started using `grid` for Markdown tables instead of flex. This
resulted in tables having a width of 0 inside popovers, since popovers
are laid out using `AvailableSpace::MinContent`.
One way to fix this is to lay out popovers using `MaxContent` instead.
But that would affect all Markdown rendered in popovers and could change
how popovers look, or regress things.
The other option is to fix it where the problem actually is:
`repeat(count, vec![minmax(length(0.0), fr(1.0))])`. Since the minimum
width here is `0`, laying things out with `MinContent` causes the
Markdown table to shrink completely. What we want instead is for the
minimum width to be the min-content size, but only for Markdown rendered
inside popovers.
This PR does exactly that, without interfering with the `grid_cols` API,
which intentionally follows a TailwindCSS-like convention. See
https://github.com/zed-industries/zed/pull/44368 for context.
Release Notes:
- N/A
Smit Barmase
created
ba24ac7
fix: updated cursor linux keymap to use new AcceptNextWordEditPrediction (#44971)
Click to expand commit body
### Problem
PR #44411 replaced the `editor::AcceptPartialEditPrediction` action with
`editor::AcceptNextLineEditPrediction` and
`editor::AcceptNextWordEditPrediction`. However, the Linux cursor keymap
wasn't updated to reflect this change, causing a panic on startup for
Linux users.
### Solution
Updated the Linux keymap configuration to reference the new actions
Release Notes:
- N/A
Luca
created
2178ad6
Remove unneccessary snapshot storing in the buffer chunks (#44972)
Copying rendered markdown doesn't reliably do anything sensible. If we
copy text from the middle of a bold section, no formatting is copied. If
we copy text at the end, the trailing bold delimiters are copied,
resulting in gibberish markdown. Thus even fixing the associated issue
(so that leading delimeters are reliably copied) won't consistently
produce good results.
Also, as the user messages in the agent panel don't render markdown
anyway, it seems the most likely use case for copying markdown is
inapplicable.
Closes #42958
Release Notes:
- N/A
Michael Benfield
created
33b71ae
workspace: Use markdown to render LSP notification content (#44215)
4109c9d
workspace: Display a launchpad page when in an empty window & add it as a `restore_on_startup` value (#44048)
Click to expand commit body
Hi,
This PR fixes nothing. I just miss the option to open recent projects
quickly upon opening Zed, so I made this. Hope I can see it soon in
Preview channel.
If there is any suggestion, just comment. I will take it seriously.
Thank you!
|ui|before|after|
|-|-|-|
|empty pane|<img width="1571" height="941" alt="Screenshot 2025-12-03 at
12 39 25"
src="https://github.com/user-attachments/assets/753cbbc5-ddca-4143-aed8-0832ca59b8e7"
/>|<img width="1604" height="952" alt="Screenshot 2025-12-03 at 12 34
03"
src="https://github.com/user-attachments/assets/2f591d48-ef86-4886-a220-0f78a0bcad92"
/>|
|new window|<img width="1571" height="941" alt="Screenshot 2025-12-03 at
12 39 21"
src="https://github.com/user-attachments/assets/a3a1b110-a278-4f8b-980e-75f5bc96b609"
/>|<img width="1604" height="952" alt="Screenshot 2025-12-04 at 10 43
17"
src="https://github.com/user-attachments/assets/74a00d91-50da-41a2-8fc2-24511d548063"
/>|
---
Release Notes:
- Added a new value to the `restore_on_startup` setting called
`launchpad`. This value makes Zed open with a variant of the welcome
screen ("the launchpad") upon startup. Additionally, this same page
variant is now also what is displayed if you close all tabs in an
existing window that doesn't contain any folders open. The launchpad
page shows you up to 5 recent projects, making it easy to open something
you were working recently.
---------
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Simon Pham
and
Danilo Leal
created
9ec147d
Update Copilot sign-up URL based on verification domain (#44085)
Click to expand commit body
Use the url crate to extract the domain from the verification URI and
construct the appropriate Copilot sign-up URL for GitHub or GitHub
Enterprise.
Release Notes:
- Improved github enterprise (ghe) copilot sign in
Moritz Bitsch
created
9c32c29
Revert "Add save_file and restore_file_from_disk agent tools" (#44949)
Click to expand commit body
Reverts zed-industries/zed#44789
Need to fix a bug
Release Notes:
- N/A
Nathan Sobo
created
a176a8c
agent: Allow LanguageModelImage size to be optional (#44956)
Click to expand commit body
Release Notes:
- Improved allow LanguageModelImage size to be optional
Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
Xiaobo Liu
created
9d4d37a
Revert "editor: Refactor cursor_offset_on_selection field in favor of VimModeSettings" (#44960)
81d8fb9
tab_switcher: Fix missing preview on initial ctrl-shift-tab press (#44959)
Click to expand commit body
Closes #44852
Release Notes:
- Fixed tab preview not showing up on initial ctrl-shift-tab press
Mayank Verma
created
65e9001
docs: Add documentation for installing via winget (#44941)
Click to expand commit body
Simple documentation PR.
Added information for installing on Windows via winget. Added links from
the main README to relevant sections for both macOS and Windows
Release Notes:
- N/A
daomah
created
ebd5a50
language_models: Add `auto_discover` setting for Ollama (#42207)
Click to expand commit body
First up: I'm sorry if this is a low quality PR, or if this feature
isn't wanted. I implemented this because I'd like to have this
behaviour. If you don't think that this is useful, feel free to close
the PR without comment. :)
My idea is this: I love to pull random models with Ollama to try them.
At the same time, not all of them are useful for coding, or some won't
work out of the box with the context_length set. So, I'd like to change
Zed's behaviour to not show me all models Ollama has, but to limit it to
the ones that I configure manually.
What I did is add an `auto_discover` field to the settings. The idea is
that you can write a config like this:
```json
"language_models": {
"ollama": {
"api_url": "http://localhost:11434",
"auto_discover": false,
"available_models": [
{
"name": "qwen3:4b",
"display_name": "Qwen3 4B 32K",
"max_tokens": 32768,
"supports_tools": true,
"supports_thinking": true,
"supports_images": true
}
]
}
}
```
The `auto_discover: false` means that Zed won't pick up or show the
language models that Ollama knows about, and will only show me the one I
manually configured in `available_models`. That way, I can pull random
models with Ollama, but in Zed I can only see the ones that I know work
(because I've configured them).
The default for `auto_discover` (when it is not explicitly set) is
`true`, meaning that the existing behaviour is preserved, and this is
not a breaking change for configurations.
Release Notes:
- ollama: Added `auto_discover` setting to optionally limit visible
models to only those manually configured in `available_models`
Patrick Elsen
created
f760233
workspace: Fix context menu triggering format on save (#44073)
Click to expand commit body
Closes #43989
Release Notes:
- Fixed editor context menu triggering format on save
Hourann
created
a1dbfd0
Fix the `file_finder::Toggle` binding (#44951)
Click to expand commit body
Closes https://github.com/zed-industries/zed/issues/44752
Closes https://github.com/zed-industries/zed/pull/44756
Release Notes:
- Fixed "file_finder::Toggle" action sometimes not working in JetBrains
keymap
Kirill Bulatov
created
8ef37e8
Remove outdated `Cargo.toml` comment about `declare_interior_mutable_const` (#44950)
Click to expand commit body
Since the rule is no longer a `style` lint as of
[mid-August](https://github.com/rust-lang/rust-clippy/pull/15454), the
comment mentioning it not being one is outdated and should be removed.
> [!NOTE]
> I kept the severity at `error` for now to avoid rustling feathers.
> If `warn` is preferred, feel free to change it yourself or ask me to
do it - it's only 1 line of code, after all.
Release Notes:
- N/A
- **Fix editor::OpenUrl on zed links**
- **Fix cmd-clicking links too**
Closes #44293
Closes #43833
Release Notes:
- The `editor::OpenUrl` action now works for links to https://zed.dev
- Clicking on a link to a Zed channel or channel-note within the editor
no-longer redirects you via the web.
---------
Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
Conrad Irwin
and
Zed Zippy
created
c7d2483
Include project rules in commit message generation (#44921)
Click to expand commit body
Closes #38027
Release Notes:
- AI-generated commit messages now respect rules files (e.g.
`AGENTS.md`) if present
---------
Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com>
Richard Feldman
and
Claude Haiku 4.5
created
b17b097
terminal: Sanitize URLs with characters that cannot be last (#43559)
Click to expand commit body
Closes #43345
The list of characters comes from the linkify crate, which is already
used for URL detection in the editor:
https://github.com/robinst/linkify/blob/5239e12e26c633f42323e51ed81b0ff534528077/src/url.rs#L228
Release Notes:
- Improved url links detection in terminals.
---------
Signed-off-by: Marco Mihai Condrache <52580954+marcocondrache@users.noreply.github.com>
Closes #ISSUE
Release Notes:
- settings_ui: Added an "Open Keymap Editor" item under the Keymap
section
Ben Kunkle
created
3b2ccaf
Make zed --wait work with directories (#44936)
Click to expand commit body
Fixes #23347
Release Notes:
- Implemented the `zed --wait` flag so that it works when opening a
directory. The command will block until the window is closed.
Closes https://github.com/zed-industries/zed/issues/41938
For some error messages relating to the keymap file, the font size was
too large. This was due to the error message being a child
`MarkdownString` instead of a `SharedString`. A `.text_xs()` method is
being applied to this notification, but it appears not to affect the
markdown text. I found that the H5 text size in markdown is the same
size as other error messages, so I made each element (that had text)
that size. There was also a special case for bullet points.
I also added a gear icon to the settings button, so it was more in line
with other app notifications.
Error message (text too large):

Expected behavior (notification with correct text sizing and icon):

Example behavior:

Release Notes:
- Improved UI for keymap error messages.
---------
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Johnny Klucinec
and
Danilo Leal
created
f8561b4
Anchor scroll offsets so that entire diff hunks at viewport top become visible (#44932)
7a4de73
git: Ensure no more than 4 blame processes run concurrently for each multibuffer (#44843)
Click to expand commit body
Previously we were only awaiting on up to 4 of the blame futures at a
time, but we would still call `Project::blame_buffer` eagerly for every
buffer in the multibuffer. Since that returns a `Task`, all the blame
invocations were still launched concurrently.
Release Notes:
- N/A
Cole Miller
created
b8d0da9
collab: Add `copilot-swe-agent[bot]` to the `GET /contributor` endpoint (#44934)
Click to expand commit body
This PR adds the `copilot-swe-agent[bot]` user to the `GET /contributor`
endpoint so that it passes the CLA check.
Release Notes:
- N/A
Finn Evers
created
870159e
git: Fix partially-staged paths not being accurately rendered (#44837)
Click to expand commit body
Updates #44089
- Restores the ability to have a partially staged/`Indeterminate` status
for the git panel checkboxes
- Removes the `optimistic_staging` logic, since its stated purpose is
served by the `PendingOps` system in the `GitStore` (which may have
bugs, but we should fix them in the git store rather than adding another
layer)
Release Notes:
- Fixed partially-staged files not being represented accurately in the
git panel.
---------
Co-authored-by: Anthony Eid <hello@anthonyeid.me>
Cole Miller
and
Anthony Eid
created
0ead466
project_panel: Fix divider taking too much horizontal space (#44920)
Click to expand commit body
Closes: #44917
While setting up the project for contribution, I noticed that the
divider in the welcome dialog was rendering incorrectly on the `main`
branch compared to the latest release.
**Current behaviour (`main` branch):**
<img width="796" height="690" alt="image"
src="https://github.com/user-attachments/assets/3f7d6c73-14eb-47f3-ad83-4796f5f7be0f"
/>
**Expected behaviour (Release `0.216.1`):**
<img width="794" height="692" alt="image"
src="https://github.com/user-attachments/assets/b67857dc-a03d-4e49-bb33-22fe0c83ac5d"
/>
---
After some investigation, it looks like the issue was introduced in
#44505, specifically in [these
changes](https://github.com/zed-industries/zed/pull/44505/changes#diff-4ea61133da5775f0d5d06e67a8dccc84e671c3d04db5f738f6ebfab3a4df0b01R147-R158),
which caused the divider to take the full width instead of being
properly constrained.
**PR result**:
<img width="666" height="574" alt="image"
src="https://github.com/user-attachments/assets/e12b7778-b7cc-4855-b82e-3470dfe43365"
/>
Release Notes:
- Fixes -or- divider rendering incorrectly
Artem Molonosov
created
b52f907
extension_ci: Auto-assign version bumps to GitHub actor (#44929)
Click to expand commit body
Release Notes:
- N/A
Finn Evers
created
4096bc5
languages: Add injections for string and tagged template literals for JS/TS(X) (#44180)
Click to expand commit body
Hi! This pull request adds language injections for string and tagged
template literals for JS/TS(X).
This is similar to what [this
extension](https://marketplace.visualstudio.com/items?itemName=bierner.comment-tagged-templates)
provides for VSCode. This PR is inspired by this tweet
https://x.com/leaverou/status/1996306611208388953?s=46&t=foDQRPR8oIl1buTJ4kZoSQ
I've added injections queries for the following languages: HTML, CSS,
GraphQL and SQL.
This works for:
- String literals: `const cssString = /* css */'button { color: hotpink
!important; }';`
- Template literals: ```const cssString = /* css */`button { color:
hotpink !important; }`;```
All injections support the format with whitespaces inside, i.e. `/* html
*/` and without them `/*html*/`.
## Screenshots
|before|after|
|---------|-----------|
| <img width="1596" height="1476" alt="CleanShot 2025-12-04 at 21 12
00@2x"
src="https://github.com/user-attachments/assets/8e0fb758-41f0-43a8-93e6-ae28f79d7c8f"
/> | <img width="1576" height="1496" alt="CleanShot 2025-12-04 at 21 08
35@2x"
src="https://github.com/user-attachments/assets/b47bb9c1-224e-4a24-8f08-a459f1081449"
/>|
Release Notes:
- Added language injections for string and tagged template literals in
JS/TS(X)
One of the major annoyances with writing code with claude is that its
poorly indented; instead of requiring manual intervention, let's just
fix that in CI.
Similar to https://autofix.ci, but as we already have a github app,
we can do it without relying on a 3rd party.
This PR doesn't trigger the workflow (we need a separate change in Zippy
to do
that) but will let me test it manually.
Release Notes:
- N/A
Conrad Irwin
created
5987dff
Add save_file and restore_file_from_disk agent tools (#44789)
Click to expand commit body
Release Notes:
- Added `save_file` and `restore_file_from_disk` tools to the agent,
allowing it to resolve dirty buffer conflicts when editing files. When
the agent encounters a file with unsaved changes, it will now ask
whether you want to keep or discard those changes before proceeding.
Nathan Sobo
created
eceece8
docs: Update links to account page (#44924)
Click to expand commit body
This PR updates the links to the account page to point to the Dashboard.
Release Notes:
- N/A