From 21572903ae8cb4536985352eaf5419b54d100bf6 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Mon, 24 Apr 2017 17:49:08 +0200
Subject: [PATCH] distinguish intentions from quick fixes in the list when they
 have same text

---
 .../codeInsight/intention/impl/IntentionListStep.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
index 49acc91ccbcb..e06aceef5cec 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
@@ -72,7 +72,15 @@ public class IntentionListStep implements ListPopupStep<IntentionActionWithTextC
 
     @Override
     public boolean equals(final IntentionActionWithTextCaching o1, final IntentionActionWithTextCaching o2) {
-      return o1.getAction().getClass() == o2.getAction().getClass() && o1.getText().equals(o2.getText());
+      return getActionClass(o1) == getActionClass(o2) && o1.getText().equals(o2.getText());
+    }
+
+    private Class<? extends IntentionAction> getActionClass(IntentionActionWithTextCaching o1) {
+      IntentionAction action = o1.getAction();
+      if (action instanceof IntentionActionDelegate) {
+        return ((IntentionActionDelegate)action).getDelegate().getClass();
+      }
+      return action.getClass();
     }
   };
   private Runnable myFinalRunnable;