azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added workaround for CME in IDEA code in tests (to be removed after updating to new IDEA).

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-08-21 19:41:01 +04:00
parent af85c99ffd
commit 48af006c08
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
+6 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.codeInsight.daemon.LineMarkerProvider;
import com.intellij.codeInsight.daemon.impl.MarkerType; import com.intellij.codeInsight.daemon.impl.MarkerType;
import com.intellij.codeInsight.hint.HintUtil; import com.intellij.codeInsight.hint.HintUtil;
import com.intellij.codeInsight.navigation.NavigationUtil; import com.intellij.codeInsight.navigation.NavigationUtil;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopup;
import com.intellij.openapi.ui.popup.JBPopupFactory; 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.ui.awt.RelativePoint;
import com.intellij.util.Function; import com.intellij.util.Function;
import com.intellij.util.PsiNavigateUtil; import com.intellij.util.PsiNavigateUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.asJava.JetLightClass; import org.jetbrains.jet.asJava.JetLightClass;
import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
@@ -96,7 +98,10 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
}; };
@Override @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(); JetFile file = (JetFile)element.getContainingFile();
if (file == null) return null; if (file == null) return null;