Remove reflective access from find/replace tests #2060 #2333
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 Vector Informatik GmbH and others. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Vector Informatik GmbH - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.ui.internal.findandreplace; | ||
HeikoKlare marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| import static org.junit.Assert.assertFalse; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import org.eclipse.swt.widgets.Button; | ||
| import org.eclipse.swt.widgets.Combo; | ||
| import org.eclipse.swt.widgets.Composite; | ||
| import org.eclipse.swt.widgets.ToolBar; | ||
| import org.eclipse.swt.widgets.ToolItem; | ||
| import org.eclipse.swt.widgets.Widget; | ||
|
|
||
| import org.eclipse.ui.internal.findandreplace.overlay.HistoryTextWrapper; | ||
|
|
||
| public final class WidgetExtractor { | ||
|
|
||
| private final Composite rootContainer; | ||
|
|
||
| private final String idDataKey; | ||
|
|
||
| public WidgetExtractor(String idDataKey, Composite container) { | ||
| this.idDataKey= idDataKey; | ||
| this.rootContainer= container; | ||
| } | ||
|
|
||
| public HistoryTextWrapper findHistoryTextWrapper(String id) { | ||
| return findWidget(rootContainer, HistoryTextWrapper.class, id); | ||
| } | ||
|
|
||
| public Combo findCombo(String id) { | ||
| return findWidget(rootContainer, Combo.class, id); | ||
| } | ||
|
|
||
| public Button findButton(String id) { | ||
| return findWidget(rootContainer, Button.class, id); | ||
| } | ||
|
|
||
| public ToolItem findToolItem(String id) { | ||
| return findWidget(rootContainer, ToolItem.class, id); | ||
| } | ||
|
|
||
| private <T extends Widget> T findWidget(Composite container, Class<T> type, String id) { | ||
| List<T> widgets= findWidgets(container, type, id); | ||
| assertFalse("more than one matching widget found for id '" + id + "':" + widgets, widgets.size() > 1); | ||
| return widgets.isEmpty() ? null : widgets.get(0); | ||
| } | ||
|
|
||
| private <T extends Widget> List<T> findWidgets(Composite container, Class<T> type, String id) { | ||
| List<Widget> children= new ArrayList<>(); | ||
| children.addAll(List.of(container.getChildren())); | ||
| if (container instanceof ToolBar toolbar) { | ||
| children.addAll(List.of(toolbar.getItems())); | ||
| } | ||
| List<T> result= new ArrayList<>(); | ||
| for (Widget child : children) { | ||
| if (type.isInstance(child)) { | ||
| if (id.equals(child.getData(idDataKey))) { | ||
| result.add(type.cast(child)); | ||
| } | ||
| } | ||
| if (child instanceof Composite compositeChild) { | ||
| result.addAll(findWidgets(compositeChild, type, id)); | ||
| } | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,6 @@ | |
| import java.util.Objects; | ||
| import java.util.Set; | ||
| import java.util.function.Predicate; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import org.eclipse.swt.SWT; | ||
|
|
@@ -31,13 +30,12 @@ | |
| import org.eclipse.swt.widgets.Shell; | ||
| import org.eclipse.swt.widgets.ToolItem; | ||
|
|
||
| import org.eclipse.jface.text.IFindReplaceTarget; | ||
| import org.eclipse.jface.text.IFindReplaceTargetExtension; | ||
|
|
||
| import org.eclipse.ui.internal.findandreplace.IFindReplaceUIAccess; | ||
| import org.eclipse.ui.internal.findandreplace.SearchOptions; | ||
| import org.eclipse.ui.internal.findandreplace.WidgetExtractor; | ||
|
|
||
| class OverlayAccess implements IFindReplaceUIAccess { | ||
| private final IFindReplaceTarget findReplaceTarget; | ||
|
|
@@ -64,28 +62,33 @@ class OverlayAccess implements IFindReplaceUIAccess { | |
|
|
||
| private ToolItem replaceAllButton; | ||
|
|
||
| private final FindReplaceOverlay overlay; | ||
|
|
||
| private final Shell shell; | ||
|
|
||
| OverlayAccess(IFindReplaceTarget findReplaceTarget, FindReplaceOverlay findReplaceOverlay) { | ||
| this.findReplaceTarget= findReplaceTarget; | ||
| overlay= findReplaceOverlay; | ||
| shell= overlay.getShell(); | ||
| WidgetExtractor widgetExtractor= new WidgetExtractor(FindReplaceOverlay.ID_DATA_KEY, shell); | ||
| find= widgetExtractor.findHistoryTextWrapper("searchInput"); | ||
| caseSensitive= widgetExtractor.findToolItem("caseSensitiveSearch"); | ||
| wholeWord= widgetExtractor.findToolItem("wholeWordSearch"); | ||
| regEx= widgetExtractor.findToolItem("regExSearch"); | ||
| inSelection= widgetExtractor.findToolItem("searchInSelection"); | ||
| searchForward= widgetExtractor.findToolItem("searchForward"); | ||
| searchBackward= widgetExtractor.findToolItem("searchBackward"); | ||
| openReplaceDialog= widgetExtractor.findButton("replaceToggle"); | ||
| extractReplaceWidgets(); | ||
| } | ||
|
|
||
| private void extractReplaceWidgets() { | ||
| if (!isReplaceDialogOpen() && Objects.nonNull(openReplaceDialog)) { | ||
| WidgetExtractor widgetExtractor= new WidgetExtractor(FindReplaceOverlay.ID_DATA_KEY, shell); | ||
| replace= widgetExtractor.findHistoryTextWrapper("replaceInput"); | ||
| replaceButton= widgetExtractor.findToolItem("replaceOne"); | ||
| replaceAllButton= widgetExtractor.findToolItem("replaceAll"); | ||
| } | ||
| } | ||
|
|
||
| private void restoreInitialConfiguration() { | ||
|
|
@@ -100,12 +103,12 @@ private void restoreInitialConfiguration() { | |
| public void closeAndRestore() { | ||
| restoreInitialConfiguration(); | ||
| assertInitialConfiguration(); | ||
| overlay.close(); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
| overlay.close(); | ||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -234,15 +237,13 @@ public void performReplace() { | |
| } | ||
|
|
||
| public boolean isReplaceDialogOpen() { | ||
| return replace != null; | ||
| } | ||
|
|
||
| public void openReplaceDialog() { | ||
| if (!isReplaceDialogOpen() && Objects.nonNull(openReplaceDialog)) { | ||
| openReplaceDialog.notifyListeners(SWT.Selection, null); | ||
| extractReplaceWidgets(); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -309,15 +310,14 @@ public void assertEnabled(SearchOptions option) { | |
|
|
||
| @Override | ||
| public boolean isShown() { | ||
| return !shell.isDisposed() && shell.isVisible(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasFocus() { | ||
| Control focusControl= shell.getDisplay().getFocusControl(); | ||
| Shell focusControlShell= focusControl != null ? focusControl.getShell() : null; | ||
| return focusControlShell == shell; | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.