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

open goto file popup if nothing found in Recent Files

Browse Source
This commit is contained in:
Konstantin Bulenkov
2015-08-25 15:14:28 +02:00
parent 5b6c41cdef
commit 979f80095f
1 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
+46 -6
View File
@@ -16,9 +16,11 @@
package com.intellij.ide.actions;
import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.ide.DataManager;
import com.intellij.ide.IdeEventQueue;
import com.intellij.ide.ui.UISettings;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.impl.PresentationFactory;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.markup.EffectType;
import com.intellij.openapi.editor.markup.TextAttributes;
@@ -89,7 +91,7 @@ public class Switcher extends AnAction implements DumbAware {
public void run() {
synchronized (Switcher.class) {
if (SWITCHER != null) {
SWITCHER.navigate(false);
SWITCHER.navigate(null);
}
}
}
@@ -226,7 +228,7 @@ public class Switcher extends AnAction implements DumbAware {
jList.setSelectedIndex(jList.getAnchorSelectionIndex());
}
if (jList.getSelectedIndex() != -1) {
navigate(false);
navigate(e);
}
}
return true;
@@ -646,7 +648,7 @@ public class Switcher extends AnAction implements DumbAware {
boolean ctrl = e.getKeyCode() == CTRL_KEY;
boolean enter = e.getKeyCode() == VK_ENTER;
if (ctrl && isAutoHide() || enter) {
navigate(e.isShiftDown() && enter);
navigate(e);
}
else if (e.getKeyCode() == VK_LEFT) {
goLeft();
@@ -850,10 +852,15 @@ public class Switcher extends AnAction implements DumbAware {
return files.hasFocus() ? files : toolWindows.hasFocus() ? toolWindows : preferable;
}
void navigate(final boolean openInNewWindow) {
void navigate(final InputEvent e) {
final boolean openInNewWindow = e != null && e.isShiftDown() && e instanceof KeyEvent && ((KeyEvent)e).getKeyCode() == VK_ENTER;
final Object[] values = getSelectedList().getSelectedValues();
final String searchQuery = mySpeedSearch != null ? mySpeedSearch.getEnteredPrefix() : null;
myPopup.cancel(null);
if (values.length > 0 && values[0] instanceof ToolWindow) {
if (values.length == 0) {
tryToOpenFileSearch(e, searchQuery);
}
else if (values[0] instanceof ToolWindow) {
final ToolWindow toolWindow = (ToolWindow)values[0];
IdeFocusManager.getInstance(project).doWhenFocusSettlesDown(new Runnable() {
@Override
@@ -892,6 +899,39 @@ public class Switcher extends AnAction implements DumbAware {
}
}
private void tryToOpenFileSearch(final InputEvent e, final String fileName) {
AnAction gotoFile = ActionManager.getInstance().getAction("GotoFile");
if (gotoFile != null && !StringUtil.isEmpty(fileName)) {
myPopup.cancel();
final AnAction action = gotoFile;
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
DataManager.getInstance().getDataContextFromFocus().doWhenDone(new Consumer<DataContext>() {
@Override
public void consume(@NotNull final DataContext context) {
final DataContext dataContext = new DataContext() {
@Nullable
@Override
public Object getData(@NonNls String dataId) {
if (PlatformDataKeys.PREDEFINED_TEXT.is(dataId)) {
return fileName;
}
return context.getData(dataId);
}
};
final AnActionEvent event =
new AnActionEvent(e, dataContext, ActionPlaces.EDITOR_POPUP, new PresentationFactory().getPresentation(action),
ActionManager.getInstance(), 0);
action.actionPerformed(event);
}
});
}
});
}
}
@Nullable
private static EditorWindow findAppropriateWindow(@NotNull FileInfo info) {
if (info.second == null) return null;
@@ -966,7 +1006,7 @@ public class Switcher extends AnAction implements DumbAware {
protected void processKeyEvent(@NotNull final KeyEvent e) {
final int keyCode = e.getKeyCode();
if (keyCode == VK_ENTER) {
SWITCHER.navigate(e.isShiftDown());
SWITCHER.navigate(e);
e.consume();
return;
}