Kotlin Facet: Fix argument merging

#KT-16982 Fixed
2017-03-21 18:12:19 +03:00
parent 7c7e41592a
commit 38f9e99d91
13 changed files with 88 additions and 4 deletions
@@ -41,7 +41,7 @@ fun <T : Any> copyBean(bean: T) = copyFields(bean, bean::class.java.newInstance(

 fun <From : Any, To : From> mergeBeans(from: From, to: To): To {
    // TODO: rewrite when updated version of com.intellij.util.xmlb is available on TeamCity
-    return copyFields(from, XmlSerializerUtil.createCopy(to), false, collectFieldsToCopy(from::class.java, false))
+    return copyFields(from, to, false, collectFieldsToCopy(from::class.java, false))
 }

 fun <From : Any, To : Any> copyInheritedFields(from: From, to: To) = copyFields(from, to, true, collectFieldsToCopy(from::class.java, true))
@@ -66,8 +66,8 @@ fun KotlinFacetSettings.initializeIfNeeded(
    if (compilerArguments == null) {
        val targetPlatformKind = platformKind ?: getDefaultTargetPlatform(module, rootModel)
        compilerArguments = targetPlatformKind.createCompilerArguments().apply {
-            mergeBeans(commonArguments, this)
            targetPlatformKind.getPlatformCompilerArgumentsByProject(module.project)?.let { mergeBeans(it, this) }
+            mergeBeans(commonArguments, this)
        }
    }

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+    <component name="CompilerConfiguration">
+        <resourceExtensions />
+        <wildcardResourcePatterns>
+            <entry name="!?*.java" />
+            <entry name="!?*.form" />
+            <entry name="!?*.class" />
+            <entry name="!?*.groovy" />
+            <entry name="!?*.scala" />
+            <entry name="!?*.flex" />
+            <entry name="!?*.kt" />
+            <entry name="!?*.clj" />
+            <entry name="!?*.aj" />
+        </wildcardResourcePatterns>
+        <annotationProcessing>
+            <profile default="true" name="Default" enabled="false">
+                <processorPath useClasspath="true" />
+            </profile>
+        </annotationProcessing>
+    </component>
+</project>
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="" />
+</component>
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+    <component name="KotlinCommonCompilerArguments">
+        <option name="languageVersion" value="1.1" />
+        <option name="apiVersion" value="1.1" />
+    </component>
+    <component name="KotlinCompilerSettings">
+        <option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check" />
+    </component>
+</project>
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+    <library name="KotlinJavaRuntime">
+        <CLASSES>
+            <root url="jar://$PROJECT_DIR$/lib/kotlin-runtime.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+        </SOURCES>
+    </library>
+</component>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+    <component name="ProjectModuleManager">
+        <modules>
+            <module fileurl="file://$PROJECT_DIR$/module.iml" filepath="$PROJECT_DIR$/module.iml" />
+        </modules>
+    </component>
+</project>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+  </component>
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JVM 1.8" useProjectSettings="true" />
+      </facet>
+    </component>
+</module>
@@ -78,4 +78,12 @@ class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinTest() {
        Assert.assertEquals("1.0", settings.languageLevel!!.description)
        Assert.assertEquals("1.0", settings.apiLevel!!.description)
    }
+
+    fun testFacetWithProjectSettings() {
+        val settings = KotlinFacetSettingsProvider.getInstance(myProject).getInitializedSettings(module)
+        Assert.assertEquals(true, settings.useProjectSettings)
+        Assert.assertEquals("1.1", settings.languageLevel!!.description)
+        Assert.assertEquals("1.1", settings.apiLevel!!.description)
+        Assert.assertEquals("-version -Xallow-kotlin-package -Xskip-metadata-version-check", settings.compilerSettings!!.additionalArguments)
+    }
 }
@@ -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<JpsCompilerEnvironment>() {
            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<JpsCompilerEnvironment>() {
        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)