FindReplaceDialog: preserve replace button enablement #2863

When typing into the replace input field of the FindReplaceDialog, the
replace buttons currently become disabled in case incremental search is
not activated. This requires another find to be explicitly triggered.
The reason is that button enablement handling for changes in the find
and replace input fields have erroneously been merged.

This change corrects the enablement calculation for changes to the
replace input field by reverting to the original separation between how
buttons are enabled based on changes in the find input and in the
replace input field.

Tests did not find the issue as they did not check for enablement of the
according buttons. This change also corrects that.

Fixes #2863

Author: HeikoKlare

bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/FindReplaceDialog.java

@@ -154,8 +154,6 @@ public void modifyText(ModifyEvent e) {
 			fFindField.addModifyListener(event -> {
 				decorate();
 			});
-
-			updateButtonState(!findReplaceLogic.isActive(SearchOptions.INCREMENTAL));
 		}
 	}
 
@@ -629,9 +627,6 @@ public void widgetDefaultSelected(SelectionEvent e) {
 	 * @return the input panel
 	 */
 	private Composite createInputPanel(Composite parent) {
-
-		ModifyListener listener = e -> updateButtonState();
-
 		Composite panel = new Composite(parent, SWT.NULL);
 		GridLayout layout = new GridLayout();
 		layout.numColumns = 2;
@@ -652,7 +647,10 @@ private Composite createInputPanel(Composite parent) {
 				ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS, new char[0], true);
 		setGridData(fFindField, SWT.FILL, true, SWT.CENTER, false);
 		addDecorationMargin(fFindField);
-		fFindModifyListener = new InputModifyListener(this::updateFindString);
+		fFindModifyListener = new InputModifyListener(() -> {
+			updateFindString();
+			updateButtonState(!findReplaceLogic.isActive(SearchOptions.INCREMENTAL));
+		});
 		fFindField.addModifyListener(fFindModifyListener);
 
 		fReplaceLabel = new Label(panel, SWT.LEFT);
@@ -671,9 +669,9 @@ private Composite createInputPanel(Composite parent) {
 			if (okToUse(fReplaceField)) {
 				findReplaceLogic.setReplaceString(fReplaceField.getText());
 			}
+			updateButtonState();
 		});
 		fReplaceField.addModifyListener(fReplaceModifyListener);
-		fReplaceField.addModifyListener(listener);
 
 		return panel;
 	}

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

@@ -236,6 +236,8 @@ public void testRegExSearch() {
 	@Test
 	public void testSimpleReplace() {
 		initializeTextViewerWithFindReplaceUI("ABCD ABCD ABCD");
+		dialog.select(SearchOptions.INCREMENTAL);
+
 		dialog.setFindText("ABCD");
 		dialog.setReplaceText("abcd");
 		dialog.performReplace();

tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java

@@ -218,21 +218,29 @@ public Combo getFindCombo() {
 
 	@Override
 	public void performReplaceAll() {
-		replaceAllButton.notifyListeners(SWT.Selection, null);
+		if (replaceAllButton.getEnabled()) {
+			replaceAllButton.notifyListeners(SWT.Selection, null);
+		}
 	}
 
 	@Override
 	public void performReplace() {
-		replaceButton.notifyListeners(SWT.Selection, null);
+		if (replaceButton.getEnabled()) {
+			replaceButton.notifyListeners(SWT.Selection, null);
+		}
 	}
 
 	public void performFindNext() {
-		findNextButton.notifyListeners(SWT.Selection, null);
+		if (findNextButton.getEnabled()) {
+			findNextButton.notifyListeners(SWT.Selection, null);
+		}
 	}
 
 	@Override
 	public void performReplaceAndFind() {
-		replaceFindButton.notifyListeners(SWT.Selection, null);
+		if (replaceFindButton.getEnabled()) {
+			replaceFindButton.notifyListeners(SWT.Selection, null);
+		}
 	}
 
 	@Override