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

Fix compatibility with JPS-standalone (KT-26777)

Browse Source
This commit is contained in:
Yan Zhulanow
2018-09-13 21:56:06 +03:00
parent d5f203a978
commit 373ddcf55d
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jps-common/src/org/jetbrains/kotlin/config/JpsUtils.kt
+17
View File
@@ -0,0 +1,17 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.config
import com.intellij.openapi.application.ApplicationManager
private const val JPS_STANDALONE_CLASS_NAME = "org.jetbrains.jps.build.Standalone"
val isJps: Boolean by lazy {
val jpsStandaloneClassName = JPS_STANDALONE_CLASS_NAME.replace('.', '/') + ".class"
(object {}.javaClass.classLoader.getResource(jpsStandaloneClassName) != null)
|| ApplicationManager.getApplication() == null
}
idea/idea-jps-common/src/org/jetbrains/kotlin/platform/DefaultIdeTargetPlatformKindProvider.kt
+2 -2
View File
@@ -5,8 +5,8 @@
package org.jetbrains.kotlin.platform
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.components.ServiceManager
import org.jetbrains.kotlin.config.isJps
import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
interface DefaultIdeTargetPlatformKindProvider {
@@ -15,7 +15,7 @@ interface DefaultIdeTargetPlatformKindProvider {
companion object {
val defaultPlatform: IdePlatform<*, *>
get() {
if (ApplicationManager.getApplication() == null) {
if (isJps) {
// TODO support passing custom platforms in JPS
return JvmIdePlatformKind.defaultPlatform
}
idea/idea-jps-common/src/org/jetbrains/kotlin/platform/IdePlatformKind.kt
+4 -3
View File
@@ -6,9 +6,9 @@
@file:JvmName("IdePlatformKindUtil")
package org.jetbrains.kotlin.platform
import com.intellij.openapi.application.ApplicationManager
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.extensions.ApplicationExtensionDescriptor
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.config.isJps
import org.jetbrains.kotlin.platform.impl.CommonIdePlatformKind
import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind
import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
@@ -35,7 +35,8 @@ abstract class IdePlatformKind<Kind : IdePlatformKind<Kind>> {
companion object {
// We can't use the ApplicationExtensionDescriptor class directly because it's missing in the JPS process
private val extension = ApplicationManager.getApplication()?.let {
private val extension = run {
if (isJps) return@run null
ApplicationExtensionDescriptor("org.jetbrains.kotlin.idePlatformKind", IdePlatformKind::class.java)
}