Start 0.13.0 development

Fix JSP parsing
Added default methods to MatchingStateOption to indicate type of state
(code, comment, string literal)

Author: CodesAway

BEXCodeCompare/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>info.codesaway</groupId>
 	<artifactId>bex</artifactId>
-	<version>0.12.0</version>
+	<version>0.13.0</version>
 	<name>Be Enhanced Code Compare (BEϽC)</name>
 	<description>An enhanced code compare, utilities, and code matching</description>
 	<properties>

BEXCodeCompare/src/main/java/info/codesaway/bex/diff/DiffHelper.java

@@ -30,6 +30,7 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
@@ -971,6 +972,8 @@ public static List<DiffUnit> combineToDiffBlocks(final List<DiffEdit> diff) {
 		return combineToDiffBlocks(diff, false);
 	}
 
+	private static final BiPredicate<DiffEdit, DiffEdit> ALWAYS_SHOULD_COMBINE = (x, y) -> true;
+
 	/**
 	 * Combines consecutive DiffEdit to form DiffBlock when possible
 	 *
@@ -980,12 +983,32 @@ public static List<DiffUnit> combineToDiffBlocks(final List<DiffEdit> diff) {
 	 * @return
 	 */
 	public static List<DiffUnit> combineToDiffBlocks(final List<DiffEdit> diff, final boolean allowReplacements) {
+		return combineToDiffBlocks(diff, allowReplacements, ALWAYS_SHOULD_COMBINE);
+	}
+
+	/**
+	 * Combines consecutive DiffEdit to form DiffBlock when possible and <code>shouldCombinePredicate</code> returns true
+	 *
+	 * <p>The returned list will consist of DiffUnit objects (either DiffBlock or DiffEdit)</p>
+	 *
+	 * @param diff
+	 * @param allowReplacements
+	 * @param shouldCombinePredicate indicates whether the two DiffEdits should be combined, if this method determines they can be combined (return <code>false</code> to prevent the combining)
+	 * @return
+	 * @since 0.13
+	 */
+	public static List<DiffUnit> combineToDiffBlocks(final List<DiffEdit> diff, final boolean allowReplacements,
+			final BiPredicate<DiffEdit, DiffEdit> shouldCombinePredicate) {
 		List<DiffUnit> diffBlocks = new ArrayList<>();
 
+		BiPredicate<DiffEdit, DiffEdit> usedShouldCombinePredicate = shouldCombinePredicate != null
+				? shouldCombinePredicate
+				: ALWAYS_SHOULD_COMBINE;
+
 		for (int i = 0; i < diff.size(); i++) {
 			DiffEdit diffEdit = diff.get(i);
 
-			if (isNextDiffPartOfBlock(diff, i, allowReplacements)) {
+			if (isNextDiffPartOfBlock(diff, i, allowReplacements, usedShouldCombinePredicate)) {
 				DiffType blockDiffType = diffEdit.getType();
 
 				List<DiffEdit> edits = new ArrayList<>();
@@ -997,7 +1020,7 @@ public static List<DiffUnit> combineToDiffBlocks(final List<DiffEdit> diff, fina
 					if (blockDiffType != REPLACEMENT_BLOCK && !blockDiffType.equals(nextDiffEdit.getType())) {
 						blockDiffType = REPLACEMENT_BLOCK;
 					}
-				} while (isNextDiffPartOfBlock(diff, i, allowReplacements));
+				} while (isNextDiffPartOfBlock(diff, i, allowReplacements, usedShouldCombinePredicate));
 
 				diffBlocks.add(new DiffBlock(blockDiffType, edits));
 			} else {
@@ -1017,7 +1040,7 @@ public static List<DiffUnit> combineToDiffBlocks(final List<DiffEdit> diff, fina
 	 * @return
 	 */
 	private static boolean isNextDiffPartOfBlock(final List<DiffEdit> diff, final int i,
-			final boolean allowReplacements) {
+			final boolean allowReplacements, final BiPredicate<DiffEdit, DiffEdit> shouldCombinePredicate) {
 
 		if (i + 1 >= diff.size()) {
 			return false;
@@ -1040,7 +1063,8 @@ private static boolean isNextDiffPartOfBlock(final List<DiffEdit> diff, final in
 			}
 		}
 
-		return hasConsecutiveLines(diffEdit, nextDiffEdit, isReplancement);
+		return hasConsecutiveLines(diffEdit, nextDiffEdit, isReplancement)
+				&& shouldCombinePredicate.test(diffEdit, nextDiffEdit);
 	}
 
 	private static boolean canBePartOfReplacement(final DiffEdit diffEdit) {

BEXCodeCompare/src/main/java/info/codesaway/bex/matching/BEXMatchingLanguage.java

@@ -31,6 +31,26 @@ public enum BEXMatchingLanguage implements MatchingLanguage {
 	 */
 	SQL(BEXMatchingUtilities::parseSQLTextStates, "@#$", true, bexPair("BEGIN", "END")),
 
+	/**
+	 * Language which gives no special meaning to any characters
+	 *
+	 * <p>For example, brackets aren't checked that they balance</p>
+	 * @since 0.13
+	 */
+	TEXT(x -> ImmutableIntRangeMap.of()) {
+		@Override
+		public Optional<BEXPair<String>> findStartDelimiter(final CharSequence text, final int index,
+				final Set<MatchingLanguageSetting> settings) {
+			return Optional.empty();
+		}
+
+		@Override
+		public MatchingDelimiterState findEndDelimiter(final BEXPair<String> lastDelimiter, final CharSequence text,
+				final int index, final Set<MatchingLanguageSetting> settings) {
+			return MatchingDelimiterState.NOT_FOUND;
+		}
+	},
+
 	// End of enum
 	;
 
@@ -92,11 +112,11 @@ public MatchingDelimiterState findEndDelimiter(final BEXPair<String> lastDelimit
 
 			BiPredicate<String, String> equals = this.hasCaseInsensitiveDelimiters
 					? String::equalsIgnoreCase
-							: String::equals;
+					: String::equals;
 
 			MatchingDelimiterResult result = lastDelimiter != null && equals.test(s, lastDelimiter.getRight())
 					? MatchingDelimiterResult.FOUND
-							: MatchingDelimiterResult.MISMATCHED;
+					: MatchingDelimiterResult.MISMATCHED;
 
 			return new MatchingDelimiterState(result, s);
 		}

BEXCodeCompare/src/main/java/info/codesaway/bex/matching/BEXMatchingStateOption.java

@@ -1,21 +1,29 @@
 package info.codesaway.bex.matching;
 
-public enum BEXMatchingStateOption implements MatchingStateOption {
-	IN_STRING_LITERAL, MISMATCHED_DELIMITERS, IN_LINE_COMMENT, IN_MULTILINE_COMMENT, IN_EXPRESSION_BLOCK(true),
-	IN_SECONDARY_STRING_LITERAL;
+import static info.codesaway.bex.util.BEXUtilities.in;
 
-	private final boolean isCode;
+public enum BEXMatchingStateOption implements MatchingStateOption {
+	// Code
+	IN_EXPRESSION_BLOCK, IN_TAG,
+	// Comment
+	IN_LINE_COMMENT, IN_MULTILINE_COMMENT, IN_SECONDARY_MULTILINE_COMMENT,
+	// String literal
+	IN_STRING_LITERAL, IN_SECONDARY_STRING_LITERAL,
+	// Other states
+	MISMATCHED_DELIMITERS;
 
-	private BEXMatchingStateOption() {
-		this(false);
+	@Override
+	public boolean isCode() {
+		return in(this, IN_EXPRESSION_BLOCK, IN_TAG);
 	}
 
-	private BEXMatchingStateOption(final boolean isCode) {
-		this.isCode = isCode;
+	@Override
+	public boolean isComment() {
+		return in(this, IN_LINE_COMMENT, IN_MULTILINE_COMMENT, IN_SECONDARY_MULTILINE_COMMENT);
 	}
 
 	@Override
-	public boolean isCode() {
-		return this.isCode;
+	public boolean isStringLiteral() {
+		return in(this, IN_STRING_LITERAL, IN_SECONDARY_STRING_LITERAL);
 	}
 }