From 9edbe4f0d651b37c8cf0d55dbd8ff8d24e0c2e0a Mon Sep 17 00:00:00 2001 From: ligee Date: Wed, 19 Aug 2015 15:36:26 +0200 Subject: [PATCH] Shutting down daemon from kotlin plugin on idea exit, passing jvm params to daemon launch Original commit: 6e3ce69faa8263eeffd8648a209a956b3b814f55 --- .../kotlin/compilerRunner/KotlinCompilerRunner.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 4921e35768b..25b917c6b6e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -34,6 +34,7 @@ import org.jetbrains.kotlin.config.CompilerSettings; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; import org.jetbrains.kotlin.rmi.CompileService; import org.jetbrains.kotlin.rmi.CompilerId; +import org.jetbrains.kotlin.rmi.DaemonLaunchingOptions; import org.jetbrains.kotlin.rmi.DaemonOptions; import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient; import org.jetbrains.kotlin.utils.UtilsPackage; @@ -136,8 +137,10 @@ public class KotlinCompilerRunner { // the lifetime of JPS process is small anyway, we can neglect the probability of changed compiler CompilerId compilerId = CompilerId.makeCompilerId(new File(libPath, "kotlin-compiler.jar")); DaemonOptions daemonOptions = new DaemonOptions(); + DaemonLaunchingOptions daemonLaunchingOptions = new DaemonLaunchingOptions(); + KotlinCompilerClient.Companion.configureDaemonLaunchingOptions(daemonLaunchingOptions); // TODO: find proper stream to report daemon connection progress - CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonOptions, System.out, true, true); + CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonLaunchingOptions, daemonOptions, System.out, true, true); if (daemon != null) { Integer res = KotlinCompilerClient.Companion.incrementalCompile(daemon, argsArray, incrementalCaches, out); return res.toString();