From 6b7f0f3c6e683fa0f4667e5cd50fa695bb0ef5e6 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Thu, 7 Jun 2018 11:03:26 +0300 Subject: [PATCH] jps, daemon: pass incremental compilation flag from jps process to daemon Original commit: e831964871e2eab0e7edf95922061043768bb72a --- .../kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index fbcb65c15ba..c9abea53125 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY import org.jetbrains.kotlin.cli.common.arguments.* import org.jetbrains.kotlin.config.CompilerSettings +import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.additionalArgumentsAsList import org.jetbrains.kotlin.daemon.client.CompileServiceSession import org.jetbrains.kotlin.daemon.client.KotlinCompilerClient @@ -318,13 +319,16 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { val toolsJarPath = CompilerRunnerUtil.jdkToolsJar val compilerId = CompilerId.makeCompilerId(listOfNotNull(compilerPath, toolsJarPath)) val daemonOptions = configureDaemonOptions() + val additionalJvmParams = mutableListOf() + + IncrementalCompilation.toJvmArgs(additionalJvmParams) val clientFlagFile = KotlinCompilerClient.getOrCreateClientFlagFile(daemonOptions) val sessionFlagFile = makeAutodeletingFlagFile("compiler-jps-session-", File(daemonOptions.runFilesPathOrDefault)) environment.withProgressReporter { progress -> progress.progress("connecting to daemon") - newDaemonConnection(compilerId, clientFlagFile, sessionFlagFile, environment, daemonOptions) + newDaemonConnection(compilerId, clientFlagFile, sessionFlagFile, environment, daemonOptions, additionalJvmParams.toTypedArray()) } } }