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

Always analyze KTS with JVM platform

Browse Source 
Issue #KT-29953
This commit is contained in:
Dmitriy Dolovov
2019-07-16 16:58:23 +07:00
parent 80d2e2ac0d
commit 10b79816ab
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
+2 -3
View File
@@ -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.project.TargetPlatformDetector
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
import org.jetbrains.kotlin.platform.DefaultIdeTargetPlatformKindProvider
import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.contains import org.jetbrains.kotlin.psi.psiUtil.contains
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
@@ -109,8 +109,7 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
syntheticFiles: Collection<KtFile> = listOf() syntheticFiles: Collection<KtFile> = listOf()
): ProjectResolutionFacade { ): ProjectResolutionFacade {
val sdk = dependenciesModuleInfo.sdk val sdk = dependenciesModuleInfo.sdk
val platform = /* Fallback to Common platform in CIDR (Java is not supported there) */ val platform = JvmPlatforms.defaultJvmPlatform // TODO: Js scripts?
DefaultIdeTargetPlatformKindProvider.defaultPlatform // TODO: Js scripts?
val settings = PlatformAnalysisSettings( val settings = PlatformAnalysisSettings(
platform, sdk, true, platform, sdk, true,
LanguageFeature.ReleaseCoroutines.defaultState == LanguageFeature.State.ENABLED LanguageFeature.ReleaseCoroutines.defaultState == LanguageFeature.State.ENABLED