Merge pull request #25 from benelog/refactor-regex

wumpz · web-flow · commit 5a32ede79f9a · 2018-09-13T15:17:44.000+02:00
Refactor to reuse java.util.regex.Pattern
diff --git a/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -49,9 +49,10 @@
 public class DiffRowGenerator {
 
     public static final Pattern SPLIT_BY_WORD_PATTERN = Pattern.compile("\\s+|[,.\\[\\](){}/\\\\*+\\-#]");
+    public static final Pattern WHITESPACE_PATTERN = Pattern.compile("\\s+");
 
     public static final BiPredicate<String, String> IGNORE_WHITESPACE_EQUALIZER = (original, revised)
-            -> original.trim().replaceAll("\\s+", " ").equals(revised.trim().replaceAll("\\s+", " "));
+            -> adjustWhitespace(original).equals(adjustWhitespace(revised));
 
     public static final BiPredicate<String, String> DEFAULT_EQUALIZER = Object::equals;
 
@@ -468,4 +469,8 @@ protected final static List<String> splitStringPreserveDelimiter(String str, Pat
         }
         return list;
     }
+
+    private static String adjustWhitespace(String raw) {
+        return WHITESPACE_PATTERN.matcher(raw.trim()).replaceAll(" ");
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,10 @@`
`49`	`49`	`public class DiffRowGenerator {`
`50`	`50`
`51`	`51`	`public static final Pattern SPLIT_BY_WORD_PATTERN = Pattern.compile("\\s+\|[,.\\[\\](){}/\\\\*+\\-#]");`
	`52`	`+ public static final Pattern WHITESPACE_PATTERN = Pattern.compile("\\s+");`
`52`	`53`
`53`	`54`	`public static final BiPredicate<String, String> IGNORE_WHITESPACE_EQUALIZER = (original, revised)`
`54`		`- -> original.trim().replaceAll("\\s+", " ").equals(revised.trim().replaceAll("\\s+", " "));`
	`55`	`+ -> adjustWhitespace(original).equals(adjustWhitespace(revised));`
`55`	`56`
`56`	`57`	`public static final BiPredicate<String, String> DEFAULT_EQUALIZER = Object::equals;`
`57`	`58`
`@@ -468,4 +469,8 @@ protected final static List<String> splitStringPreserveDelimiter(String str, Pat`
`468`	`469`	`}`
`469`	`470`	`return list;`
`470`	`471`	`}`
	`472`	`+`
	`473`	`+ private static String adjustWhitespace(String raw) {`
	`474`	`+ return WHITESPACE_PATTERN.matcher(raw.trim()).replaceAll(" ");`
	`475`	`+ }`
`471`	`476`	`}`