git_ui: Open file diffs from git panel by chirivelli · Pull Request #56152 · zed-industries/zed

chirivelli · 2026-05-08T10:10:59Z

Self-Review Checklist:

I've reviewed my own diff for quality, security, and reliability
Unsafe blocks (if any) have justifying comments
The content is consistent with the UI/UX checklist
Tests cover the new/changed behavior
Performance impact has been considered and is acceptable

Addresses #33773.

This changes git panel file activation so double-clicking or secondary-opening a changed file opens a dedicated full-file diff tab backed by a SplittableEditor.

The per-file diff reuses the project diff staging and restore controls, respects the configured diff view style, and focuses an existing per-file diff tab when one is already open instead of creating duplicates.

Verified with cargo run.

Release Notes:

Improved git panel file diff opening.

chirivelli · 2026-05-08T10:51:14Z

                    this.selected_entry = Some(ix);
                    cx.notify();
                    if event.click_count() > 1 || event.modifiers().secondary() {
-                        this.open_file(&Default::default(), window, cx)


the old behaviour didn't support split (side-by-side) diff

nitedani · 2026-05-08T14:31:53Z

This changes git panel file activation so double-clicking or secondary-opening a changed file opens a dedicated full-file diff tab backed by a SplittableEditor.

This was exactly what I expected to happen when using Zed for the first time and double-clicked a file in git panel.
Thank you for making it happen!

scratchmex · 2026-05-08T14:31:56Z

Can you share a video or screenshots? Thanks for the contrib

nitedani · 2026-05-08T14:37:21Z

A few ideas:

A config option to set this behavior to the default single-click instead of double-click.
A button to swap between the default multi-buffer view and the full-file view.

Not sure about them.

Other feedback:
The first button in the attached image already collapses/expands all files in the multi-buffer view. Note that it does not expand all file content. Instead of this PR, wouldn't a config option + button suffice that would expand all file content in the multi-buffer view? And if so, can that be implemented performantly?

Which way is more intuitive for the user?

chirivelli · 2026-05-09T13:50:08Z

@Anthony-Eid

chirivelli · 2026-05-15T12:13:10Z

Added a dedicated SoloDiffView for opening a single changed file from the Git panel. Previously this flow reused the project diff, which worked but felt less focused for per-file review. The new view opens the full file diff in its own tab, follows the configured unified/split diff style, supports the same git hunk/file actions.

here is a look at the new view

Screen.Recording.2026-05-15.at.5.40.51.PM.mov

@Anthony-Eid @franciskafyi

ChristopherBiscardi

Thank you! I've tested this and it functions as expected.

chirivelli · 2026-05-30T03:17:17Z

Thanks man 🤝

Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Addresses zed-industries#33773. This changes git panel file activation so double-clicking or secondary-opening a changed file opens a dedicated full-file diff tab backed by a `SplittableEditor`. The per-file diff reuses the project diff staging and restore controls, respects the configured diff view style, and focuses an existing per-file diff tab when one is already open instead of creating duplicates. Verified with `cargo run`. Release Notes: - Improved git panel file diff opening. --------- Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>

Syntist · 2026-06-07T08:41:34Z

Is it possible to force this on click by default? instead of always doing cmd/ctrl + click.

daguttt · 2026-06-10T14:17:00Z

@Syntist I'm also looking to achieve that as the default

axsuul · 2026-06-18T16:02:23Z

Is there any way to get the old behavior back? It was really convenient to be able to open the file in that location

chirivelli · 2026-06-18T16:06:39Z

Is there any way to get the old behavior back? It was really convenient to be able to open the file in that location

"opt + enter" still opens the file

axsuul · 2026-06-18T16:34:54Z

Is there any way to get the old behavior back? It was really convenient to be able to open the file in that location

"opt + enter" still opens the file

It's not the same, it seems to open it in a locked file view and the file is not editable

chirivelli · 2026-06-18T17:01:35Z

@axsuul
#59383 this should fix it, will be in a 1.8 release!

axsuul · 2026-06-18T17:56:35Z

@axsuul #59383 this should fix it, will be in a 1.8 release!

Thanks so much!

nathan-fiscaletti · 2026-06-21T03:32:10Z

Is it possible to force this on click by default? instead of always doing cmd/ctrl + click.

I put together a PR that achieves this.

#59649

…ed-industries#59649) # Objective The current behavior of the git panel is that when you click a file it will open the multi-buffer view that shows all files with changes. If you use CMD+Click or CTRL+Click, it will open the solo-file experience where you only see the diff of the file you have selected. But, there is no way to customize this behavior. Related to: zed-industries#56152 (comment) ## Solution This MR adds a setting that allows you to customize the default click behavior. The alternate behavior will always be accessible via CMD+Click or CTRL+Click. ## Self-Review Checklist: - [X] I've reviewed my own diff for quality, security, and reliability - [X] Unsafe blocks (if any) have justifying comments - [X] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [X] Tests cover the new/changed behavior - [X] Performance impact has been considered and is acceptable --- Release Notes: - Added a setting to control default click behavior for git panel files --------- Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>

Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Addresses zed-industries#33773. This changes git panel file activation so double-clicking or secondary-opening a changed file opens a dedicated full-file diff tab backed by a `SplittableEditor`. The per-file diff reuses the project diff staging and restore controls, respects the configured diff view style, and focuses an existing per-file diff tab when one is already open instead of creating duplicates. Verified with `cargo run`. Release Notes: - Improved git panel file diff opening. --------- Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>

gaojunran · 2026-08-02T11:13:43Z

also see #62074, which is a follow-up for this PR.

Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Addresses zed-industries#33773. This changes git panel file activation so double-clicking or secondary-opening a changed file opens a dedicated full-file diff tab backed by a `SplittableEditor`. The per-file diff reuses the project diff staging and restore controls, respects the configured diff view style, and focuses an existing per-file diff tab when one is already open instead of creating duplicates. Verified with `cargo run`. Release Notes: - Improved git panel file diff opening. --------- Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>

…ed-industries#59649) # Objective The current behavior of the git panel is that when you click a file it will open the multi-buffer view that shows all files with changes. If you use CMD+Click or CTRL+Click, it will open the solo-file experience where you only see the diff of the file you have selected. But, there is no way to customize this behavior. Related to: zed-industries#56152 (comment) ## Solution This MR adds a setting that allows you to customize the default click behavior. The alternate behavior will always be accessible via CMD+Click or CTRL+Click. ## Self-Review Checklist: - [X] I've reviewed my own diff for quality, security, and reliability - [X] Unsafe blocks (if any) have justifying comments - [X] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [X] Tests cover the new/changed behavior - [X] Performance impact has been considered and is acceptable --- Release Notes: - Added a setting to control default click behavior for git panel files --------- Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com>

cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label May 8, 2026

zed-community-bot Bot added the first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions label May 8, 2026

chirivelli commented May 8, 2026

View reviewed changes

franciskafyi linked an issue May 8, 2026 that may be closed by this pull request

Git Diff - Full File View #56209

Closed

ChristopherBiscardi added the area:integrations/git Git integration feedback label May 8, 2026

github-project-automation Bot added this to Git board May 8, 2026

chirivelli force-pushed the feat/open-diff-in-solo-splittableeditor branch from 63adc2a to bd873d4 Compare May 9, 2026 04:25

Anthony-Eid self-assigned this May 12, 2026

chirivelli marked this pull request as draft May 15, 2026 08:48

Add solo diff view for git panel files

ac6182a

chirivelli force-pushed the feat/open-diff-in-solo-splittableeditor branch from bd873d4 to ac6182a Compare May 15, 2026 12:05

chirivelli marked this pull request as ready for review May 15, 2026 12:13

franciskafyi linked an issue May 28, 2026 that may be closed by this pull request

Git Diff - Full File View #58005

Closed

ChristopherBiscardi added 2 commits May 29, 2026 08:06

clippy fix

a694074

menu updates and minor refactor

964ed07

ChristopherBiscardi approved these changes May 29, 2026

View reviewed changes

ChristopherBiscardi enabled auto-merge May 29, 2026 19:36

ChristopherBiscardi assigned ChristopherBiscardi and unassigned Anthony-Eid May 29, 2026

ChristopherBiscardi added this pull request to the merge queue May 29, 2026

Merged via the queue into zed-industries:main with commit 5d3b9e4 May 29, 2026
33 checks passed

yeskunall mentioned this pull request Jun 2, 2026

Opening file from Git panel opens Diff view #58250

Closed

chirivelli deleted the feat/open-diff-in-solo-splittableeditor branch June 4, 2026 13:47

github-actions Bot mentioned this pull request Jun 10, 2026

Review upstream Zed v1.6.3 neozed-industries/neo-zed#44

Open

yeskunall mentioned this pull request Jun 12, 2026

Git Panel: Option for Opening files with Ctrl + click is replaced by Individual File Diff Opening #59172

Closed

github-actions Bot mentioned this pull request Jun 17, 2026

Review upstream Zed v1.7.2 neozed-industries/neo-zed#45

Open

This was referenced Jun 18, 2026

fix/commit author #59516

Closed

fix/linked images clickable #59518

Closed

nathan-fiscaletti mentioned this pull request Jun 21, 2026

git_ui: Add setting to control default click behavior for git panel #59649

Merged

5 tasks

github-actions Bot mentioned this pull request Jun 24, 2026

Review upstream Zed v1.8.2 neozed-industries/neo-zed#46

Open

chirivelli mentioned this pull request Jun 26, 2026

Git Diff - Full File View #56448

Closed

This was referenced Jul 1, 2026

Review upstream Zed v1.9.0 neozed-industries/neo-zed#47

Open

Review upstream Zed v1.10.0 neozed-industries/neo-zed#48

Open

This was referenced Jul 10, 2026

Review upstream Zed v1.10.2 neozed-industries/neo-zed#49

Open

Review upstream Zed v1.10.3 neozed-industries/neo-zed#50

Open

profispojka mentioned this pull request Jul 29, 2026

Git panel: no before/after view for changed image files #61847

Closed

gaojunran mentioned this pull request Aug 2, 2026

git_ui: Open focused single-file diff from commit diff multibuffer #62074

Closed

5 tasks

Uh oh!

Uh oh!

Conversation

chirivelli commented May 8, 2026

Uh oh!

chirivelli May 8, 2026

Choose a reason for hiding this comment

Uh oh!

nitedani commented May 8, 2026

Uh oh!

scratchmex commented May 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nitedani commented May 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chirivelli commented May 9, 2026

Uh oh!

chirivelli commented May 15, 2026

Uh oh!

ChristopherBiscardi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

chirivelli commented May 30, 2026

Uh oh!

Syntist commented Jun 7, 2026

Uh oh!

daguttt commented Jun 10, 2026

Uh oh!

axsuul commented Jun 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chirivelli commented Jun 18, 2026

Uh oh!

axsuul commented Jun 18, 2026

Uh oh!

chirivelli commented Jun 18, 2026

Uh oh!

axsuul commented Jun 18, 2026

Uh oh!

nathan-fiscaletti commented Jun 21, 2026

Uh oh!

gaojunran commented Aug 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

scratchmex commented May 8, 2026 •

edited

Loading

nitedani commented May 8, 2026 •

edited

Loading

axsuul commented Jun 18, 2026 •

edited

Loading