From 66074ef1d206cb76e7b0c52b6943762566068ff9 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 15 Jul 2015 16:16:14 +0200 Subject: [PATCH] enable FIle Structure popup in dumb mode (IDEA-142210) --- .../src/com/intellij/ide/actions/ViewStructureAction.java | 4 ++-- .../src/com/intellij/ide/util/FileStructurePopup.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/ViewStructureAction.java b/platform/lang-impl/src/com/intellij/ide/actions/ViewStructureAction.java index b2533d5fad35..3250fab6ec27 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/ViewStructureAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/ViewStructureAction.java @@ -24,12 +24,12 @@ import com.intellij.ide.util.FileStructureDialog; import com.intellij.ide.util.FileStructurePopup; import com.intellij.ide.util.treeView.smartTree.TreeStructureUtil; import com.intellij.openapi.Disposable; -import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileEditor.FileEditor; +import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.registry.Registry; @@ -41,7 +41,7 @@ import com.intellij.ui.PlaceHolder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class ViewStructureAction extends AnAction { +public class ViewStructureAction extends DumbAwareAction { public ViewStructureAction() { setEnabledInModalContext(true); diff --git a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java index 16b9edb5aeb3..9c182ddfd5c7 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java +++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java @@ -48,6 +48,7 @@ import com.intellij.openapi.fileEditor.TextEditor; import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory; import com.intellij.openapi.keymap.KeymapManager; import com.intellij.openapi.keymap.KeymapUtil; +import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.*; import com.intellij.openapi.util.*; @@ -549,7 +550,7 @@ public class FileStructurePopup implements Disposable, TreeActionsOwner { final Shortcut[] F4 = ActionManager.getInstance().getAction(IdeActions.ACTION_EDIT_SOURCE).getShortcutSet().getShortcuts(); final Shortcut[] ENTER = CustomShortcutSet.fromString("ENTER").getShortcuts(); final CustomShortcutSet shortcutSet = new CustomShortcutSet(ArrayUtil.mergeArrays(F4, ENTER)); - new AnAction() { + new DumbAwareAction() { @Override public void actionPerformed(AnActionEvent e) { final boolean succeeded = navigateSelectedElement(); @@ -559,7 +560,7 @@ public class FileStructurePopup implements Disposable, TreeActionsOwner { } }.registerCustomShortcutSet(shortcutSet, panel); - new AnAction() { + new DumbAwareAction() { @Override public void actionPerformed(AnActionEvent e) { if (mySpeedSearch != null && mySpeedSearch.isPopupActive()) { @@ -838,7 +839,7 @@ public class FileStructurePopup implements Disposable, TreeActionsOwner { if (shortcuts.length > 0) { text += " (" + KeymapUtil.getShortcutText(shortcuts[0]) + ")"; - new AnAction() { + new DumbAwareAction() { @Override public void actionPerformed(final AnActionEvent e) { chkFilter.doClick();