We were trying to mitigate these by passing `.` instead of ``, but it
turns out that git2 also panics internally for that. It also just
doesn't make sense to look up the index text (or committed text) for an
empty path, because a file should always have a nonempty repo path.

Closes ZED-560

Release Notes:

- N/A

Closes #50172
Closes #50238
Closes #50243
Closes #50196

Updates `mermaid-rs-renderer` with the following fixes:

- Fix ampersand in node labels splitting nodes incorrectly
([`374db9e`](https://github.com/zed-industries/mermaid-rs-renderer/commit/374db9e))
- Add gantt compact display mode via yaml frontmatter
([`d1bf282`](https://github.com/zed-industries/mermaid-rs-renderer/commit/d1bf282))
- Fix class diagram stereotype annotations rendered as members
([`6203d71`](https://github.com/zed-industries/mermaid-rs-renderer/commit/6203d71))
- Fix dotted lines being indistinguishable from solid
([`94fb543`](https://github.com/zed-industries/mermaid-rs-renderer/commit/94fb543))
- Fix class diagram arrowheads hidden under node boxes
([`cd79c56`](https://github.com/zed-industries/mermaid-rs-renderer/commit/cd79c56))
- Fix text not rendering in some cases
([`9534cb1`](https://github.com/zed-industries/mermaid-rs-renderer/commit/9534cb1))

Release Notes:

- Fixed multiple mermaid diagram rendering issues in markdown preview.

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Fixed a bug where files would still be marked as having git conflicts
after resolving them.

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>

Deferred draws previously didn't use a content mask, so you could
horizontally scroll an EP popover all the way out of the containing
pane.

This also affects other UI elements that use the deferred draw system; I
think in practice it doesn't make much difference because most of those
seem to require something in the editor to be hovered, so if you scroll
horizontally the element goes away.

Release Notes:

- Fixed being able to scroll the edit prediction popover out of the
containing pane.

Release Notes:

- N/A

---------

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>

The iteration range was `(seed..num_iterations)`, which produces an
empty range whenever `seed >= num_iterations`. Changed it to
`(seed..seed + num_iterations)` so the range always runs the correct
number of iterations starting from the given seed.

Release Notes:

- N/A

In text box
<img width="662" height="160" alt="Screenshot 2026-02-25 at 14 32 01"
src="https://github.com/user-attachments/assets/c568036c-1445-46cd-b703-41af1b185d6f"
/>
In chat
<img width="661" height="245" alt="Screenshot 2026-02-25 at 14 32 15"
src="https://github.com/user-attachments/assets/9932799f-6580-4a70-b83f-d1c0fb0c55d9"
/>
In chat (light theme)
<img width="656" height="232" alt="Screenshot 2026-02-25 at 14 35 26"
src="https://github.com/user-attachments/assets/65c4ce56-c902-4dda-a1c4-9dfcea0e6012"
/>

Release Notes:

- N/A

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>

The case of false negatives (“Missed opportunities”) was not considered
when the bot versioning was added. Now we're also automatically
attributing the false negatives to the bot version that made them.

Release Notes:

- N/A

This does not yet allow for finding task <-> entity cycles
unfortunately, but at least it does catch entity <-> entity cycles for
the time being

Release Notes:

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

Release Notes:

- N/A

Release Notes:

- N/A

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>

Closes https://github.com/zed-industries/zed/issues/50276

Release Notes:

- Added support for specifying settings for the Go LSP adapter

This rolls out the formatting check to extensions also.

Release Notes:

- N/A

Release Notes:

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

Dropping deep tree-sitter Trees can be quite slow due to deallocating
lots of memory (in the 10s of milliseconds for big diffs). To avoid
blocking the main thread, we offload the drop operation to a background
thread.

Instead of a static thread we could also integrate this with the gpui
app or use the executors, but both of that would require threading that
through as a field which I don't think is too great either

Release Notes:

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

#50176 added `recoverable_panic` to swallow mermaid panics, then #50280
fixed it in upstream. This PR removes the workaround so future panics
reach Sentry. Also bumps `mermaid-rs-renderer` to fix a hex parsing
panic.

Release Notes:

- N/A

Fixes a crash which occurred on firefox-linux when resizing (and was
causing blanks during resize in other browsers)

The issue was due to attempting to resize the drawing buffer while it
was being rendered to, which causes a browser crash since firefox
destroys that buffer while it is still being accessed. This essentially
defers the resize to just before drawing, so that it won't be resized
*while* being drawn to.

Release Notes:

- N/A

Release Notes:

- Fixed a visual gap between diff hunk controls and buffer headers

Release Notes:

- N/A

Closes #ISSUE

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

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

Closes #ISSUE

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

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

This adds more checks for the protobuf files to CI

Release Notes:

- N/A

---------

Co-authored-by: Anthony Eid <anthony@zed.dev>

Updated outdated instructions for configuring GitHub Copilot to match
those on other editor's migration guides

Before you mark this PR as ready for review, make sure that you have:
- [X] Added a solid test coverage and/or screenshots from doing manual
testing
- [X] Done a self-review taking into account security and performance
aspects
- [X] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A

Co-authored-by: Kunall Banerjee <hey@kimchiii.space>

Closes #49571.

| Before | After |
|--------|--------|
| <img width="455" height="141" alt="image"
src="https://github.com/user-attachments/assets/538b011d-40e7-4ca5-b3dd-b1b8b993fd8f"
/> | <img width="475" height="187" alt="image"
src="https://github.com/user-attachments/assets/b091320e-726a-4cc7-b9d9-85c27f04c75a"
/> |

Before you mark this PR as ready for review, make sure that you have:
- [x] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Fixed popover spacing for split diff buttons

Fixed the incorrect menu label from "Open File History" to "View File
History" in the docs so it matches the actual UI.

<img width="940" height="1350" alt="2026-02-22 at 22 49 35"
src="https://github.com/user-attachments/assets/3410fafb-48ed-457f-a2fb-1005708aee52"
/>


Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A

Co-authored-by: Kunall Banerjee <hey@kimchiii.space>

Small fixes to documentation:

- split paragraph for better readability and context understanding.
- add curly braces for settings example for consistency
- capitalize abbreviation (YAML, JSON)
- change note style for consistency

Release Notes:

- N/A

---------

Co-authored-by: Kunall Banerjee <hey@kimchiii.space>

Release Notes:

- N/A

Release Notes:

- N/A

Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>

<img width="827" height="643" alt="图片"
src="https://github.com/user-attachments/assets/de6279fa-c224-460d-8210-3eada416aca5"
/>


Release Notes:

- Date and time formatting on Windows now respects the system time
formatting preferences.

---------

Co-authored-by: John Tur <john-tur@outlook.com>

Release Notes:

- N/A

This PR adds https://github.com/zed-industries/zed/pull/50413 to the
`.git-blame-ignore-revs` file.

Release Notes:

- N/A

This fixes a problem where editing a proto file would make the proto LSP
show a ton of warnings and avoids the giant diff that formatting a
.proto file would cause.

I also added a lint check when our clippy script is ran locally

Release Notes:

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

---------

Co-authored-by: MrSubidubi <finn@zed.dev>

Release Notes:

- Fixed Agent Panel code blocks not scrolling horizontally during text
selection.

Release Notes:

- N/A

Release Notes:

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

Release Notes:

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

Reverts zed-industries/zed#47199

Closes https://github.com/zed-industries/zed/issues/50237

Release Notes:

- Fixed a bug that prevented settings files from opening on remotes

Release Notes:

- Fixed multiple language servers applying to the same buffer
overwriting each others inlay hints
- Fixed multiple language servers applying to the same multibuffer
discarding each others inlay hints
- Fixed a bug that caused some inlay hints to sometimes duplicate

Release Notes:

- N/A

Release Notes:

- N/A

---------

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

Release Notes:

- N/A

Release Notes:

- N/A

Follow-up to #50205

Release Notes:

- N/A

Co-authored-by: Neel Chotai <neel@zed.dev>
Co-authored-by: Josh Robson Chase <josh@robsonchase.com>

Fixes ZED-59P

Release Notes:

- Linux: Fix panic when requested window size was larger than supported
by your GPU

Fixes Zed-5AW
Fixes Zed-5AP

Claude believes this is the right fix, but would love someone who knows
more about graphics than me to take a look: @reflectronic / @zortax?

The panic is:
```
wgpu error: Validation Error

Caused by:
  In Texture::create_view
    Texture with 'path_intermediate' label is invalid
gpui::platform::wgpu::wgpu_renderer::WgpuRenderer::create_path_intermediate (wgpu_renderer.rs:742)
gpui::platform::wgpu::wgpu_renderer::WgpuRenderer::update_drawable_size (wgpu_renderer.rs:784)
gpui::platform::linux::x11::window::X11WindowStatePtr::set_bounds (window.rs:1169)
gpui::platform::linux::x11::client::X11Client::handle_event (client.rs:902)
```

or:
```
wgpu error: Validation Error

Caused by:
  In Texture::create_view
    Texture with 'path_intermediate' label is invalid

gpui::platform::wgpu::wgpu_renderer::WgpuRenderer::create_path_intermediate (wgpu_renderer.rs:742)
gpui::platform::wgpu::wgpu_renderer::WgpuRenderer::new (wgpu_renderer.rs:274)
gpui::platform::linux::x11::window::X11WindowState::new::{{closure}} (window.rs:698)
gpui::platform::linux::x11::window::X11WindowState::new (window.rs:488)
gpui::platform::linux::x11::window::X11Window::new (window.rs:814)
gpui::platform::linux::x11::client::X11Client::open_window (client.rs:1514)
gpui::platform::linux::platform::<T>::open_window (platform.rs:289)
gpui::window::Window::new (window.rs:1119)
gpui::app::App::open_window::{{closure}} (app.rs:1025)
gpui::app::App::update (app.rs:835)
gpui::app::App::open_window (app.rs:1022)
```

I haven't seen a Wayland equivalent (not sure if that's because it
doesn't happen on Wayalnd or because I havent' seen it yet)

Release Notes:

- Linux: Fixed a panic in the new WPGU renderer during resize

Fallout from https://github.com/zed-industries/zed/pull/50270

Release Notes:

- N/A

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>

required after livekit bump

Closes #ISSUE

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A

Closes #49435

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Linux: Reduced GPU memory usage during resize

Fixes ZED-59V

Release Notes:

- vim: Fixed panic when incrementing a number preceded by a multibyte
character