Remove empty diffs in legacy diff algorithm#314563
Open
tokyo4j wants to merge 1 commit intomicrosoft:mainfrom
Open
Remove empty diffs in legacy diff algorithm#314563tokyo4j wants to merge 1 commit intomicrosoft:mainfrom
tokyo4j wants to merge 1 commit intomicrosoft:mainfrom
Conversation
This properly fixes microsoft#248612, which was worked around by switching to advanced diff algorithm.
tokyo4j
force-pushed
the
fix-legacy-empty-to-empty-diff
branch
from
132d10c to
f120105
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a legacy diff edge case where the prettification step can emit empty-to-empty hunks, which can surface as broken quick diff behavior in SCM when the legacy algorithm is selected.
Changes:
- Filters out zero-length-on-both-sides diff hunks from
LcsDiff's pretty diff output. - Adds a regression test covering the empty-to-empty hunk scenario from issue #248612.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
src/vs/base/common/diff/diff.ts |
Removes empty-to-empty changes from prettified diff results. |
src/vs/editor/test/common/diff/diffComputer.test.ts |
Adds a regression test for the legacy line diff behavior that triggered the SCM UI issue. |
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
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.
This prevents reintroducing #248612 when #314348 is merged and
legacyalgorithm is used for quick diff.