From 10b79816ab70d89bfb47e323405716cddeb6f3d3 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 16 Jul 2019 16:58:23 +0700 Subject: [PATCH] Always analyze KTS with JVM platform Issue #KT-29953 --- .../kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt index 5be4162fbf0..7177eb2bc8e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt @@ -51,8 +51,8 @@ import org.jetbrains.kotlin.idea.core.script.dependencies.ScriptAdditionalIdeaDe import org.jetbrains.kotlin.idea.project.TargetPlatformDetector import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.idea.util.ProjectRootsUtil -import org.jetbrains.kotlin.platform.DefaultIdeTargetPlatformKindProvider import org.jetbrains.kotlin.platform.TargetPlatform +import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.contains import org.jetbrains.kotlin.resolve.BindingContext @@ -109,8 +109,7 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService { syntheticFiles: Collection = listOf() ): ProjectResolutionFacade { val sdk = dependenciesModuleInfo.sdk - val platform = /* Fallback to Common platform in CIDR (Java is not supported there) */ - DefaultIdeTargetPlatformKindProvider.defaultPlatform // TODO: Js scripts? + val platform = JvmPlatforms.defaultJvmPlatform // TODO: Js scripts? val settings = PlatformAnalysisSettings( platform, sdk, true, LanguageFeature.ReleaseCoroutines.defaultState == LanguageFeature.State.ENABLED