java/java-diff-utils
1
0
Fork 0
mirror of https://github.com/java-diff-utils/java-diff-utils.git synced 2026-03-13 10:11:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes #191 - downgraded patch to Java 8 compliance

Browse Source
This commit is contained in:
tw
2025-02-05 22:04:26 +01:00
parent 7f5c3fa818
commit 803fc4a188
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
View File

@@ -83,7 +83,7 @@ public final class DiffRowGenerator {
* Merge diffs which are separated by equalities consisting of whitespace only.
*/
public static final Function<InlineDeltaMergeInfo, List<AbstractDelta<String>>> WHITESPACE_EQUALITIES_MERGER = deltaMergeInfo -> DeltaMergeUtils
.mergeInlineDeltas(deltaMergeInfo, (equalities -> equalities.stream().allMatch(String::isBlank)));
.mergeInlineDeltas(deltaMergeInfo, equalities -> equalities.stream().allMatch(s -> s==null || s.replaceAll("\\s+", "").equals("")));
public static Builder create() {
return new Builder();

4
java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java
View File

@@ -40,7 +40,7 @@ final public class DeltaMergeUtils {
final List<AbstractDelta<String>> newDeltas = new ArrayList<>();
newDeltas.add(originalDeltas.get(0));
for (int i = 1; i < originalDeltas.size(); i++) {
final AbstractDelta<String> previousDelta = newDeltas.getLast();
final AbstractDelta<String> previousDelta = newDeltas.get(newDeltas.size()-1);
final AbstractDelta<String> currentDelta = originalDeltas.get(i);
final List<String> equalities = deltaMergeInfo.getOrigList().subList(
@@ -64,7 +64,7 @@ final public class DeltaMergeUtils {
new Chunk<>(previousDelta.getSource().getPosition(), allSourceLines),
new Chunk<>(previousDelta.getTarget().getPosition(), allTargetLines));
newDeltas.removeLast();
newDeltas.remove(newDeltas.size()-1);
newDeltas.add(replacement);
} else {
newDeltas.add(currentDelta);

2
java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
View File

@@ -818,7 +818,7 @@ public class DiffRowGeneratorTest {
public void testGeneratorWithMergingDeltasForShortEqualities() {
final Function<InlineDeltaMergeInfo, List<AbstractDelta<String>>> shortEqualitiesMerger = deltaMergeInfo -> DeltaMergeUtils
.mergeInlineDeltas(deltaMergeInfo,
(equalities -> equalities.stream().mapToInt(String::length).sum() < 6));
equalities -> equalities.stream().mapToInt(String::length).sum() < 6);
final DiffRowGenerator generator = DiffRowGenerator.create().showInlineDiffs(true).mergeOriginalRevised(true)
.inlineDiffByWord(true).oldTag(f -> "~").newTag(f -> "**").inlineDeltaMerger(shortEqualitiesMerger)