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

MPP: Rewrite work-around for JPS in a more safe way

Browse Source
This commit is contained in:
Yan Zhulanow
2018-09-21 18:55:14 +03:00
parent bc27cabb1a
commit ff0b051a64
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jps-common/src/org/jetbrains/kotlin/config/JpsUtils.kt
+3 -7
View File
@@ -5,13 +5,9 @@
package org.jetbrains.kotlin.config package org.jetbrains.kotlin.config
import com.intellij.openapi.application.ApplicationManager private const val IDE_EVENT_QUEUE_CLASS_NAME = "com.intellij.ide.IdeEventQueue"
private const val JPS_STANDALONE_CLASS_NAME = "org.jetbrains.jps.build.Standalone"
val isJps: Boolean by lazy { val isJps: Boolean by lazy {
val jpsStandaloneClassName = JPS_STANDALONE_CLASS_NAME.replace('.', '/') + ".class" val ideEventQueueClassPath = IDE_EVENT_QUEUE_CLASS_NAME.replace('.', '/') + ".class"
{}.javaClass.classLoader.getResource(ideEventQueueClassPath) == null
(object {}.javaClass.classLoader.getResource(jpsStandaloneClassName) != null)
|| ApplicationManager.getApplication() == null
} }