From 645820bde204c794e0969f72ac31809dd7e03e54 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 21 Mar 2017 18:12:19 +0300 Subject: [PATCH] Kotlin Facet: Fix argument merging #KT-16982 Fixed Original commit: 38f9e99d91280040ed17855c83c457854dcde867 --- .../kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 ac426c7192d..7326e908566 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.compilerRunner +import com.intellij.util.xmlb.XmlSerializerUtil import org.jetbrains.jps.api.GlobalOptions import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY @@ -57,7 +58,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { environment: JpsCompilerEnvironment, moduleFile: File ) { - val arguments = mergeBeans(commonArguments, k2jvmArguments) + val arguments = mergeBeans(commonArguments, XmlSerializerUtil.createCopy(k2jvmArguments)) setupK2JvmArguments(moduleFile, arguments) withCompilerSettings(compilerSettings) { runCompiler(K2JVM_COMPILER, arguments, environment) @@ -76,7 +77,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { log.debug("K2JS: common arguments: " + ArgumentUtils.convertArgumentsToStringList(commonArguments)) log.debug("K2JS: JS arguments: " + ArgumentUtils.convertArgumentsToStringList(k2jsArguments)) - val arguments = mergeBeans(commonArguments, k2jsArguments) + val arguments = mergeBeans(commonArguments, XmlSerializerUtil.createCopy(k2jsArguments)) log.debug("K2JS: merged arguments: " + ArgumentUtils.convertArgumentsToStringList(arguments)) setupK2JsArguments(outputFile, sourceFiles, libraries, arguments)