From b997224f2efa2c7ff2a32b04922b99fc589a9f0f Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Thu, 10 Mar 2016 16:09:07 +0300
Subject: [PATCH] IDEA-152759 Keymap: filter by keystroke doesn't work for
 multi-keystroke shortcuts

---
 .../com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
index f6f39c1fcd08..3deb5359fdb1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
@@ -556,7 +556,7 @@ public class ActionsTreeUtil {
         final Shortcut[] actionShortcuts =
           keymap.getShortcuts(action instanceof ActionStub ? ((ActionStub)action).getId() : actionManager.getId(action));
         for (Shortcut actionShortcut : actionShortcuts) {
-          if (shortcut.equals(actionShortcut)) {
+          if (actionShortcut != null && actionShortcut.startsWith(shortcut)) {
             return true;
           }
         }