From e27aec1d6ad7ad7712b71deea666b95fd2e83f81 Mon Sep 17 00:00:00 2001
From: Alexey Pegov <alexey.pegov@jetbrains.com>
Date: Wed, 1 Jun 2011 20:16:07 +0400
Subject: [PATCH] fix invalid warning for use-shortcut-of actions (IDEA-70230
 [Cmd]+[W] does not work in Keymap to close current tab)

---
 .../src/com/intellij/openapi/keymap/impl/KeymapImpl.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
index 4b641a6dab8c..04a680c6e65a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
@@ -858,6 +858,11 @@ public class KeymapImpl implements Keymap, ExternalizableScheme {
         continue;
       }
 
+      final String useShortcutOf = myKeymapManager.getActionBinding(id);
+      if (useShortcutOf != null && useShortcutOf.equals(actionId)) {
+        continue;
+      }
+
       Shortcut[] shortcuts = getShortcuts(id);
       for (Shortcut shortcut1 : shortcuts) {
         if (!(shortcut1 instanceof KeyboardShortcut)) {