Skip to content

Conversation

gerhardol
Copy link
Member

@gerhardol gerhardol commented Oct 6, 2024

Fixes #11940

Proposed changes

An empty ansi terminal sequence must be handled as an explicit reset.
This could cause that foreground colors were applied when black was to be used.

Adjust overridden colors for range-diff.
contextBold should not be reverse bold and
newDimmed/oldDimmed should be reverse.
(There is a minimal difference bold/normal black, but this context is
not very interesting.)

Screenshots

Slightly different behavior in 5.0 and master
Use mstv's branches repro/rangediff2-a and repro/rangediff2-b

5.0
image

master
image

after
image

Test methodology

Tests are updated

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.

An empty ansi terminal sequence must be handled as an explicit reset.
This could cause that foreground colors were applied when black was to be used.

Adjust overridden colors for range-diff.
contextBold should not be reverse bold and
newDimmed/oldDimmed should be reverse.
(There is a minimal difference bold/normal black, but this context is
not very interesting.)
Copy link
Member

@mstv mstv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RangeDiff looks much clearer 👍

@gerhardol gerhardol merged commit e244e7e into gitextensions:master Oct 7, 2024
4 checks passed
@gerhardol gerhardol deleted the feature/i11940-reset-terminal-color branch October 7, 2024 19:23
@RussKie RussKie added this to the 5.1 milestone Oct 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Range diff: white text on yellow background
3 participants