Skip to content

Find/replace overlay: improve expressiveness of IFindReplaceUIAccess #2255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2024
Merged

Find/replace overlay: improve expressiveness of IFindReplaceUIAccess #2255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...kbench.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/FindReplaceUITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ protected void reopenFindReplaceUIForTextViewer() {
protected final void ensureHasFocusOnGTK() {
if (Util.isGtk()) {
runEventQueue();
if (dialog.getActiveShell() == null) {
if (!dialog.hasFocus()) {
String screenshotPath= ScreenshotTest.takeScreenshot(FindReplaceUITest.class, testName.getMethodName(), System.out);
fail("this test does not work on GTK unless the runtime workbench has focus. Screenshot: " + screenshotPath);
}
Expand Down
5 changes: 3 additions & 2 deletions ...nch.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/IFindReplaceUIAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.ui.internal.findandreplace;

import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Widget;

import org.eclipse.jface.text.IFindReplaceTarget;
Expand All @@ -26,6 +25,8 @@ public interface IFindReplaceUIAccess {

void close();

boolean isShown();

void unselect(SearchOptions option);

void select(SearchOptions option);
Expand All @@ -42,7 +43,7 @@ public interface IFindReplaceUIAccess {

void setReplaceText(String text);

Shell getActiveShell();
boolean hasFocus();

Widget getButtonForSearchOption(SearchOptions option);

Expand Down
4 changes: 2 additions & 2 deletions ...itor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertFalse;

import org.junit.Test;

Expand Down Expand Up @@ -174,7 +174,7 @@ public void testDisableOverlayViaPreference() {
boolean useOverlayPreference= preferences.getBoolean(USE_FIND_REPLACE_OVERLAY, true);
try {
preferences.putBoolean(USE_FIND_REPLACE_OVERLAY, false);
assertNull("dialog should be closed after changing preference", getDialog().getActiveShell());
assertFalse("dialog should be closed after changing preference", getDialog().isShown());
} finally {
preferences.putBoolean(USE_FIND_REPLACE_OVERLAY, useOverlayPreference);
reopenFindReplaceUIForTextViewer();
Expand Down
13 changes: 11 additions & 2 deletions ...ch.texteditor.tests/src/org/eclipse/ui/internal/findandreplace/overlay/OverlayAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.ToolItem;
Expand Down Expand Up @@ -321,8 +322,16 @@ public void assertEnabled(SearchOptions option) {
}

@Override
public Shell getActiveShell() {
return shellRetriever.get();
public boolean isShown() {
return shellRetriever.get() != null && shellRetriever.get().isVisible();
}

@Override
public boolean hasFocus() {
Shell overlayShell= shellRetriever.get();
Control focusControl= overlayShell.getDisplay().getFocusControl();
Shell focusControlShell= focusControl != null ? focusControl.getShell() : null;
return focusControlShell == overlayShell;
}

}
9 changes: 7 additions & 2 deletions ...orkbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/DialogAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ public void close() {
}

@Override
public Shell getActiveShell() {
return shellRetriever.get();
public boolean hasFocus() {
return shellRetriever.get() != null;
}

@Override
Expand Down Expand Up @@ -316,4 +316,9 @@ private Set<SearchOptions> getSelectedOptions() {
.collect(Collectors.toSet());
}

@Override
public boolean isShown() {
return shellRetriever.get() != null;
}

}