fix(difftastic): Adjust endmarkers #11983
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
instead of inserting '|' to the text
The processing that parses the line numbers printed by Difftastic did not always remove the textmarkers for the removed line numbers.
c6ab31b to
3bf0668
Compare
mstv
approved these changes
Oct 24, 2024
mstv
approved these changes
Oct 26, 2024
|
The vertical ruler position gets overridden after closing the settings dialog. Just to be aware of - not requesting a change. |
separate. |
|
The vertical ruler used as separator for side-by-side diff jumps away to the setting value instead of the difftastic result when refreshing after canceling the settings dialog. |
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.
Proposed changes
First commit reviewed in #11982, this commit is incomplete in the handling of text markers . Actually, #11921 that merged adjacent textmarkers, slightly broke the Difftastic color processing.
The colors bleed slightly.
This PR refactors the processing and simplifies the handling too.
Note: It was maybe not a good move to try to process the Difftastic output to be similar to other GE diffs, but now its done.
Screenshots
This is with #11982 only, not in master
Test methodology
Manual
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.