Editor: Inline Git Diff Rendering with Context Menu Toggle #343
Conversation
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
- Add showInlineDiff setting with actions\n- Wire context menu toggle with GitMerge icon\n- Default to off; allows per-file inline diff viewing
- Build unified lines sequence with diff + buffer\n- Pass diff context to LineWithContent and gutter\n- Add styles for added/removed diff backgrounds\n- Preserve selection and virtual scrolling behavior
- Fetch diff on file open and pass to openBuffer\n- Maintain diffData in buffer; refresh after saves\n- Expose diffData via editor view store for rendering
SnaetWarre
reviewed
Sep 15, 2025
| }; | ||
|
|
||
| // Debounce updates to avoid frequent diff calculations while typing | ||
| timer = setTimeout(run, 500); |
There was a problem hiding this comment.
Instead of doing that every 0.5 seconds, why not do it on save of the buffer?
There was a problem hiding this comment.
It is because when you are editing the file and havn’t saved the file yet. It will still show you the git diff based upon the buffer changes
| @@ -55,7 +60,7 @@ export const LineGutter = ({ | |||
| className={cn("gutter-decoration", decoration.className)} | |||
| style={{ | |||
| position: "absolute", | |||
| left: "2px", // Small gap from left edge | |||
| left: "-4px", // Small gap from left edge | |||
There was a problem hiding this comment.
this makes an inverted gap I guess?
this comment can be removed
There was a problem hiding this comment.
It sticks the git gutter to the left end this way. Will see if there is something better that can be done.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pull Request
Adds inline Git diff rendering in the editor, gated by a new setting and context menu toggle. Shows added/removed lines inline with background cues; supports live updates while typing.
Toggle via editor context menu or programmatically via setShowInlineDiff(true/false).