Commit803fc4a

committed

fixes#191 - downgraded patch to Java 8 compliance

1 parent7f5c3fa commit803fc4aCopy full SHA for 803fc4a

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public final class DiffRowGenerator {`
`83`	`83`	`* Merge diffs which are separated by equalities consisting of whitespace only.`
`84`	`84`	`*/`
`85`	`85`	`publicstaticfinalFunction<InlineDeltaMergeInfo,List<AbstractDelta<String>>>WHITESPACE_EQUALITIES_MERGER =deltaMergeInfo ->DeltaMergeUtils`
`86`		`- .mergeInlineDeltas(deltaMergeInfo,(equalities ->equalities.stream().allMatch(String::isBlank)));`
	`86`	`+ .mergeInlineDeltas(deltaMergeInfo,equalities ->equalities.stream().allMatch(s ->s==null \|\|s.replaceAll("\\s+","").equals("")));`
`87`	`87`
`88`	`88`	`publicstaticBuildercreate() {`
`89`	`89`	`returnnewBuilder();`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public static List<AbstractDelta<String>> mergeInlineDeltas(InlineDeltaMergeInfo`
`40`	`40`	`finalList<AbstractDelta<String>>newDeltas =newArrayList<>();`
`41`	`41`	`newDeltas.add(originalDeltas.get(0));`
`42`	`42`	`for (inti =1;i <originalDeltas.size();i++) {`
`43`		`-finalAbstractDelta<String>previousDelta =newDeltas.getLast();`
	`43`	`+finalAbstractDelta<String>previousDelta =newDeltas.get(newDeltas.size()-1);`
`44`	`44`	`finalAbstractDelta<String>currentDelta =originalDeltas.get(i);`
`45`	`45`
`46`	`46`	`finalList<String>equalities =deltaMergeInfo.getOrigList().subList(`
`@@ -64,7 +64,7 @@ public static List<AbstractDelta<String>> mergeInlineDeltas(InlineDeltaMergeInfo`
`64`	`64`	`newChunk<>(previousDelta.getSource().getPosition(),allSourceLines),`
`65`	`65`	`newChunk<>(previousDelta.getTarget().getPosition(),allTargetLines));`
`66`	`66`
`67`		`-newDeltas.removeLast();`
	`67`	`+newDeltas.remove(newDeltas.size()-1);`
`68`	`68`	`newDeltas.add(replacement);`
`69`	`69`	`}else {`
`70`	`70`	`newDeltas.add(currentDelta);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -818,7 +818,7 @@ public void testGeneratorWithWhitespaceDeltaMerge() {`
`818`	`818`	`publicvoidtestGeneratorWithMergingDeltasForShortEqualities() {`
`819`	`819`	`finalFunction<InlineDeltaMergeInfo,List<AbstractDelta<String>>>shortEqualitiesMerger =deltaMergeInfo ->DeltaMergeUtils`
`820`	`820`	`.mergeInlineDeltas(deltaMergeInfo,`
`821`		`-(equalities ->equalities.stream().mapToInt(String::length).sum() <6));`
	`821`	`+equalities ->equalities.stream().mapToInt(String::length).sum() <6);`
`822`	`822`
`823`	`823`	`finalDiffRowGeneratorgenerator =DiffRowGenerator.create().showInlineDiffs(true).mergeOriginalRevised(true)`
`824`	`824`	`.inlineDiffByWord(true).oldTag(f ->"~").newTag(f ->"**").inlineDeltaMerger(shortEqualitiesMerger)`

Comments

(0)