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

cleanup

Browse Source
This commit is contained in:
Konstantin Bulenkov
2015-05-11 18:12:54 +02:00
parent 63aea4a849
commit d6677139fa
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+6 -4
View File
@@ -486,7 +486,9 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
private void doNavigate(final int index) {
final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(getField().getTextEditor()));
final DataManager dataManager = DataManager.getInstance();
if (dataManager == null) return;
final Project project = CommonDataKeys.PROJECT.getData(dataManager.getDataContext(getField().getTextEditor()));
final Executor executor = ourShiftIsPressed.get()
? DefaultRunExecutor.getRunExecutorInstance()
: ExecutorRegistry.getInstance().getExecutorById(ToolWindowId.DEBUG);
@@ -575,7 +577,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
if (isRunConfiguration(value)) {
((ChooseRunConfigurationPopup.ItemWrapper)value).perform(project, executor, DataManager.getInstance().getDataContext(c));
((ChooseRunConfigurationPopup.ItemWrapper)value).perform(project, executor, dataManager.getDataContext(c));
} else {
GotoActionAction.openOptionOrPerformAction(value, pattern, project, c, event);
if (isToolWindowAction(value)) return;
@@ -1074,7 +1076,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
PsiElement file;
myLocationString = null;
String pattern = "*" + myPopupField.getText();
Matcher matcher = NameUtil.buildMatcher(pattern, 0, true, true, pattern.toLowerCase().equals(pattern));
Matcher matcher = NameUtil.buildMatcher(pattern, 0, true, true);
if (isMoreItem(index)) {
cmp = More.get(isSelected);
} else if (value instanceof VirtualFile
@@ -1281,7 +1283,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
enum WidgetID {CLASSES, FILES, ACTIONS, SETTINGS, SYMBOLS, RUN_CONFIGURATIONS}
@SuppressWarnings("SSBasedInspection")
@SuppressWarnings({"SSBasedInspection", "unchecked"})
private class CalcThread implements Runnable {
private final Project project;
private final String pattern;