fix: Merge git-diff textmarkers separated by newlines #11921
Merged
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
Number of text markers affect performance, merge with previous text marker if the new is directly following or only separated by newline. * do not color empty \r git-diff tries to color \r also if diff.colorMovedWS=no This has no visible effect and is just polluting the markers.
mstv
reviewed
Sep 16, 2024
mstv
approved these changes
Sep 17, 2024
RussKie
reviewed
Sep 18, 2024
Comment on lines
+191
to
+219
| textMarkers[0].Offset.Should().Be(10); | ||
| textMarkers[0].Length.Should().Be(23); | ||
| textMarkers[0].Color.Should().Be(SystemColors.Window); | ||
| textMarkers[0].ForeColor.Should().Be(Color.FromArgb(255, 255, 0, 0)); | ||
|
|
||
| textMarkers[1].Offset.Should().Be(62); | ||
| textMarkers[1].Length.Should().Be(1); | ||
| textMarkers[1].Color.Should().Be(SystemColors.Window); | ||
| textMarkers[1].ForeColor.Should().Be(_redAnsiTheme[0]); | ||
|
|
||
| textMarkers[2].Offset.Should().Be(63); | ||
| textMarkers[2].Length.Should().Be(38); | ||
| textMarkers[2].Color.Should().Be(SystemColors.Window); | ||
| textMarkers[2].ForeColor.Should().Be(_redAnsiTheme[2]); | ||
|
|
||
| textMarkers[3].Offset.Should().Be(102); | ||
| textMarkers[3].Length.Should().Be(14); | ||
| textMarkers[3].Color.Should().Be(SystemColors.Window); | ||
| textMarkers[3].ForeColor.Should().Be(_redAnsiTheme[1]); | ||
|
|
||
| textMarkers[4].Offset.Should().Be(116); | ||
| textMarkers[4].Length.Should().Be(47); | ||
| textMarkers[4].Color.Should().Be(SystemColors.Window); | ||
| textMarkers[4].ForeColor.Should().Be(_redAnsiTheme[2]); | ||
|
|
||
| textMarkers[5].Offset.Should().Be(164); | ||
| textMarkers[5].Length.Should().Be(54); | ||
| textMarkers[5].Color.Should().Be(SystemColors.Window); | ||
| textMarkers[5].ForeColor.Should().Be(_redAnsiTheme[0]); |
There was a problem hiding this comment.
Could all of these be verified with a single snapshot? That is, use Verify?
There was a problem hiding this comment.
The use of themes makes this difficult. Values need to be hardcoded in the theme.
(I have considered this as it tedious to make changes to the tests...)
Maybe later.
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.
Follow up to #11887
Adds tests, refactor a little, slightly more performant and merges some more text markers.
This was discussed with #11843 but is not strictly needed (but simplifies that PR too).
Proposed changes
Number of text markers affect performance, merge with previous text marker if the new is directly following or only separated by newline.
git-diff tries to color \r also if diff.colorMovedWS=no This has no visible effect and is just polluting the markers.
Screenshots
No change, \r\n are never colored.
Test methodology
Tests are added.
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.