Merge pull request #77 from CodesAway/bugfix-0.9.1

Bugfix 0.9.1

Author: CodesAway

BEXCodeCompare/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>info.codesaway</groupId>
 	<artifactId>bex</artifactId>
-	<version>0.9.0</version>
+	<version>0.9.1</version>
 	<name>BEX Code Compare</name>
 	<description>Be Enhanced Code Compare</description>
 	<properties>

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

@@ -2,6 +2,7 @@
 
 import static info.codesaway.bex.matching.BEXGroupMatchSetting.DEFAULT;
 import static info.codesaway.bex.matching.BEXGroupMatchSetting.STOP_WHEN_VALID;
+import static info.codesaway.bex.matching.BEXMatchingStateOption.MISMATCHED_BRACKETS;
 import static info.codesaway.bex.matching.BEXMatchingUtilities.extractJavaTextStates;
 import static info.codesaway.bex.matching.BEXMatchingUtilities.hasNextChar;
 import static info.codesaway.bex.matching.BEXMatchingUtilities.hasText;
@@ -475,7 +476,7 @@ private BEXMatchingState search(final int start, final int end,
 					if (bracketEndIndex != -1) {
 						char bracketStart = bracketStarts.charAt(bracketEndIndex);
 						if (lastChar(brackets) != bracketStart) {
-							return new BEXMatchingState(i, brackets.toString());
+							return new BEXMatchingState(i, brackets.toString(), MISMATCHED_BRACKETS);
 						} else {
 							// Remove last character
 							brackets.setLength(brackets.length() - 1);

BEXCodeCompare/src/test/java/info/codesaway/bex/matching/BEXMatcherTest.java

@@ -6,6 +6,9 @@
 import static info.codesaway.bex.util.BEXUtilities.entry;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
+
+import java.time.Duration;
 
 import org.junit.jupiter.api.Test;
 
@@ -385,4 +388,13 @@ void testDuplicateGroupNameInRegexDoesNotMatchGroupValue() {
 		String text = "something Sunday Sat";
 		testNoBEXMatch(pattern, text);
 	}
+
+	@Test
+	// Issue #75
+	void testMismatchedBracketsDoesNotCauseInfiniteLoop() {
+		String pattern = "if (:[before]blah:[after])";
+		String text = "if (something) blah";
+
+		assertTimeoutPreemptively(Duration.ofSeconds(1), () -> testNoBEXMatch(pattern, text));
+	}
 }

BEXCodeRefactoring/pom.xml

@@ -162,4 +162,4 @@
 			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 	</distributionManagement>
-</project>
+</project>

BEXCodeRefactoringExamples/pom.xml

@@ -156,4 +156,4 @@
 			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 	</distributionManagement>
-</project>
+</project>