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

Do not use ApplicationExtensionDescriptor in JPS (KT-26542)

Browse Source 
The 'ExtensionPointName' class that ApplicationExtensionDescriptor uses is missing in the JPS classpath.
Now we don't use it unless the IDEA Application is properly initialized.
This commit is contained in:
Yan Zhulanow
2018-09-04 01:59:50 +03:00
parent 0eba87b571
commit 7398a8149d
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jps-common/src/org/jetbrains/kotlin/platform/IdePlatformKind.kt
+9 -10
View File
@@ -27,19 +27,18 @@ abstract class IdePlatformKind<Kind : IdePlatformKind<Kind>> {
override fun equals(other: Any?): Boolean = javaClass == other?.javaClass override fun equals(other: Any?): Boolean = javaClass == other?.javaClass
override fun hashCode(): Int = javaClass.hashCode() override fun hashCode(): Int = javaClass.hashCode()
companion object : ApplicationExtensionDescriptor<IdePlatformKind<*>>( companion object {
"org.jetbrains.kotlin.idePlatformKind", IdePlatformKind::class.java // We can't use the ApplicationExtensionDescriptor class directly because it's missing in the JPS process
) { private val extension = ApplicationManager.getApplication()?.let {
ApplicationExtensionDescriptor("org.jetbrains.kotlin.idePlatformKind", IdePlatformKind::class.java)
}
// For using only in JPS // For using only in JPS
private val JPS_KINDS = listOf(JvmIdePlatformKind, JsIdePlatformKind, CommonIdePlatformKind) private val JPS_KINDS get() = listOf(JvmIdePlatformKind, JsIdePlatformKind, CommonIdePlatformKind)
val ALL_KINDS by lazy { val ALL_KINDS by lazy {
if (ApplicationManager.getApplication() == null) { val kinds = extension?.getInstances() ?: return@lazy JPS_KINDS
return@lazy JPS_KINDS require(kinds.isNotEmpty()) { "Platform kind list is empty" }
}
val kinds = getInstances()
require(kinds.isNotEmpty()) { "Platform list is empty" }
kinds kinds
} }
idea/idea-jvm/src/org/jetbrains/kotlin/idea/facet/FrameworkLibraryValidatorWithDynamicDescription.kt
+1 -1
View File
@@ -70,7 +70,7 @@ class FrameworkLibraryValidatorWithDynamicDescription(
val targetPlatform = getPlatform() val targetPlatform = getPlatform()
if (checkLibraryIsConfigured(targetPlatform)) { if (checkLibraryIsConfigured(targetPlatform)) {
val conflictingPlatforms = IdePlatformKind.getInstances() val conflictingPlatforms = IdePlatformKind.ALL_KINDS
.filter { !it.isCommon && it.name != targetPlatform.name && checkLibraryIsConfigured(it) } .filter { !it.isCommon && it.name != targetPlatform.name && checkLibraryIsConfigured(it) }
if (conflictingPlatforms.isNotEmpty()) { if (conflictingPlatforms.isNotEmpty()) {