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

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

@@ -948,6 +948,7 @@ private void updateFromTargetSelection() {
 			}
 			searchBar.setText(selectionText);
 			searchBar.setSelection(0, selectionText.length());
+			findReplaceLogic.findAndSelect(findReplaceLogic.getTarget().getSelection().x, searchBar.getText());
 		}
 	}
 

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

@@ -331,6 +331,18 @@ public void testActivateDialogSelectionActive_withRegExOptionActivated() {
 		assertThat(fTextViewer.getDocument().get(), is("test ;"));
 	}
 
+	@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;
 	}