introduced a more complicated test which can only be solved using the linear space version

wumpz · wumpz · commit f9552680039b · 2024-09-27T23:31:24.000+02:00
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
@@ -187,13 +187,13 @@ public static DiffAlgorithmFactory factory() {
             @Override
             public <T> DiffAlgorithmI<T> 
             create() {
-                return new MyersDiff<T>();
+                return new MyersDiff<>();
             }
 
             @Override
             public <T> DiffAlgorithmI<T> 
             create(BiPredicate < T, T > equalizer) {
-                return new MyersDiff<T>(equalizer);
+                return new MyersDiff<>(equalizer);
             }
         };
     }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
@@ -231,13 +231,13 @@ public static DiffAlgorithmFactory factory() {
             @Override
             public <T> DiffAlgorithmI<T> 
             create() {
-                return new MyersDiffWithLinearSpace<T>();
+                return new MyersDiffWithLinearSpace<>();
             }
 
             @Override
             public <T> DiffAlgorithmI<T> 
             create(BiPredicate < T, T > equalizer) {
-                return new MyersDiffWithLinearSpace<T>(equalizer);
+                return new MyersDiffWithLinearSpace<>(equalizer);
             }
         };
     }
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
@@ -1,7 +1,12 @@
 package com.github.difflib.text;
 
+import com.github.difflib.DiffUtils;
+import com.github.difflib.algorithm.myers.MyersDiffWithLinearSpace;
 import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -721,7 +726,7 @@ public void testIssue129WithDeltaDecompression() {
 
         assertThat(txt).isEqualTo("EQUAL EQUAL EQUAL CHANGE INSERT INSERT EQUAL EQUAL EQUAL");
     }
-    
+
     @Test
     public void testIssue129SkipDeltaDecompression() {
         List<String> lines1 = Arrays.asList(
@@ -743,25 +748,25 @@ public void testIssue129SkipDeltaDecompression() {
                 "banana2",
                 "banana3");
         int[] entry = {1};
-        String txt = 
-                DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .decompressDeltas(false)
-                .oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
-                .newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
-                .build()
-                .generateDiffRows(lines1, lines2)
-                .stream()
-                .map(row -> row.getTag().toString())
-                .collect(joining(" "));
+        String txt
+                = DiffRowGenerator.create()
+                        .showInlineDiffs(true)
+                        .decompressDeltas(false)
+                        .oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
+                        .newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
+                        .build()
+                        .generateDiffRows(lines1, lines2)
+                        .stream()
+                        .map(row -> row.getTag().toString())
+                        .collect(joining(" "));
 //                .forEachOrdered(row -> {
 //                    System.out.printf("%4d %-8s %-80s %-80s\n", entry[0]++,
 //                            row.getTag(), row.getOldLine(), row.getNewLine());
 //                });
 
         assertThat(txt).isEqualTo("EQUAL EQUAL EQUAL CHANGE CHANGE CHANGE EQUAL EQUAL EQUAL");
     }
-    
+
     @Test
     public void testIssue129SkipWhitespaceChanges() throws IOException {
         String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue129_1.txt")).collect(joining("\n"));
@@ -780,9 +785,33 @@ public void testIssue129SkipWhitespaceChanges() throws IOException {
                 Arrays.asList(revised.split("\n")));
 
         assertThat(rows).hasSize(13);
-        
+
         rows.stream()
                 .filter(item -> item.getTag() != DiffRow.Tag.EQUAL)
                 .forEach(System.out::println);
     }
+
+    @Test
+    public void testIssue188HangOnExamples() throws IOException, URISyntaxException {        
+        try (FileSystem zipFs = FileSystems.newFileSystem(Paths.get("target/test-classes/com/github/difflib/text/test.zip"), null);) {
+            List<String> original = Files.readAllLines(zipFs.getPath("old.html"));
+            List<String> revised = Files.readAllLines(zipFs.getPath("new.html"));
+
+            DiffRowGenerator generator = DiffRowGenerator.create()
+                    .lineNormalizer(line -> line)
+                    .showInlineDiffs(true)
+                    .mergeOriginalRevised(true)
+                    .inlineDiffByWord(true)
+                    .decompressDeltas(true)
+                    .oldTag(f -> f ? "<s style=\"background-color: #bbbbbb\">" : "</s>")
+                    .newTag(f -> f ? "<b style=\"background-color: #aaffaa\">" : "</b>")
+                    .build();
+
+            //List<DiffRow> rows = generator.generateDiffRows(original, revised);
+            List<DiffRow> rows = generator.generateDiffRows(original, DiffUtils.diff(original, revised, new MyersDiffWithLinearSpace<>() ));
+        
+            System.out.println(rows);
+        }
+    }
 }
+
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/test.zip b/java-diff-utils/src/test/resources/com/github/difflib/text/test.zip

Original file line number	Diff line number	Diff line change
`@@ -187,13 +187,13 @@ public static DiffAlgorithmFactory factory() {`
`187`	`187`	`@Override`
`188`	`188`	`public <T> DiffAlgorithmI<T>`
`189`	`189`	`create() {`
`190`		`- return new MyersDiff<T>();`
	`190`	`+ return new MyersDiff<>();`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`@Override`
`194`	`194`	`public <T> DiffAlgorithmI<T>`
`195`	`195`	`create(BiPredicate < T, T > equalizer) {`
`196`		`- return new MyersDiff<T>(equalizer);`
	`196`	`+ return new MyersDiff<>(equalizer);`
`197`	`197`	`}`
`198`	`198`	`};`
`199`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,13 +231,13 @@ public static DiffAlgorithmFactory factory() {`
`231`	`231`	`@Override`
`232`	`232`	`public <T> DiffAlgorithmI<T>`
`233`	`233`	`create() {`
`234`		`- return new MyersDiffWithLinearSpace<T>();`
	`234`	`+ return new MyersDiffWithLinearSpace<>();`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`@Override`
`238`	`238`	`public <T> DiffAlgorithmI<T>`
`239`	`239`	`create(BiPredicate < T, T > equalizer) {`
`240`		`- return new MyersDiffWithLinearSpace<T>(equalizer);`
	`240`	`+ return new MyersDiffWithLinearSpace<>(equalizer);`
`241`	`241`	`}`
`242`	`242`	`};`
`243`	`243`	`}`