From ff0b051a643cfda707b05f2806efafa40f8a0b9c Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 21 Sep 2018 18:55:14 +0300 Subject: [PATCH] MPP: Rewrite work-around for JPS in a more safe way --- .../src/org/jetbrains/kotlin/config/JpsUtils.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/JpsUtils.kt b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/JpsUtils.kt index 240a38a844b..8e2d2e3c31b 100644 --- a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/JpsUtils.kt +++ b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/JpsUtils.kt @@ -5,13 +5,9 @@ package org.jetbrains.kotlin.config -import com.intellij.openapi.application.ApplicationManager - -private const val JPS_STANDALONE_CLASS_NAME = "org.jetbrains.jps.build.Standalone" +private const val IDE_EVENT_QUEUE_CLASS_NAME = "com.intellij.ide.IdeEventQueue" val isJps: Boolean by lazy { - val jpsStandaloneClassName = JPS_STANDALONE_CLASS_NAME.replace('.', '/') + ".class" - - (object {}.javaClass.classLoader.getResource(jpsStandaloneClassName) != null) - || ApplicationManager.getApplication() == null + val ideEventQueueClassPath = IDE_EVENT_QUEUE_CLASS_NAME.replace('.', '/') + ".class" + {}.javaClass.classLoader.getResource(ideEventQueueClassPath) == null } \ No newline at end of file