Merge origin/master

wumpz · wumpz · commit 17eced936706 · 2019-10-20T00:07:38.000+02:00
diff --git a/README.md b/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"
 ```
diff --git a/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -267,9 +267,11 @@ private DiffRow buildDiffRowWithoutNormalizing(Tag type, String orgline, String
     }
 
     List<String> normalizeLines(List<String> list) {
-        return list.stream()
-                .map(lineNormalizer::apply)
-                .collect(toList());
+        return reportLinesUnchanged
+                ? list
+                : list.stream()
+                        .map(lineNormalizer::apply)
+                        .collect(toList());
     }
 
     /**
diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -78,7 +78,9 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                 headerTxt += line + "\n";
             }
         }
-        data.setHeader(headerTxt);
+        if (!"".equals(headerTxt)) {
+            data.setHeader(headerTxt);
+        }
 
         while (line != null) {
             if (!CHUNK.validLine(line)) {
diff --git a/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -405,4 +405,16 @@ public void testGeneratorIssue41UserNormalizer() throws DiffException {
         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());
+    }
 }
diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -126,4 +126,19 @@ public void testParseIssue46() throws IOException {
 
         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();
+    }
 }
diff --git a/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff b/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!");
+     }

Original file line number	Diff line number	Diff line change
`@@ -267,9 +267,11 @@ private DiffRow buildDiffRowWithoutNormalizing(Tag type, String orgline, String`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`List<String> normalizeLines(List<String> list) {`
`270`		`- return list.stream()`
`271`		`- .map(lineNormalizer::apply)`
`272`		`- .collect(toList());`
	`270`	`+ return reportLinesUnchanged`
	`271`	`+ ? list`
	`272`	`+ : list.stream()`
	`273`	`+ .map(lineNormalizer::apply)`
	`274`	`+ .collect(toList());`
`273`	`275`	`}`
`274`	`276`
`275`	`277`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,9 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {`
`78`	`78`	`headerTxt += line + "\n";`
`79`	`79`	`}`
`80`	`80`	`}`
`81`		`- data.setHeader(headerTxt);`
	`81`	`+ if (!"".equals(headerTxt)) {`
	`82`	`+ data.setHeader(headerTxt);`
	`83`	`+ }`
`82`	`84`
`83`	`85`	`while (line != null) {`
`84`	`86`	`if (!CHUNK.validLine(line)) {`