Updated test case as per review comments.

Author: deepika-u

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

@@ -51,7 +51,6 @@ public class FindReplaceLogic implements IFindReplaceLogic {
 	private IFindReplaceTarget target;
 	private Point incrementalBaseLocation;
 	private Point restoreBaseLocation = new Point(0, 0);
-	private boolean isSetRestoreBaseLocation = true;
 	private boolean isTargetSupportingRegEx;
 	private boolean isTargetEditable;
 	private final Set<SearchOptions> searchOptions = new HashSet<>();
@@ -63,8 +62,9 @@ public class FindReplaceLogic implements IFindReplaceLogic {
 	public void setFindString(String findString) {
 		if (this.findString.isEmpty() && !findString.isEmpty()) {
 			// User just started a new search after clearing previous search.
-			if (target != null)
+			if (target != null) {
 				restoreBaseLocation = target.getSelection();
+			}
 		}
 		this.findString = Objects.requireNonNull(findString);
 		if (isAvailableAndActive(SearchOptions.INCREMENTAL)) {
@@ -171,10 +171,6 @@ private static boolean isWord(String str) {
 	public void resetIncrementalBaseLocation() {
 		if (target != null && shouldInitIncrementalBaseLocation()) {
 			incrementalBaseLocation = target.getSelection();
-			if (isSetRestoreBaseLocation) {
-				restoreBaseLocation = incrementalBaseLocation;
-				isSetRestoreBaseLocation = false;
-			}
 		} else {
 			incrementalBaseLocation = new Point(0, 0);
 		}
@@ -361,10 +357,6 @@ private void restoreSelectionIfEmpty() {
 			extension.setSelection(restoreBaseLocation.x, restoreBaseLocation.y);
 	}
 
-	Point getRestoreBaseLocation() {
-		return restoreBaseLocation;
-	}
-
 	/**
 	 * Replaces all occurrences of the user's findString with the replace string.
 	 * Returns the number of replacements that occur.

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

@@ -829,40 +829,47 @@ public void testResetIncrementalBaseLocation() {
 
 		findReplaceLogic.setFindString("test");
 		assertThat(textViewer.getSelectedRange(), is(new Point(0, 4)));
+
+		// Move caret after first "test" i.e., caret after "test\n", so after 5 characters
 		textViewer.setSelectedRange(5, 0);
 		findReplaceLogic.resetIncrementalBaseLocation();
 		findReplaceLogic.performSearch();
 		assertThat(textViewer.getSelectedRange(), is(new Point(5, 4)));
 
+		// Move caret inside second "test" i.e., caret after "test\nte", so after 7 characters
 		textViewer.setSelectedRange(7, 0);
 		findReplaceLogic.resetIncrementalBaseLocation();
 		findReplaceLogic.performSearch();
 		assertThat(textViewer.getSelectedRange(), is(new Point(10, 4)));
 
+		// Move caret to position to third "test" i.e., caret after "test\ntest\n", so after 10 characters
 		textViewer.setSelectedRange(10, 0);
 		findReplaceLogic.resetIncrementalBaseLocation();
 		findReplaceLogic.performSearch();
 		assertThat(textViewer.getSelectedRange(), is(new Point(10, 4)));
-		assertThat(((FindReplaceLogic) findReplaceLogic).getRestoreBaseLocation(), is(new Point(10, 0)));
+
+		findReplaceLogic.setFindString("");
+		findReplaceLogic.performSearch();
+		assertThat(textViewer.getSelectedRange(), is(new Point(10, 0)));
 	}
 
 	@Test
-	public void testRestoreBaseLocationCapturedOnNewSearch() {
+	public void testSelectionRestoredAfterClearingSearch() {
 		String setupString= "alpha beta gamma";
 		TextViewer textViewer= setupTextViewer(setupString);
 		textViewer.setSelectedRange(6, 0); // caret after 'alpha '
 		IFindReplaceLogic logic= setupFindReplaceLogicObject(textViewer);
 		logic.activate(SearchOptions.FORWARD);
 		logic.activate(SearchOptions.INCREMENTAL);
 
-		// Initially empty find string
+		logic.setFindString("gamma");
+		assertThat(textViewer.getSelectedRange(), is(new Point(12, 5))); // "gamma" found
+
 		logic.setFindString("");
-		// Now start a new search (transition empty -> non-empty)
-		logic.setFindString("beta");
-		// Expect the stored restore location to match the caret before search started
-		assertThat(((FindReplaceLogic) logic).getRestoreBaseLocation(), is(new Point(6, 0)));
+		assertThat(textViewer.getSelectedRange(), is(new Point(6, 0)));
 	}
 
+
 	@Test
 	public void testCaretRestoredWhenSearchCleared() {
 		String setupString= "alpha beta gamma";
@@ -882,28 +889,31 @@ public void testCaretRestoredWhenSearchCleared() {
 		assertThat(textViewer.getSelectedRange(), is(new Point(0, 0)));
 	}
 
+
 	@Test
-	public void testRestoreBaseLocationRefreshedBetweenSessions() {
+	public void testCaretRestoredBetweenSearchSessions() {
 		String setupString= "alpha beta gamma";
 		TextViewer textViewer= setupTextViewer(setupString);
 		IFindReplaceLogic logic= setupFindReplaceLogicObject(textViewer);
 		logic.activate(SearchOptions.FORWARD);
 		logic.activate(SearchOptions.INCREMENTAL);
 
-		// First search session
-		textViewer.setSelectedRange(0, 0);
+		textViewer.setSelectedRange(0, 0); // caret at start
 		logic.setFindString("alpha");
-		assertThat(((FindReplaceLogic) logic).getRestoreBaseLocation(), is(new Point(0, 0)));
+		assertThat(textViewer.getSelectedRange(), is(new Point(0, 5))); // "alpha" found
 
 		// Clear the search (simulate reopen of overlay)
 		logic.setFindString("");
 		logic.performSearch();
+		assertThat(textViewer.getSelectedRange(), is(new Point(0, 0))); // caret restored
 
-		// Move caret and start new search session
-		textViewer.setSelectedRange(6, 0);
+		textViewer.setSelectedRange(6, 0); // caret before "beta"
 		logic.setFindString("beta");
-		// Verify that restoreBaseLocation updated to the new caret position
-		assertThat(((FindReplaceLogic) logic).getRestoreBaseLocation(), is(new Point(6, 0)));
+		assertThat(textViewer.getSelectedRange(), is(new Point(6, 4))); // "beta" found
+
+		logic.setFindString("");
+		logic.performSearch();
+		assertThat(textViewer.getSelectedRange(), is(new Point(6, 0))); // caret restored to new base
 	}
 
 	@Test