Syntax highlighting in the diff view#2997
Open
stevenpollack wants to merge 1 commit into
Open
Conversation
…yles) Each diff line's foreground is now syntect-highlighted (reusing the in-tree two-face syntax set that already powers the file/blame viewer — no new deps, no external bat), keeping both added and removed sides. Change status is shown by a selectable indicator; [Shift+X] cycles off / gutter (colored bar) / sign (green + / red -) / tint (faint row background). Default tint. Persisted per-repo. Highlighting runs off the UI thread on the shared rayon threadpool (AsyncDiffHighlightJob, modeled on the blame view's AsyncSyntaxJob): the diff renders plain instantly and colors swap in when ready, so file navigation never blocks regardless of diff size. The result is self-polled in draw() and applied only if its diff hash still matches (stale results discarded). Capped at 10k lines; horizontal scroll preserved via byte-window clipping; falls back to the previous red/green rendering when off, over cap, binary, or highlight fails. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BMQxBdr5f3B3jmDtdvGtTu
stevenpollack
force-pushed
the
diff-syntax-highlight
branch
from
b052d3c to
a04e8b8
Compare
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
1 participant
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
Syntax-highlight the unified diff view. Each line's foreground is highlighted with the syntax set gitui already ships (
syntect+two-face, the same stack behind the file/blame viewer — no new dependencies), while change status (add/delete) is conveyed by a selectable indicator. Both added and removed sides are kept.UX
Shift+Xcycles the change-status indicator (persisted per-repo, default tint):+/ red-glyphThe syntect foreground shows in all on-states.
Performance
Highlighting runs off the UI thread on the shared rayon threadpool (
AsyncDiffHighlightJob, modeled on the blame view'sAsyncSyntaxJob): the diff renders instantly and colors swap in when ready, so navigating between files never blocks regardless of diff size. Results are discarded if the user has since navigated away (diff-hash check). Highlighting is capped at 10k diff lines and falls back to the plain rendering for binary diffs / unknown languages / when off.Notes
SyntaxTexthighlighter (added a synchronous entry point alongside the async one).make checkgreen (fmt + clippy--all-features+ nextest + tombi + deny).I couldn't attach screenshots here, but it's easiest to see by running a build and toggling
Shift+Xon any code diff. Happy to adjust the default style, keybinding, or the tint colors (currently dark-theme-oriented) to your preference.