From c60dab1e96dcfc24badae5fb8f703d2eed4590b1 Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <alexander.zolotov@jetbrains.com>
Date: Fri, 1 Jul 2016 12:36:51 +0300
Subject: [PATCH] Suppressions: do not show host-suppressions available in
 injections only

---
 .../intention/impl/IntentionListStep.java      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

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 c08d7098670f..e1a199dd79b8 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
@@ -196,10 +196,20 @@ public class IntentionListStep implements ListPopupStep<IntentionActionWithTextC
     final List<IntentionAction> options = descriptor.getOptions(element, containingEditor);
     if (options == null) return cachedAction;
     for (IntentionAction option : options) {
-      if (!option.isAvailable(myProject, containingEditor, containingFile)) {
-        // if option is not applicable in injected fragment, check in host file context
-        if (containingEditor == myEditor || !option.isAvailable(myProject, myEditor, myFile)) {
-          continue;
+      if (containingFile != null && containingEditor != null && myEditor != null) {
+        if (!ShowIntentionActionsHandler.availableFor(containingFile, containingEditor, option)) {
+          //if option is not applicable in injected fragment, check in host file context
+          if (containingEditor == myEditor || !ShowIntentionActionsHandler.availableFor(myFile, myEditor, option)) {
+            continue;
+          }
+        }
+      }
+      else {
+        if (!option.isAvailable(myProject, containingEditor, containingFile)) {
+          // if option is not applicable in injected fragment, check in host file context
+          if (containingEditor == myEditor || !option.isAvailable(myProject, myEditor, myFile)) {
+            continue;
+          }
         }
       }
       IntentionActionWithTextCaching textCaching = new IntentionActionWithTextCaching(option);