Proposal/issue 44 (java-diff-utils#45)

rosta · wumpz · commit c5b88e02dbf5 · 2019-09-21T14:05:24.000+02:00
* Correction of problem It appears that the configuration reportLinesUnchanged has no effect when showInlineDiffs is true. That is '<' and '>' characters are converted to HTML entities regardless. * Implement rawValues option * Revert "Implement rawValues option" This reverts commit d9c302c.
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/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());
+    }
 }

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`	`/**`