From 48af006c089f936af397cbc7af29c60f556b04aa Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 21 Aug 2012 19:41:01 +0400 Subject: [PATCH] Added workaround for CME in IDEA code in tests (to be removed after updating to new IDEA). --- .../jet/plugin/highlighter/JetLineMarkerProvider.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java index 69162b164d6..b97fbc22369 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java @@ -24,6 +24,7 @@ import com.intellij.codeInsight.daemon.LineMarkerProvider; import com.intellij.codeInsight.daemon.impl.MarkerType; import com.intellij.codeInsight.hint.HintUtil; import com.intellij.codeInsight.navigation.NavigationUtil; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; @@ -35,6 +36,7 @@ import com.intellij.psi.util.PsiUtilCore; import com.intellij.ui.awt.RelativePoint; import com.intellij.util.Function; import com.intellij.util.PsiNavigateUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.asJava.JetLightClass; import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; @@ -96,7 +98,10 @@ public class JetLineMarkerProvider implements LineMarkerProvider { }; @Override - public LineMarkerInfo getLineMarkerInfo(final PsiElement element) { + public LineMarkerInfo getLineMarkerInfo(@NotNull final PsiElement element) { + // TODO this is a workaround for CME in external annotations code, should be removed after updating to IDEA 122.145+ (KT-2666) + if (ApplicationManager.getApplication().isUnitTestMode()) return null; + JetFile file = (JetFile)element.getContainingFile(); if (file == null) return null;