From ba59369f9d88fcd4cc5c31cd6dccf93e78a6f103 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 22 Aug 2012 20:19:16 +0400 Subject: [PATCH] Added another workaround for CME in IDEA code in tests (to be removed after updating to new IDEA). --- .../jet/plugin/highlighter/JetLineMarkerProvider.java | 5 ++++- 1 file changed, 4 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 b97fbc22369..176a4b3a6a5 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java @@ -233,7 +233,10 @@ public class JetLineMarkerProvider implements LineMarkerProvider { } @Override - public void collectSlowLineMarkers(List elements, Collection result) { + public void collectSlowLineMarkers(@NotNull List elements, @NotNull Collection result) { + // 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; + if (elements.isEmpty() || DumbService.getInstance(elements.get(0).getProject()).isDumb()) { return; }