From 46174a8c3212a87c471c0de8d6a552637d34a55a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 24 Mar 2020 15:38:30 +0300 Subject: [PATCH] 201: Apply workaround for IDEA execution in daemon main --- .../src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt index 08f82468bb7..ef70bdaf666 100644 --- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt +++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.cli.common.CLICompiler import org.jetbrains.kotlin.cli.common.environment.setIdeaIoUseFallback import org.jetbrains.kotlin.cli.js.K2JSCompiler import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler +import org.jetbrains.kotlin.cli.jvm.compiler.setupIdeaStandaloneExecution import org.jetbrains.kotlin.cli.metadata.K2MetadataCompiler import org.jetbrains.kotlin.daemon.common.* import java.io.File @@ -112,6 +113,7 @@ abstract class KotlinCompileDaemonBase { log.info("daemon args: " + args.joinToString(" ")) setIdeaIoUseFallback() + setupIdeaStandaloneExecution() val compilerId = CompilerId() val daemonOptions = DaemonOptions()