Commitae23408

committed

fixes#47

1 parent923918a commitae23408Copy full SHA for ae23408

File tree

-3

lines changed

java-diff-utils/src
- main/java/com/github/difflib
  - UnifiedDiffUtils.java
- test/java/com/github/difflib
  - GenerateUnifiedDiffTest.java

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`importcom.github.difflib.patch.Patch;`
`22`	`22`	`importjava.util.ArrayList;`
`23`	`23`	`importjava.util.List;`
	`24`	`+importjava.util.Optional;`
`24`	`25`	`importjava.util.regex.Matcher;`
`25`	`26`	`importjava.util.regex.Pattern;`
`26`	`27`
`@@ -130,8 +131,8 @@ public static List<String> generateUnifiedDiff(String originalFileName,`
`130`	`131`	`intcontextSize) {`
`131`	`132`	`if (!patch.getDeltas().isEmpty()) {`
`132`	`133`	`List<String>ret =newArrayList<>();`
`133`		`-ret.add("--- " +originalFileName);`
`134`		`-ret.add("+++ " +revisedFileName);`
	`134`	`+ret.add("--- " +Optional.ofNullable(originalFileName).orElse(""));`
	`135`	`+ret.add("+++ " +Optional.ofNullable(revisedFileName).orElse(""));`
`135`	`136`
`136`	`137`	`List<AbstractDelta<String>>patchDeltas =newArrayList<>(`
`137`	`138`	`patch.getDeltas());`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public void testNewFileCreation() throws DiffException {`
`120`	`120`	`List<String>udiff =UnifiedDiffUtils.generateUnifiedDiff(null,"revised",`
`121`	`121`	`original,patch,10);`
`122`	`122`
`123`		`-assertEquals("---null",udiff.get(0));`
	`123`	`+assertEquals("--- ",udiff.get(0));`
`124`	`124`	`assertEquals("+++ revised",udiff.get(1));`
`125`	`125`	`assertEquals("@@ -0,0 +1,2 @@",udiff.get(2));`
`126`	`126`

Comments

(0)