FindReplaceLogic: update incremental base location even with RegEx (#2108)

Update the incremental Base location even if RegEx is enabled and
incremental search is disabled. Once RegEx is disabled, the incremental
base location is thus still valid.

fixes #1915

Author: Maximilian Wittmer

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogic.java

@@ -138,15 +138,15 @@ public boolean isRegExSearchAvailableAndActive() {
 
 	@Override
 	public void resetIncrementalBaseLocation() {
-		if (target != null && isActive(SearchOptions.INCREMENTAL) && !isRegExSearchAvailableAndActive()) {
+		if (target != null && shouldInitIncrementalBaseLocation()) {
 			incrementalBaseLocation = target.getSelection();
 		} else {
 			incrementalBaseLocation = new Point(0, 0);
 		}
 	}
 
 	public boolean shouldInitIncrementalBaseLocation() {
-		return isActive(SearchOptions.INCREMENTAL) && !isActive(SearchOptions.REGEX);
+		return isActive(SearchOptions.INCREMENTAL);
 	}
 
 	/**

tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogicTest.java

@@ -695,6 +695,33 @@ public void testPerformIncrementalSearch() {
 		assertThat(findReplaceLogic.getTarget().getSelection().y, is(4));
 	}
 
+	@Test
+	public void testIncrementBaseLocationWithRegEx() {
+		TextViewer textViewer= setupTextViewer("Test Test Test Test Test");
+		IFindReplaceLogic findReplaceLogic= setupFindReplaceLogicObject(textViewer);
+		findReplaceLogic.activate(SearchOptions.INCREMENTAL);
+		findReplaceLogic.activate(SearchOptions.FORWARD);
+
+		findReplaceLogic.performSearch("Test");
+		assertThat(findReplaceLogic.getTarget().getSelection(), is(new Point(0, 4)));
+
+		findReplaceLogic.activate(SearchOptions.REGEX);
+		findReplaceLogic.deactivate(SearchOptions.INCREMENTAL);
+		findReplaceLogic.performSearch("Test");
+		findReplaceLogic.activate(SearchOptions.INCREMENTAL);
+		assertThat(findReplaceLogic.getTarget().getSelection(), is(new Point(5, 4)));
+		findReplaceLogic.deactivate(SearchOptions.INCREMENTAL);
+		findReplaceLogic.performSearch("Test");
+		findReplaceLogic.activate(SearchOptions.INCREMENTAL);
+		assertThat(findReplaceLogic.getTarget().getSelection(), is(new Point(10, 4)));
+		findReplaceLogic.deactivate(SearchOptions.REGEX);
+
+		findReplaceLogic.performSearch("Test");
+		assertThat(findReplaceLogic.getTarget().getSelection(), is(new Point(15, 4)));
+		findReplaceLogic.performSearch("Test");
+		assertThat(findReplaceLogic.getTarget().getSelection(), is(new Point(15, 4)));
+	}
+
 	private void expectStatusEmpty(IFindReplaceLogic findReplaceLogic) {
 		assertThat(findReplaceLogic.getStatus(), instanceOf(NoStatus.class));
 	}