From 5dbc04fd672429690e759946bce9bd2bc5da38a9 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 19 Sep 2011 15:47:52 +0400
Subject: [PATCH] assert edt thread fixed

---
 .../com/intellij/codeInsight/daemon/impl/HighlightInfo.java | 6 ++----
 .../codeInsight/intention/impl/IntentionListStep.java       | 2 +-
 .../fixtures/impl/CodeInsightTestFixtureImpl.java           | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
index 4e0380cf0764..8882809da898 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
@@ -47,7 +47,6 @@ import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.source.SourceTreeToPsiMap;
-import com.intellij.psi.util.PsiUtilBase;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.xml.util.XmlStringUtil;
@@ -163,7 +162,7 @@ public class HighlightInfo implements Segment {
                                                   String toolTip,
                                                   boolean isEndOfLine,
                                                   TextAttributes forcedAttributes) {
-    LOG.assertTrue(ArrayUtil.find(HighlightSeverity.DEFAULT_SEVERITIES, type.getSeverity(element)) != -1 || element != null, "Custom type demands element to detect text attributes");
+    LOG.assertTrue(element != null || ArrayUtil.find(HighlightSeverity.DEFAULT_SEVERITIES, type.getSeverity(element)) != -1, "Custom type demands element to detect its text attributes");
     HighlightInfo highlightInfo = new HighlightInfo(forcedAttributes, type, start, end, description, toolTip, type.getSeverity(element), isEndOfLine, null, false);
     PsiFile file = element == null ? null : element.getContainingFile();
     for (HighlightInfoFilter filter : getFilters()) {
@@ -474,8 +473,7 @@ public class HighlightInfo implements Segment {
     }
 
     @Nullable
-    public List<IntentionAction> getOptions(@NotNull PsiElement element) {
-      Editor editor = PsiUtilBase.findEditor(element);
+    public List<IntentionAction> getOptions(@NotNull PsiElement element, @Nullable Editor editor) {
       if (editor != null && Boolean.FALSE.equals(editor.getUserData(IntentionManager.SHOW_INTENTION_OPTIONS_KEY))) {
         return null;
       }
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 84ecf5006e9b..1d8e353877e7 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
@@ -165,7 +165,7 @@ class IntentionListStep implements ListPopupStep<IntentionActionWithTextCaching>
                                             @NotNull PsiFile containingFile,
                                             @NotNull Editor containingEditor) {
     IntentionActionWithTextCaching cachedAction = new IntentionActionWithTextCaching(descriptor);
-    final List<IntentionAction> options = descriptor.getOptions(element);
+    final List<IntentionAction> options = descriptor.getOptions(element, containingEditor);
     if (options == null) return cachedAction;
     for (IntentionAction option : options) {
       if (!option.isAvailable(myProject, containingEditor, containingFile)) {
diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
index bc56225cf18f..974b3383400d 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
@@ -1464,7 +1464,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
     // add all intention options for simplicity
     for (HighlightInfo.IntentionActionDescriptor descriptor : descriptors) {
       result.add(descriptor.getAction());
-      List<IntentionAction> options = descriptor.getOptions(element);
+      List<IntentionAction> options = descriptor.getOptions(element,editor);
       if (options != null) {
         for (IntentionAction option : options) {
           if (option.isAvailable(file.getProject(), editor, file)) {