← 输入框|github.com|刷新
Skip to content

Track line-count changes when applying fuzzy patches #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wumpz merged 1 commit into from
Oct 9, 2026
+23 −1
Merged

Track line-count changes when applying fuzzy patches #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@ public List<T> applyFuzzy(List<T> target, int maxFuzz) throws PatchFailedExcepti
int patchPosition = findPositionFuzzy(ctx, delta);
if (0 <= patchPosition) {
delta.applyFuzzyToAt(ctx.result, ctx.currentFuzz, patchPosition);
lastPatchDelta = patchPosition - delta.getSource().getPosition();
lastPatchDelta = patchPosition
- delta.getSource().getPosition()
+ delta.getTarget().size()
- delta.getSource().size();
ctx.lastPatchEnd = delta.getSource().last() + lastPatchDelta;
} else {
conflictOutput.processConflict(VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET, delta, ctx.result);
Expand Down
19 changes: 19 additions & 0 deletions java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,25 @@
*/
public class PatchWithMyerDiffTest {

@Test
public void fuzzyApplyAfterShrinkingChange() throws PatchFailedException {
List<String> source = Arrays.asList("a", "b", "c", "d", "e");
List<String> target = Arrays.asList("x", "d", "y");
Patch<String> patch = DiffUtils.diff(source, target);
assertEquals(target, patch.applyFuzzy(source, 0));
assertEquals(
Arrays.asList("prefix", "x", "d", "y"),
patch.applyFuzzy(Arrays.asList("prefix", "a", "b", "c", "d", "e"), 0));
}

@Test
public void fuzzyApplyDoesNotMatchNewlyInsertedLines() throws PatchFailedException {
Patch<String> patch = new Patch<>();
patch.addDelta(new ChangeDelta<>(new Chunk<>(0, Arrays.asList("a")), new Chunk<>(0, Arrays.asList("x", "c"))));
patch.addDelta(new ChangeDelta<>(new Chunk<>(2, Arrays.asList("c")), new Chunk<>(3, Arrays.asList("y"))));
assertEquals(Arrays.asList("x", "c", "b", "y"), patch.applyFuzzy(Arrays.asList("a", "b", "c"), 0));
}

@Test
public void testPatch_Change_withExceptionProcessor() {
final List<String> changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
Expand Down
Loading