MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-123444 Item “more…” on Search Everywhere does not work

Browse Source
This commit is contained in:
Konstantin Bulenkov
2014-04-08 12:41:44 +02:00
parent 732de39314
commit 8bb23c3f16
1 changed files with 56 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+56 -37
View File
@@ -167,6 +167,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
private ArrayList<AnAction> myAlreadyAddedActions = new ArrayList<AnAction>();
private volatile ActionCallback myCurrentWorker = ActionCallback.DONE;
private int myHistoryIndex = 0;
boolean mySkipFocusGain = false;
static {
IdeEventQueue.getInstance().addPostprocessor(new IdeEventQueue.EventDispatcher() {
@@ -356,10 +357,19 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
myList.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
e.consume();
final int i = myList.locationToIndex(e.getPoint());
if (i != -1) {
myList.setSelectedIndex(i);
doNavigate(i);
mySkipFocusGain = true;
getField().requestFocus();
//noinspection SSBasedInspection
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
myList.setSelectedIndex(i);
doNavigate(i);
}
});
}
}
});
@@ -431,12 +441,10 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
});
editor.addFocusListener(new FocusAdapter() {
boolean skip = false;
@Override
public void focusGained(FocusEvent e) {
if (skip) {
skip = false;
if (mySkipFocusGain) {
mySkipFocusGain = false;
return;
}
search.setText("");
@@ -467,7 +475,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
return;
}
if (myNonProjectCheckBox == e.getOppositeComponent()) {
skip = true;
mySkipFocusGain = true;
editor.requestFocus();
return;
}
@@ -545,9 +553,15 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
if (actionId != null) {
final AnAction action = ActionManager.getInstance().getAction(actionId);
GotoActionAction.openOptionOrPerformAction(action, getField().getText(), project, getField(), myActionEvent);
if (myPopup != null && myPopup.isVisible()) {
myPopup.cancel();
}
//noinspection SSBasedInspection
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
if (myPopup != null && myPopup.isVisible()) {
myPopup.cancel();
}
}
});
return;
}
}
@@ -1755,33 +1769,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
@Override
public void dispose() {
callback.setDone();
if (myBalloon!= null) {
myBalloon.cancel();
myBalloon = null;
}
myFileModel = null;
if (myFileChooseByName != null) {
myFileChooseByName.close(false);
myFileChooseByName = null;
}
myClassModel = null;
myActionModel = null;
myActions = null;
myFiles = null;
myClasses = null;
mySymbolsModel = null;
mySymbols = null;
myConfigurables.clear();
myFocusComponent = null;
myContextComponent = null;
myFocusOwner = null;
myRenderer.myProject = null;
myCalcThread = null;
myPopup = null;
myHistoryIndex = 0;
myPopupActualWidth = 0;
myCurrentWorker = ActionCallback.DONE;
showAll.set(false);
resetFields();
myNonProjectCheckBox.setSelected(false);
ActionToolbarImpl.updateAllToolbarsImmediately();
if (myActionEvent != null && myActionEvent.getInputEvent() instanceof MouseEvent) {
@@ -1883,6 +1871,37 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
}
protected void resetFields() {
if (myBalloon!= null) {
myBalloon.cancel();
myBalloon = null;
}
myFileModel = null;
if (myFileChooseByName != null) {
myFileChooseByName.close(false);
myFileChooseByName = null;
}
myClassModel = null;
myActionModel = null;
myActions = null;
myFiles = null;
myClasses = null;
mySymbolsModel = null;
mySymbols = null;
myConfigurables.clear();
myFocusComponent = null;
myContextComponent = null;
myFocusOwner = null;
myRenderer.myProject = null;
myCalcThread = null;
myPopup = null;
myHistoryIndex = 0;
myPopupActualWidth = 0;
myCurrentWorker = ActionCallback.DONE;
showAll.set(false);
mySkipFocusGain = false;
}
private void updatePopupBounds() {
if (myPopup == null || !myPopup.isVisible()) {
return;