Commitc5b88e0

rosta

authored and

wumpz

committed

Proposal/issue 44 (#45)

* Correction of problemIt appears that the configuration reportLinesUnchanged has no effectwhen showInlineDiffs is true. That is '<' and '>' characters areconverted to HTML entities regardless.* Implement rawValues option* Revert "Implement rawValues option"This reverts commitd9c302c.

1 parentf3ff104 commitc5b88e0Copy full SHA for c5b88e0

File tree

2 files changed

+17

-3

lines changed

src
- main/java/com/github/difflib/text
  - DiffRowGenerator.java
- test/java/com/github/difflib/text
  - DiffRowGeneratorTest.java

2 files changed

+17

-3

lines changed

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

Lines changed: 5 additions & 3 deletions

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`		`-returnlist.stream()`
`271`		`- .map(lineNormalizer::apply)`
`272`		`- .collect(toList());`
	`270`	`+returnreportLinesUnchanged`
	`271`	`+ ?list`
	`272`	`+ :list.stream()`
	`273`	`+ .map(lineNormalizer::apply)`
	`274`	`+ .collect(toList());`
`273`	`275`	`}`
`274`	`276`
`275`	`277`	`/**`

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

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -405,4 +405,16 @@ public void testGeneratorIssue41UserNormalizer() throws DiffException {`
`405`	`405`	`rows =generator.generateDiffRows(Arrays.asList("\t<"),Arrays.asList("<"));`
`406`	`406`	`assertEquals("[[CHANGE, <,<]]",rows.toString());`
`407`	`407`	`}`
	`408`	`+`
	`409`	`+@Test`
	`410`	`+publicvoidtestGenerationIssue44reportLinesUnchangedProblem()throwsDiffException {`
	`411`	`+DiffRowGeneratorgenerator =DiffRowGenerator.create()`
	`412`	`+ .showInlineDiffs(true)`
	`413`	`+ .reportLinesUnchanged(true)`
	`414`	`+ .oldTag(f ->"~~")`
	`415`	`+ .newTag(f ->"**")`
	`416`	`+ .build();`
	`417`	`+List<DiffRow>rows =generator.generateDiffRows(Arrays.asList("<dt>To do</dt>"),Arrays.asList("<dt>Done</dt>"));`
	`418`	`+assertEquals("[[CHANGE,<dt>~~T~~o~~ do~~</dt>,<dt>Done</dt>]]",rows.toString());`
	`419`	`+ }`
`408`	`420`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitc5b88e0

File tree

2 files changed

2 files changed

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

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

0 commit comments