fixes #191 - downgraded patch to Java 8 compliance

wumpz · wumpz · commit 803fc4a18838 · 2025-02-05T22:04:26.000+01:00
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -83,7 +83,7 @@ public final class DiffRowGenerator {
      * Merge diffs which are separated by equalities consisting of whitespace only.
      */
     public static final Function<InlineDeltaMergeInfo, List<AbstractDelta<String>>> WHITESPACE_EQUALITIES_MERGER = deltaMergeInfo -> DeltaMergeUtils
-            .mergeInlineDeltas(deltaMergeInfo, (equalities -> equalities.stream().allMatch(String::isBlank)));
+            .mergeInlineDeltas(deltaMergeInfo, equalities -> equalities.stream().allMatch(s -> s==null || s.replaceAll("\\s+", "").equals("")));
 
     public static Builder create() {
         return new Builder();
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java b/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java
@@ -40,7 +40,7 @@ public static List<AbstractDelta<String>> mergeInlineDeltas(InlineDeltaMergeInfo
         final List<AbstractDelta<String>> newDeltas = new ArrayList<>();
         newDeltas.add(originalDeltas.get(0));
         for (int i = 1; i < originalDeltas.size(); i++) {
-            final AbstractDelta<String> previousDelta = newDeltas.getLast();
+            final AbstractDelta<String> previousDelta = newDeltas.get(newDeltas.size()-1);
             final AbstractDelta<String> currentDelta = originalDeltas.get(i);
 
             final List<String> equalities = deltaMergeInfo.getOrigList().subList(
@@ -64,7 +64,7 @@ public static List<AbstractDelta<String>> mergeInlineDeltas(InlineDeltaMergeInfo
                         new Chunk<>(previousDelta.getSource().getPosition(), allSourceLines),
                         new Chunk<>(previousDelta.getTarget().getPosition(), allTargetLines));
 
-                newDeltas.removeLast();
+                newDeltas.remove(newDeltas.size()-1);
                 newDeltas.add(replacement);
             } else {
                 newDeltas.add(currentDelta);
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -818,7 +818,7 @@ public void testGeneratorWithWhitespaceDeltaMerge() {
     public void testGeneratorWithMergingDeltasForShortEqualities() {
         final Function<InlineDeltaMergeInfo, List<AbstractDelta<String>>> shortEqualitiesMerger = deltaMergeInfo -> DeltaMergeUtils
                 .mergeInlineDeltas(deltaMergeInfo,
-                        (equalities -> equalities.stream().mapToInt(String::length).sum() < 6));
+                        equalities -> equalities.stream().mapToInt(String::length).sum() < 6);
 
         final DiffRowGenerator generator = DiffRowGenerator.create().showInlineDiffs(true).mergeOriginalRevised(true)
                 .inlineDiffByWord(true).oldTag(f -> "~").newTag(f -> "**").inlineDeltaMerger(shortEqualitiesMerger)
