Find/Replace overlay: immediate replace after selected text #2011

Work around for a bug of the Editor's implementation of the FindReplaceTargetExtension3; when initializing the search with an already selected string, force the overlay to search for it again so that the Editor can then later replace it if required. fixes #2011
eclipse-platform · Jul 8, 2024 · d2b7245 · d2b7245
1 parent 7118f66
commit d2b7245
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/...nch.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java b/...nch.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java
@@ -874,6 +874,7 @@ private void updateFromTargetSelection() {
 		} else {
 			searchBar.setText(initText);
 			searchBar.setSelection(0, initText.length());
+			findReplaceLogic.findAndSelect(findReplaceLogic.getTarget().getSelection().x, searchBar.getText());
 		}
 	}
 

diff --git a/...kbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/FindReplaceUITest.java b/...kbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/FindReplaceUITest.java
@@ -291,6 +291,18 @@ public void testActivateDialogWithSelectionActive() {
 		assertThat(fTextViewer.getDocument().get(), is("text" + System.lineSeparator() + System.lineSeparator()));
 	}
 
+	@Test
+	public void testReplaceIfSelectedOnStart() {
+		openTextViewer("abcdefg");
+		fTextViewer.setSelection(new TextSelection(2, 2));
+		initializeFindReplaceUIForTextViewer();
+
+		dialog.setReplaceText("aa");
+		dialog.performReplace();
+
+		assertThat(fTextViewer.getDocument().get(), is("abaaefg"));
+	}
+
 	protected AccessType getDialog() {
 		return dialog;
 	}