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

Merge origin/master

Browse Source 
Conflicts:
	src/main/java/com/github/difflib/algorithm/jgit/JGitDiff.java
	src/test/java/com/github/difflib/algorithm/jgit/JGitDiffTest.java
	src/test/java/com/github/difflib/algorithm/jgit/LRJGitDiffTest.java
This commit is contained in:
wumpz
2017-04-28 11:47:46 +02:00
parent fe89a49ef7 d04f43ef02
commit 6c4a0cfbef
2 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/github/difflib/text/DiffRowGenerator.java
View File

@@ -49,6 +49,9 @@ import java.util.regex.Pattern;
*/
public class DiffRowGenerator {
public static final BiPredicate<String,String> IGNORE_WHITESPACE_EQUALIZER = (original, revised)
-> original.trim().replaceAll("\\s+", " ").equals(revised.trim().replaceAll("\\s+", " "));
public static final BiPredicate<String,String> DEFAULT_EQUALIZER = Object::equals;
private static final Pattern SPLIT_PATTERN = Pattern.compile("\\s+|[,.\\[\\](){}/\\\\*+\\-#]");
private final boolean showInlineDiffs;
private final boolean ignoreWhiteSpaces;
@@ -171,10 +174,6 @@ public class DiffRowGenerator {
public static Builder create() {
return new Builder();
}
public static final BiPredicate<String,String> IGNORE_WHITESPACE_EQUALIZER = (original, revised)
-> original.trim().replaceAll("\\s+", " ").equals(revised.trim().replaceAll("\\s+", " "));
public static final BiPredicate<String,String> DEFAULT_EQUALIZER = Object::equals;
private DiffRowGenerator(Builder builder) {
showInlineDiffs = builder.showInlineDiffs;

19
src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
View File

@@ -34,25 +34,6 @@ import static org.junit.Assert.*;
*/
public class MyersDiffTest {
public MyersDiffTest() {
}
@BeforeClass
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() {
}
@Before
public void setUp() {
}
@After
public void tearDown() {
}
@Test
public void testDiffMyersExample1Forward() throws DiffException {
List<String> original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");