Skip to content

Refactor to reuse java.util.regex.Pattern #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2018
Merged

Refactor to reuse java.util.regex.Pattern #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/com/github/difflib/text/DiffRowGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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(" ");
}
}