Merge origin/master

README.md

@@ -88,5 +88,5 @@ or using gradle:
 
 ```groovy
 // https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils
-compile group: 'io.github.java-diff-utils', name: 'java-diff-utils', version: '4.0'
+implementation "io.github.java-diff-utils:java-diff-utils:4.0"
 ```

src/main/java/com/github/difflib/text/DiffRowGenerator.java

@@ -267,9 +267,11 @@ public final class DiffRowGenerator {
     }
 
     List<String> normalizeLines(List<String> list) {
-        return list.stream()
-                .map(lineNormalizer::apply)
-                .collect(toList());
+        return reportLinesUnchanged
+                ? list
+                : list.stream()
+                        .map(lineNormalizer::apply)
+                        .collect(toList());
     }
 
     /**

src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java

@@ -78,7 +78,9 @@ public final class UnifiedDiffReader {
                 headerTxt += line + "\n";
             }
         }
-        data.setHeader(headerTxt);
+        if (!"".equals(headerTxt)) {
+            data.setHeader(headerTxt);
+        }
 
         while (line != null) {
             if (!CHUNK.validLine(line)) {

src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java

@@ -405,4 +405,16 @@ public class DiffRowGeneratorTest {
         rows = generator.generateDiffRows(Arrays.asList("\t<"), Arrays.asList("<"));
         assertEquals("[[CHANGE,    <,<]]", rows.toString());
     }
+
+    @Test
+    public void testGenerationIssue44reportLinesUnchangedProblem() throws DiffException {
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .reportLinesUnchanged(true)
+                .oldTag(f -> "~~")
+                .newTag(f -> "**")
+                .build();
+        List<DiffRow> rows = generator.generateDiffRows(Arrays.asList("<dt>To do</dt>"), Arrays.asList("<dt>Done</dt>"));
+        assertEquals("[[CHANGE,<dt>~~T~~o~~ do~~</dt>,<dt>**D**o**ne**</dt>]]", rows.toString());
+    }
 }

src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java

@@ -126,4 +126,19 @@ public class UnifiedDiffReaderTest {
 
         assertThat(diff.getTail()).isNull();
     }
+
+    @Test
+    public void testParseIssue33() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue33.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(1);
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+        assertThat(file1.getFromFile()).isEqualTo("Main.java");
+        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+
+        assertThat(diff.getTail()).isNull();
+        assertThat(diff.getHeader()).isNull();
+    }
 }

src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff

@@ -0,0 +1,6 @@
+--- a/Main.java
++++ b/Main.java
+@@ -2,2 +2,3 @@ public class Main {
+     public static void main(String[] args) {
++        System.out.println("Hello, world!");
+     }