Fix wonky scrolling

Update RegExPlus dependency due to bug in Java 9 and above (new version
fixes this)

Author: CodesAway

BEXCodeCompare/pom.xml

@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>info.codesaway</groupId>
 			<artifactId>regexplus</artifactId>
-			<version>1.2.0</version>
+			<version>2.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.spotbugs</groupId>

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

@@ -29,7 +29,7 @@ public enum BEXMatchingLanguage implements MatchingLanguage {
 	 * SQL Matching language
 	 * @since 0.11
 	 */
-	SQL(BEXMatchingUtilities::parseSQLTextStates, "@", true, bexPair("BEGIN", "END")),
+	SQL(BEXMatchingUtilities::parseSQLTextStates, "@#$", true, bexPair("BEGIN", "END")),
 
 	// End of enum
 	;
@@ -92,11 +92,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/test/java/info/codesaway/bex/matching/BEXParseSQLTest.java

@@ -45,15 +45,15 @@ void testNestedBlockComments() {
 		BEXString bexString = new BEXString(text, BEXMatchingLanguage.SQL);
 
 		assertThat(bexString.getTextStateMap().asMapOfRanges())
-				.containsExactly(
-						entry(closedOpen(2, 11), IN_MULTILINE_COMMENT),
-						entry(closed(11, 21), IN_MULTILINE_COMMENT),
-						entry(closed(22, 51), IN_MULTILINE_COMMENT));
+		.containsExactly(
+				entry(closedOpen(2, 11), IN_MULTILINE_COMMENT),
+				entry(closed(11, 21), IN_MULTILINE_COMMENT),
+				entry(closed(22, 51), IN_MULTILINE_COMMENT));
 
 		assertThat(bexString.substring(closed(11, 21))).asString()
-				.isEqualTo("/*\r\n" +
-						"def\r\n" +
-						"*/");
+		.isEqualTo("/*\r\n" +
+				"def\r\n" +
+				"*/");
 	}
 
 	@Test
@@ -62,7 +62,7 @@ void testLineComment() {
 		BEXString bexString = new BEXString(text, BEXMatchingLanguage.SQL);
 
 		assertThat(bexString.getTextStateMap().asMapOfRanges())
-				.containsExactly(entry(closedOpen(2, text.length()), IN_LINE_COMMENT));
+		.containsExactly(entry(closedOpen(2, text.length()), IN_LINE_COMMENT));
 	}
 
 	@Test
@@ -71,7 +71,7 @@ void testSingleQuoteEscape() {
 		BEXString bexString = new BEXString(text, BEXMatchingLanguage.SQL);
 
 		assertThat(bexString.getTextStateMap().asMapOfRanges())
-				.containsExactly(entry(closed(0, text.length() - 1), IN_STRING_LITERAL));
+		.containsExactly(entry(closed(0, text.length() - 1), IN_STRING_LITERAL));
 	}
 
 	@Test
@@ -80,7 +80,7 @@ void testBackslashDoesNotEscapeSingleQuote() {
 		BEXString bexString = new BEXString(text, BEXMatchingLanguage.SQL);
 
 		assertThat(bexString.getTextStateMap().asMapOfRanges())
-				.containsExactly(entry(closed(7, 13), IN_STRING_LITERAL));
+		.containsExactly(entry(closed(7, 13), IN_STRING_LITERAL));
 	}
 
 	@Test
@@ -133,7 +133,7 @@ void testTrailingBeginDoesNotMatch() {
 	}
 
 	@Test
-	void testVariableNamedBeginMatches() {
+	void testVariableNameBeginMatches() {
 		String pattern = ":[value]";
 		String text = "@BEGIN";
 
@@ -142,7 +142,7 @@ void testVariableNamedBeginMatches() {
 	}
 
 	@Test
-	void testVariableNamedContainingBeginMatches() {
+	void testVariableNameContainingBeginMatches() {
 		String pattern = ":[value]";
 		String text = "@lets_begin";
 
@@ -159,7 +159,7 @@ void testTrailingEndDoesNotMatch() {
 	}
 
 	@Test
-	void testVariableNamedEndMatches() {
+	void testVariableNameEndMatches() {
 		String pattern = ":[value]";
 		String text = "@end";
 
@@ -168,11 +168,21 @@ void testVariableNamedEndMatches() {
 	}
 
 	@Test
-	void testVariableNamedContainingEndMatches() {
+	void testVariableNameContainingEndMatches() {
 		String pattern = ":[value]";
 		String text = "@the_end";
 
 		BEXMatcher bexMatcher = testJustBEXMatch(pattern, text, BEXMatchingLanguage.SQL);
 		assertThat(bexMatcher.group("value")).isEqualTo("@the_end");
 	}
+
+	// Issue #89
+	@Test
+	void testTableNameContainingEndMatches() {
+		String pattern = ":[value]";
+		String text = "#end";
+
+		BEXMatcher bexMatcher = testJustBEXMatch(pattern, text, BEXMatchingLanguage.SQL);
+		assertThat(bexMatcher.group("value")).isEqualTo("#end");
+	}
 }

BEXCodeComparePlugin/src/info/codesaway/bex/views/BEXView.java

@@ -354,7 +354,7 @@ private void setChanges(final List<DiffChange<BEXChangeInfo>> changes) {
 		List<TreeParent> expandedElements = new ArrayList<>();
 
 		boolean shouldShowBothSidesOfSubstitution = Activator.shouldShowBothSidesOfSubstitution();
-		System.out.println("In BEXView.setChanges");
+		//		System.out.println("In BEXView.setChanges");
 
 		for (DiffChange<BEXChangeInfo> change : changes) {
 			TreeParent changeParent = new TreeParent(change.toString());

BEXCodeComparePlugin/src/info/codesaway/eclipse/compare/contentmergeviewer/TextMergeViewer.java

@@ -123,6 +123,7 @@
 import org.eclipse.jface.text.IRewriteTarget;
 import org.eclipse.jface.text.ITextPresentationListener;
 import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.JFaceTextUtil;
 import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.TextPresentation;
@@ -6152,7 +6153,6 @@ private void updateStructure(final char leg) {
 
 	public void scroll(final int leftLineNumber, final int rightLineNumber) {
 		char contributor;
-		//		boolean isLeft;
 		int line;
 		MergeSourceViewer mergeSourceViewer;
 
@@ -6177,12 +6177,17 @@ public void scroll(final int leftLineNumber, final int rightLineNumber) {
 		Position position = new Position(offset);
 
 		// Issue #18
-		// TODO: when does this, still shows green background (should it?)
-		// (when I perform an actual mouse click, it doesn't show the background)
-		Diff diff = this.findDiff(contributor, offset);
+		// First, check if the specified line is already visible
+		// (based on logic in TextViewer.internalRevealRange)
+		StyledText text = mergeSourceViewer.getSourceViewer().getTextWidget();
+		int top = text.getTopIndex();
+		int bottom = JFaceTextUtil.getBottomIndex(text);
+		boolean isVisible = line >= top && line <= bottom;
 
-		//		System.out.println("Scroll to " + offset + "\t" + diff);
-		this.setCurrentDiff(diff, true);
+		if (!isVisible) {
+			Diff diff = this.fMerger.findDiff(contributor, position);
+			this.setCurrentDiff(diff, true);
+		}
 
 		if (leftLineNumber != -1 && rightLineNumber != -1) {
 			// Subtract 1 to make 0-based line
@@ -6201,10 +6206,5 @@ public void scroll(final int leftLineNumber, final int rightLineNumber) {
 		}
 
 		mergeSourceViewer.setSelection(position);
-
-		// TODO: does this help Issue #18 at all?
-		this.updatePresentation();
-
-		//		this.revealDiff(diff, true);
 	}
 }