Fix detailed-diff highlight clipping at end of trimmed diff string - #2965
Open
tobiasmelcher wants to merge 1 commit into
Open
tobiasmelcher wants to merge 1 commit into
tobiasmelcher wants to merge 1 commit into
Conversation
When a detailed diff ended exactly at the last character of the trimmed diff string (i.e. start + length == trimmedLength), the old >= guard incorrectly reduced the length by the number of stripped trailing newlines, cutting off that many characters from the highlight rectangle. The fix changes the condition to > so the length is only clamped when the range actually overshoots. The same bug existed independently in computeDetailedDiffRanges and createDetailedDiffBackgroundRanges; both now delegate to a shared helper clampDetailedDiffLength in UnifiedDiffText.
Contributor
Author
Contributor
Member
so the marked boxes should be more left and be the background of the "1.2" text. |
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
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.

When a detailed diff ended exactly at the last character of the trimmed diff string (
start + length == trimmedLength), the old>=guard reduced the highlight length by the number of stripped trailing newlines, cutting off that many characters from the highlight rectangle. The condition is now>, so the length is only clamped when the range actually overshoots.The same bug existed independently in
computeDetailedDiffRangesandcreateDetailedDiffBackgroundRanges; both now delegate to a shared helperclampDetailedDiffLengthinUnifiedDiffText.Additionally, in
getPositionForOffseta newline at the very start of a style range (lfIdx == 0) was ignored, so the x offset was not reset and the following text was mispositioned. The guard is nowlfIdx >= 0.Reviewed with the help of Claude Code.