From 09090497f63eeb97f99f4a0eaf97fd293b8b0c53 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 21 Aug 2015 19:35:02 +0200
Subject: [PATCH] Passing JPS process JVM memory options to daemon, refactoring
 options processing

Original commit: 2d45a37884404f072a5b3aee29fce73596d48abc
---
 .../kotlin/compilerRunner/KotlinCompilerRunner.java  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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 658343708d3..c5460c78d48 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java
@@ -32,10 +32,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector;
 import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil;
 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.*;
 import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
@@ -133,14 +130,13 @@ public class KotlinCompilerRunner {
             String[] argsArray = ArrayUtil.toStringArray(argumentsList);
 
             // trying the daemon first
-            if (incrementalCaches != null && KotlinCompilerClient.Companion.isDaemonEnabled()) {
+            if (incrementalCaches != null && RmiPackage.isDaemonEnabled()) {
                 File libPath = CompilerRunnerUtil.getLibPath(environment.getKotlinPaths(), messageCollector);
                 // TODO: it may be a good idea to cache the compilerId, since making it means calculating digest over jar(s) and if \\
                 //    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);
+                DaemonOptions daemonOptions = RmiPackage.configureDaemonOptions();
+                DaemonLaunchingOptions daemonLaunchingOptions = RmiPackage.configureDaemonLaunchingOptions(true);
                 // TODO: find proper stream to report daemon connection progress
                 CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonLaunchingOptions, daemonOptions, System.out, true, true);
                 if (daemon != null) {