Fallback to the simple diff colorizer (previous implementation) for multiline diffs #2000
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
56805fa to
151b814
Compare
…ultiline diffs. We introduced inline highlighter for diffs in #1974 (thanks to @Slamdunk). However, there was an incorrect assumption that we only have one-line diffs. This is not true. The case which is currently fails is the following: ```diff @@ @@ */ protected function name() { - return strtolower(get_class($this)); + strtolower(get_class($this)); + return null; } } ``` I check how `diff-so-fancy` works with multiline diffs, and it turned out that it just skips inline diffs, using simple algorithm, see images below. So, for the cases when we have multiline diffs, I just added fallback - our old algorithm of colorizing diffs.
151b814 to
2b6448e
Compare
|
I'm so sorry I missed this case. I'm glad you found a quick solution 👍 |
|
no worries, thanks for this feature. Love it ;) |
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.
Fixes #1999
We introduced inline highlighter for diffs in #1974 (thanks to @Slamdunk). However, there was an incorrect assumption that we only have one-line diffs. This is not true.
The case which is currently fails is the following:
I checked how
diff-so-fancyworks with multiline diffs, and it turned out that it just skips inline diffs, using simple algorithm, see images below.diff-so-fancyfor multiline case (now we have the same result after this MR):diff-so-fancyfor one-line case (we have the same result):So, for the cases when we have multiline diffs, I just added fallback - our old algorithm of colorizing diffs.
I've tested this patch with @sanmai's reproducer, it works fine: