fix(files): real diff viewer for the changes view#3013
Merged
Conversation
The changes view printed the raw `git diff` output line-for-line and numbered every physical line 1..N, so the git file headers showed as content and "line 1" was the `diff --git` header rather than file line 1. Parse the unified diff into typed rows: hide the git file-header noise (`diff --git`, `index`, `---`, `+++`, mode/rename lines), keep hunk headers as their own row, and render a two-column old#/new# gutter with the +/- marker in its own column. Line endings are normalized (\r\n and lone \r as well as \n) so numbering and marker detection behave the same on macOS, Windows, and Linux.
The changes view stacked a "Files · N files changed" bar directly above a second "Review" heading. Remove the redundant heading, fold the Expand/Collapse-all control up into the top bar, and show an overall +adds / -dels summary next to the file count so the totals are visible without expanding anything.
Each expanded diff had its own horizontal scrollbar for long lines. Add a wrap toggle in the header that switches the diff body between horizontal scroll and soft-wrapped lines. Also separate the old#/new# line-number gutter from the content with a hairline divider so the numbers read as a gutter rather than floating in the code.
The workspace file diff was generated with `git diff --unified=80`, so any file under ~160 lines rendered in full even for a one-line change. Drop to the standard 3 lines of context so the diff shows only what changed plus a little surrounding context.
The header stacked a redundant "Files" label (the tab already says Files), a file count, a +adds/-dels summary, an always-open search box, and a "Collapse all" text button, so it overflowed in the narrow inspector rail. Strip it to the essentials: a compact "N files" count, a collapsible search (icon that expands to the input), and icon-only actions for expand/collapse-all, wrap, refresh, maximize, and close. Everything is icon-width now, so the header fits at any rail width. Also give the diff line-number gutter an opaque background so the add/remove row tint no longer bleeds through the numbers.
Show the enclosing function/section from each hunk header (the text after the @@ range) in the hunk band. Within a run of deleted lines that pairs one-for-one with the following added lines, token-diff each pair (LCS over word tokens) and highlight only the characters that actually changed instead of tinting the whole line. Long lines skip the O(n^2) pass.
Add a copy-to-clipboard button on each changed-file row that copies the file path and briefly confirms with a check icon. It stays hidden until the row is hovered or the button is focused, so it does not add clutter.
Add a header toggle that switches the diff between the unified view and a side-by-side split. Deletions align left, additions align right, context spans both sides, and hunk headers span the full width. Intra-line highlighting and per-side line numbers carry over to the split layout.
Pressing j / k moves focus to the next / previous changed-file row (Vim-style), skipping the keys while the search box has focus. The rows already handle Enter/Space to expand, so this rounds out mouse-free review.
codebanditssss
marked this pull request as ready for review
July 23, 2026 12:11
Vaibhaav-Tiwari
requested changes
Jul 23, 2026
Vaibhaav-Tiwari
left a comment
Vaibhaav-Tiwari
left a comment
Collaborator
There was a problem hiding this comment.
lgtm but there shouldn't be so much padding
Drop the content wrapper's horizontal padding (it doubled up with each row's own px-4) and its vertical padding, and shorten the file rows, so the list is not indented and spaced out. Addresses review feedback.
Collaborator
Author
|
tightened it up. the content wrapper was adding its own px-4/py-4 on top of each row already having px-4, so the list was double-indented and spaced out. dropped the wrapper padding and shortened the rows. pushed in 2551703, mind taking another look? |
Long diff lines soft-wrap by default instead of scrolling horizontally, and the wrap toggle button is removed since it is now the only behavior. One fewer control in the header.
The two-column old#/new# gutter rendered an empty left column for added lines, which on an all-additions file looked like a big block of dead left padding. Collapse to one gutter column (new number, falling back to the old number for deletions), halving the gutter.
Vaibhaav-Tiwari
approved these changes
Jul 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Overhauls the session Files / changes view (
SessionFilesView). It used to print the rawgit diffoutput line-for-line with a sequential 1..N counter, showed the whole file for tiny changes, and had a cluttered header that overflowed in the narrow inspector rail. This turns it into a real diff viewer.Now
What changed
Core fixes
git diff --unified=80, so any file under ~160 lines rendered in full even for a one-line change. Dropped to the standard--unified=3, so a change shows only the changed lines plus a little context.diff --git,index,---,+++, mode/rename lines), shows a real old# / new# gutter instead of the bogus sequential counter, and renders@@hunks as their own band with the marker in a gutter column. Line endings are normalized (\r\n, lone\r,\n) so it behaves identically on macOS, Windows, and Linux.Enhancements
Scope
Frontend-only except the one-word backend context change; the backend already returns the raw unified diff string, which is now parsed and rendered client-side.
Not included (follow-ups)
--unified=3already keeps diffs focused).Tests
SessionFilesView.test.tsx: 11 tests including realistic-diff + CRLF parsing, intra-line highlight, split-view toggle, wrap toggle, copy-path, and j/k focus movement.cd frontend && npx tsc --noEmitclean;go build ./...clean.