From 70a730b1c49976ad0abb0a2eb48a6d01c8ed2f05 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Tue, 18 Aug 2020 13:49:11 +0300 Subject: [PATCH] IDEA-204581 Shortcut conflict for Ctrl+F5 in Find view GitOrigin-RevId: 775d2a3c64be1f1aaf58dc684c78ddb55be745ad --- .../src/com/intellij/usages/impl/UsageViewActionPromoter.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewActionPromoter.kt b/platform/usageView/src/com/intellij/usages/impl/UsageViewActionPromoter.kt index b48a0f87e8c7..80c7a6b103b9 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewActionPromoter.kt +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewActionPromoter.kt @@ -5,6 +5,8 @@ import com.intellij.openapi.actionSystem.ActionPromoter import com.intellij.openapi.actionSystem.AnAction import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext +import com.intellij.usages.UsageView +import com.intellij.usages.actions.RerunSearchAction import com.intellij.usages.impl.actions.RuleAction class UsageViewActionPromoter : ActionPromoter { @@ -13,6 +15,9 @@ class UsageViewActionPromoter : ActionPromoter { if (CommonDataKeys.EDITOR.getData(context) != null) { return actions.filter { it !is RuleAction } } + if (UsageView.USAGE_VIEW_KEY.getData(context) != null) { + return actions.filterIsInstance() + } return actions.filterIsInstance() } } \ No newline at end of file