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

CLion/AppCode: Use default platform for libraries, if no LibraryKind is specified

Browse Source 
To avoid Unknown platform JVM
This commit is contained in:
Simon Ogorodnik
2018-10-22 18:25:26 +03:00
committed by Dmitriy Dolovov
parent 1b9b545643
commit 2b3b5876aa
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt
+3 -3
View File
@@ -57,12 +57,12 @@ object CommonLibraryKind : PersistentLibraryKind<DummyLibraryProperties>("kotlin
val PersistentLibraryKind<*>?.platform: TargetPlatform val PersistentLibraryKind<*>?.platform: TargetPlatform
get() = when (this) { get() = when (this) {
is KotlinLibraryKind -> this.compilerPlatform is KotlinLibraryKind -> this.compilerPlatform
else -> JvmPlatform else -> DefaultIdeTargetPlatformKindProvider.defaultCompilerPlatform
} }
fun getLibraryPlatform(project: Project, library: Library): TargetPlatform { fun getLibraryPlatform(project: Project, library: Library): TargetPlatform {
if (library !is LibraryEx) return JvmPlatform if (library !is LibraryEx) return DefaultIdeTargetPlatformKindProvider.defaultCompilerPlatform
if (library.isDisposed) return JvmPlatform if (library.isDisposed) return DefaultIdeTargetPlatformKindProvider.defaultCompilerPlatform
return library.effectiveKind(project).platform return library.effectiveKind(project).platform
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java
+2 -1
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.platform.DefaultIdeTargetPlatformKindProvider;
import org.jetbrains.kotlin.psi.KtCodeFragment; import org.jetbrains.kotlin.psi.KtCodeFragment;
import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.psi.KtPsiFactoryKt; import org.jetbrains.kotlin.psi.KtPsiFactoryKt;
@@ -62,7 +63,7 @@ public class TargetPlatformDetector {
} }
} }
return JvmPlatform.INSTANCE; return DefaultIdeTargetPlatformKindProvider.Companion.getDefaultCompilerPlatform();
} }
@NotNull @NotNull
idea/idea-jps-common/src/org/jetbrains/kotlin/platform/DefaultIdeTargetPlatformKindProvider.kt
+4
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.platform
import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.components.ServiceManager
import org.jetbrains.kotlin.config.isJps import org.jetbrains.kotlin.config.isJps
import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
import org.jetbrains.kotlin.resolve.TargetPlatform
interface DefaultIdeTargetPlatformKindProvider { interface DefaultIdeTargetPlatformKindProvider {
val defaultPlatform: IdePlatform<*, *> val defaultPlatform: IdePlatform<*, *>
@@ -22,5 +23,8 @@ interface DefaultIdeTargetPlatformKindProvider {
return ServiceManager.getService(DefaultIdeTargetPlatformKindProvider::class.java).defaultPlatform return ServiceManager.getService(DefaultIdeTargetPlatformKindProvider::class.java).defaultPlatform
} }
val defaultCompilerPlatform: TargetPlatform
get() = defaultPlatform.kind.compilerPlatform
} }
} }