From 95f5d24988a43d62c0da1ebc0eeb396dc5b321b4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 10 Jul 2015 18:39:15 +0300 Subject: [PATCH] Use a built-in marker class for Configure Kotlin action This helps to get rid of the balloon which was shown in Kotlin project itself because of the recent change where a source root was added to the module 'builtins', which doesn't have the class kotlin.jvm.internal.Intrinsics (the 'runtime.jvm' module does) --- .../kotlin/idea/versions/KotlinRuntimeLibraryCoreUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryCoreUtil.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryCoreUtil.java index e3389f3c152..f4e7472e19e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryCoreUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryCoreUtil.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; public class KotlinRuntimeLibraryCoreUtil { private static final ImmutableList CANDIDATE_CLASSES = ImmutableList.of( - "kotlin.jvm.internal.Intrinsics", + "kotlin.Unit", // For older versions "jet.runtime.Intrinsics"