Fix reverse overlap handling in line mode - #22
Open
gugglegum wants to merge 1 commit into
Open
Conversation
Owner
|
Hi Paul, could you please provide a test case showing the 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.
Summary
Fix incorrect diff output produced by line-mode when semantic cleanup detects a reverse overlap with unequal prefix and overlap lengths.
The bug could cause the destination reconstructed from the returned diff operations to differ from the destination passed to
diff_main().Root cause
For a reverse overlap, the overlapping suffix of the insertion is moved into an
EQUALoperation. The remaining insertion must therefore exclude that suffix.The PHP implementation used the overlap length as the retained prefix length:
It should remove the overlap from the end:
The existing reverse-overlap test did not expose the problem because its insertion length was exactly twice the overlap length, making both calculations return the same substring.
Test
Added a minimal line-mode regression test that verifies both projections of the generated diff:
Before the fix, the destination assertion fails because part of the overlap is duplicated.
Full test suite: