From 0e28b272f51b29817623b5d0e8693969f0cf4dd2 Mon Sep 17 00:00:00 2001 From: Ilari Suhonen <52505120+bluelhf@users.noreply.github.com> Date: Mon, 5 Jul 2021 23:10:28 +0300 Subject: [PATCH 1/2] Fix typo in UnifiedDiff.java Changes UnifiedDiff#spplyPatchTo to UnifiedDiff#applyPatchTo --- .../main/java/com/github/difflib/unifieddiff/UnifiedDiff.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java index bdabc589..f2bb231d 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java +++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java @@ -55,7 +55,7 @@ public String getTail() { return tail; } - public List spplyPatchTo(Predicate findFile, List originalLines) throws PatchFailedException { + public List applyPatchTo(Predicate findFile, List originalLines) throws PatchFailedException { UnifiedDiffFile file = files.stream() .filter(diff -> findFile.test(diff.getFromFile())) .findFirst().orElse(null); From dae27016694c00be8e897dcbaf8e8c825147956f Mon Sep 17 00:00:00 2001 From: Ilari Suhonen <52505120+bluelhf@users.noreply.github.com> Date: Mon, 5 Jul 2021 23:11:47 +0300 Subject: [PATCH 2/2] Fix typo in test Fixes the method invocation in the UnifiedDiff roundtrip test to account for the typo fix in UnifiedDiff --- .../github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java index acc84e9a..d1892771 100644 --- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java +++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java @@ -150,7 +150,7 @@ private void verify(List origLines, List revLines, // Patch fromUnifiedPatch = unifiedDiff.getFiles().get(0).getPatch(); // patchedLines = fromUnifiedPatch.applyTo(origLines); // } - patchedLines = unifiedDiff.spplyPatchTo(file -> originalFile.equals(file), origLines); + patchedLines = unifiedDiff.applyPatchTo(file -> originalFile.equals(file), origLines); assertEquals(revLines.size(), patchedLines.size()); for (int i = 0; i < revLines.size(); i++) { String l1 = revLines.get(i);