[Logs] Highlight inline differences in CLI #1974
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
Slamdunk
commented
Jun 3, 2024
| @@ -1,5 +1,10 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <files psalm-version="5.11.0@c9b192ab8400fdaf04b2b13d110575adc879aa90"> | |||
| <file src="src/Differ/DiffColorizer.php"> | |||
| <InvalidArrayOffset> | |||
| <code>$lines[$prevIndex]</code> | |||
There was a problem hiding this comment.
I don't know why PSalm doesn't get the Assert::greaterThan($index, 0);
| @@ -285,7 +285,7 @@ public static function create(): self | |||
| $container->getPrinter(), | |||
| $container->getMutantCodeFactory(), | |||
| ), | |||
| Differ::class => static fn (): Differ => new Differ(new BaseDiffer(new UnifiedDiffOutputBuilder())), | |||
| Differ::class => static fn (): Differ => new Differ(new BaseDiffer(new UnifiedDiffOutputBuilder(''))), | |||
There was a problem hiding this comment.
I hope you are ok removing the "--- Original\n+++ New\n" header, which only adds visual clutter to the output
b7e0208 to
7ba20b6
Compare
maks-rafalko
approved these changes
Jun 3, 2024
There was a problem hiding this comment.
It works just awesome. Thank you very much @Slamdunk
A couple of real-world examples that became very easy to understand:
or this one
github-merge-queue bot
referenced
this pull request
in Lendable/json-serializer
Jun 4, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [infection/infection](https://togithub.com/infection/infection) | `^0.29.1` -> `^0.29.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>infection/infection (infection/infection)</summary> ### [`v0.29.2`](https://togithub.com/infection/infection/releases/tag/0.29.2): Highlight inline differences in CLI [Compare Source](https://togithub.com/infection/infection/compare/0.29.1...0.29.2) **Added:** - \[Logs] Highlight inline differences in CLI by [@​Slamdunk](https://togithub.com/Slamdunk) in [https://github.com/infection/infection/pull/1974](https://togithub.com/infection/infection/pull/1974) **Full Changelog**: infection/infection@0.29.1...0.29.2 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/Lendable/json-serializer). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIiwibGFiZWxzIjpbXX0=--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
I'll miss that everyday in PHPUnit now 🤣 |
maks-rafalko
added a commit
that referenced
this pull request
Oct 6, 2024
…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.
maks-rafalko
added a commit
that referenced
this pull request
Oct 6, 2024
…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.
maks-rafalko
added a commit
that referenced
this pull request
Oct 6, 2024
…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.
maks-rafalko
added a commit
that referenced
this pull request
Oct 6, 2024
…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.
maks-rafalko
added a commit
that referenced
this pull request
Oct 6, 2024
…ultiline diffs. (#2000) 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.
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.
Fix #1810
Infection's use case is much more limited: diffs are one-line only, and within the same line only one difference can happen.
Yes the algorithm in this PR needs some time to get understood, but less than tracking and maintaining another dependency.