From da17449807f14f8d7aaaf29d75c467b03ae1b342 Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Sat, 15 Apr 2017 23:09:19 +0300
Subject: [PATCH] Fix displaying shortcuts for intention actions

Was broken in c776e564701f96c0ba126902daca5fdea8a8acc4
---
 .../intention/impl/IntentionActionWithTextCaching.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java
index ce2976ed221c..68f779060535 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java
@@ -143,7 +143,7 @@ public class IntentionActionWithTextCaching implements Comparable<IntentionActio
   }
 
   // IntentionAction which wraps the original action and then marks it as executed to hide it from the popup to avoid invoking it twice accidentally
-  private class MyIntentionAction implements IntentionAction, IntentionActionDelegate, Comparable<MyIntentionAction> {
+  private class MyIntentionAction implements IntentionAction, IntentionActionDelegate, Comparable<MyIntentionAction>, ShortcutProvider {
     private final IntentionAction myAction;
     private final BiConsumer<IntentionActionWithTextCaching, IntentionAction> myMarkInvoked;
 
@@ -205,6 +205,12 @@ public class IntentionActionWithTextCaching implements Comparable<IntentionActio
       return myAction.getElementToMakeWritable(currentFile);
     }
 
+    @Nullable
+    @Override
+    public ShortcutSet getShortcut() {
+      return myAction instanceof ShortcutProvider ? ((ShortcutProvider)myAction).getShortcut() : null;
+    }
+
     @Override
     public int compareTo(@NotNull final MyIntentionAction other) {
       if (myAction instanceof Comparable) {