From 3e3c457326c1ffe6d6faca5ace58d01bdf4967d4 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 9 Nov 2015 15:09:38 +0100 Subject: [PATCH] remove checking for class that no longer exists --- .../versions/KotlinRuntimeLibraryCoreUtil.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) 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 bd771261c8f..951a3df8147 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 @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.idea.versions; -import com.google.common.collect.ImmutableList; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; @@ -29,13 +28,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public class KotlinRuntimeLibraryCoreUtil { - private static final ImmutableList CANDIDATE_CLASSES = ImmutableList.of( - "kotlin.Unit", - - // For older versions - "jet.runtime.Intrinsics" - ); - @Nullable public static PsiClass getKotlinRuntimeMarkerClass(@NotNull final Project project, @NotNull final GlobalSearchScope scope) { return ApplicationManager.getApplication().runReadAction(new Computable() { @@ -45,13 +37,7 @@ public class KotlinRuntimeLibraryCoreUtil { DumbService.getInstance(project).withAlternativeResolveEnabled(new Runnable() { @Override public void run() { - for (String className : CANDIDATE_CLASSES) { - PsiClass psiClass = JavaPsiFacade.getInstance(project).findClass(className, scope); - if (psiClass != null) { - result.set(psiClass); - return; - } - } + result.set(JavaPsiFacade.getInstance(project).findClass("kotlin.Unit", scope)); } });