GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — fixes #191 - downgraded patch to Java 8 compliance · 10280506/java-diff-utils@803fc4a

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

java-diff-utils/src
- main/java/com/github/difflib/text
  - DiffRowGenerator.java
  - deltamerge
    - DeltaMergeUtils.java
- test/java/com/github/difflib/text
  - DiffRowGeneratorTest.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

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

Copy file name to clipboardExpand all lines: java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java

+1-1Lines 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`	`public static final Function<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`	`public static Builder create() {`
`89`	`89`	`return new Builder();`

Collapse file

`‎java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java‎`

Copy file name to clipboardExpand all lines: java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java

+2-2Lines 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`	`final List<AbstractDelta<String>> newDeltas = new ArrayList<>();`
`41`	`41`	`newDeltas.add(originalDeltas.get(0));`
`42`	`42`	`for (int i = 1; i < originalDeltas.size(); i++) {`
`43`		`- final AbstractDelta<String> previousDelta = newDeltas.getLast();`
	`43`	`+ final AbstractDelta<String> previousDelta = newDeltas.get(newDeltas.size()-1);`
`44`	`44`	`final AbstractDelta<String> currentDelta = originalDeltas.get(i);`
`45`	`45`
`46`	`46`	`final List<String> equalities = deltaMergeInfo.getOrigList().subList(`
`@@ -64,7 +64,7 @@ public static List<AbstractDelta<String>> mergeInlineDeltas(InlineDeltaMergeInfo`
`64`	`64`	`new Chunk<>(previousDelta.getSource().getPosition(), allSourceLines),`
`65`	`65`	`new Chunk<>(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);`

Collapse file

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

Copy file name to clipboardExpand all lines: java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -818,7 +818,7 @@ public void testGeneratorWithWhitespaceDeltaMerge() {`
`818`	`818`	`public void testGeneratorWithMergingDeltasForShortEqualities() {`
`819`	`819`	`final Function<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`	`final DiffRowGenerator generator = DiffRowGenerator.create().showInlineDiffs(true).mergeOriginalRevised(true)`
`824`	`824`	`.inlineDiffByWord(true).oldTag(f -> "~").newTag(f -> "**").inlineDeltaMerger(shortEqualitiesMerger)`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.