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

GotoActionModel: do not provide intentions in dumb mode (EA-141542)

Browse Source
This commit is contained in:
Tagir Valeev
2019-04-17 14:47:11 +07:00
parent 4a249e6de6
commit 11da23397d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
+5 -7
View File
@@ -35,6 +35,7 @@ import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressIndicatorProvider;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.text.StringUtil;
@@ -113,18 +114,15 @@ public class GotoActionModel implements ChooseByNameModel, Comparator<Object>, D
Map<AnAction, GroupMapping> keymapActionGroups = new HashMap<>();
collectActions(keymapActionGroups, keymapOthers, emptyList(), true);
for (AnAction action : keymapActionGroups.keySet()) {
// Let menu groups have priority over keymap (and do not introduce ambiguity)
if (!myActionGroups.containsKey(action)) {
myActionGroups.put(action, keymapActionGroups.get(action));
}
}
// Let menu groups have priority over keymap (and do not introduce ambiguity)
keymapActionGroups.forEach(myActionGroups::putIfAbsent);
}
@NotNull
Map<String, ApplyIntentionAction> getAvailableIntentions() {
Map<String, ApplyIntentionAction> map = new TreeMap<>();
if (myProject != null && !myProject.isDisposed() && myEditor != null && !myEditor.isDisposed()) {
if (myProject != null && !myProject.isDisposed() && !DumbService.isDumb(myProject) &&
myEditor != null && !myEditor.isDisposed()) {
PsiFile file = PsiDocumentManager.getInstance(myProject).getPsiFile(myEditor.getDocument());
ApplyIntentionAction[] children = file == null ? null : ApplyIntentionAction.getAvailableIntentions(myEditor, file);
if (children != null) {