fix(diff): use full-file context to highlight diff hunks#342
Merged
Conversation
parseDiffWithHighlighting accepted oldContent/newContent (which useDiffLoader was already fetching and passing through) but ignored them, highlighting only the hunk fragment. When a hunk starts after a closing raw string like `"#);`, Refractor's Rust grammar sees the fragment's leading `"` as an opening string and cascades the rest of the file: comments get tagged as string content and string contents get tagged as code. Pre-highlight each side's full file once when contents are provided and look up each hunk line's HTML by its line number. Fall back to the previous per-hunk block highlighting when contents aren't provided. Adds a regression test that feeds a hunk beginning with a raw-string terminator and asserts the surrounding comment tags as token comment rather than token string.
auto-merge was automatically disabled
July 9, 2026 07:26
Pull request was converted to draft
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.
parseDiffWithHighlighting accepted oldContent/newContent (which useDiffLoader was already fetching and passing through) but ignored them, highlighting only the hunk fragment. When a hunk starts after a closing raw string like
"#);, Refractor's Rust grammar sees the fragment's leading"as an opening string and cascades the rest of the file: comments get tagged as string content and string contents get tagged as code.Pre-highlight each side's full file once when contents are provided and look up each hunk line's HTML by its line number. Fall back to the previous per-hunk block highlighting when contents aren't provided.
Adds a regression test that feeds a hunk beginning with a raw-string terminator and asserts the surrounding comment tags as token comment rather than token string.