From 2bb7bdfc3fd776000d021b7a884b78e04a501ca3 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 16 Mar 2017 02:48:27 +0300
Subject: [PATCH] Kotlin Facet: Fix reading of v1 configuration

Favor language/api version specified in <versionInfo> element
in case it differs from the one in
<option name="_commonCompilerArguments">

#KT-16861 Fixed
---
 .../kotlin/config/facetSerialization.kt       | 13 ++-
 .../.idea/kotlinc.xml                         | 17 ++++
 .../.idea/libraries/KotlinJavaRuntime.xml     | 12 +++
 .../.idea/misc.xml                            | 51 +++++++++++
 .../.idea/modules.xml                         |  8 ++
 .../createdIn106.iml                          | 89 +++++++++++++++++++
 .../src/Test3.kt                              |  3 +
 .../.idea/createdIn107.iml                    | 88 ++++++++++++++++++
 .../.idea/kotlinc.xml                         | 17 ++++
 .../.idea/misc.xml                            | 11 +++
 .../.idea/modules.xml                         |  8 ++
 .../src/Test1.kt                              |  3 +
 .../ConfigureKotlinInTempDirTest.kt           | 15 ++++
 13 files changed, 334 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/configuration/project106InconsistentVersionInConfig/.idea/kotlinc.xml
 create mode 100644 idea/testData/configuration/project106InconsistentVersionInConfig/.idea/libraries/KotlinJavaRuntime.xml
 create mode 100644 idea/testData/configuration/project106InconsistentVersionInConfig/.idea/misc.xml
 create mode 100644 idea/testData/configuration/project106InconsistentVersionInConfig/.idea/modules.xml
 create mode 100644 idea/testData/configuration/project106InconsistentVersionInConfig/createdIn106.iml
 create mode 100644 idea/testData/configuration/project106InconsistentVersionInConfig/src/Test3.kt
 create mode 100644 idea/testData/configuration/project107InconsistentVersionInConfig/.idea/createdIn107.iml
 create mode 100644 idea/testData/configuration/project107InconsistentVersionInConfig/.idea/kotlinc.xml
 create mode 100644 idea/testData/configuration/project107InconsistentVersionInConfig/.idea/misc.xml
 create mode 100644 idea/testData/configuration/project107InconsistentVersionInConfig/.idea/modules.xml
 create mode 100644 idea/testData/configuration/project107InconsistentVersionInConfig/src/Test1.kt

diff --git a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
index 348190d62cb..eb2b094b2d8 100644
--- a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
+++ b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
@@ -33,7 +33,10 @@ private fun readV1Config(element: Element): KotlinFacetSettings {
     return KotlinFacetSettings().apply {
         val useProjectSettings = element.getOptionValue("useProjectSettings")?.toBoolean()
 
-        val targetPlatformName = element.getOptionBody("versionInfo")?.getOptionValue("targetPlatformName")
+        val versionInfoElement = element.getOptionBody("versionInfo")
+        val targetPlatformName = versionInfoElement?.getOptionValue("targetPlatformName")
+        val languageLevel = versionInfoElement?.getOptionValue("languageLevel")
+        val apiLevel = versionInfoElement?.getOptionValue("apiLevel")
         val targetPlatform = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == targetPlatformName }
                              ?: TargetPlatformKind.Jvm[JvmTarget.DEFAULT]
 
@@ -57,6 +60,14 @@ private fun readV1Config(element: Element): KotlinFacetSettings {
             is K2JSCompilerArguments -> jsArgumentsElement?.let { XmlSerializer.deserializeInto(compilerArguments, it) }
         }
 
+        if (languageLevel != null) {
+            compilerArguments.languageVersion = languageLevel
+        }
+
+        if (apiLevel != null) {
+            compilerArguments.apiVersion = apiLevel
+        }
+
         if (useProjectSettings != null) {
             this.useProjectSettings = useProjectSettings
         }
diff --git a/idea/testData/configuration/project106InconsistentVersionInConfig/.idea/kotlinc.xml b/idea/testData/configuration/project106InconsistentVersionInConfig/.idea/kotlinc.xml
new file mode 100644
index 00000000000..a86b0591b70
--- /dev/null
+++ b/idea/testData/configuration/project106InconsistentVersionInConfig/.idea/kotlinc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="sourceMap" value="true" />
+    <option name="moduleKind" value="amd" />
+    <option name="outputPrefix" value="pre_" />
+    <option name="outputPostfix" value="_post" />
+  </component>
+  <component name="KotlinCommonCompilerArguments">
+    <option name="suppressWarnings" value="true" />
+  </component>
+  <component name="KotlinCompilerSettings">
+    <option name="additionalArguments" value="-version -verbose" />
+    <option name="copyJsLibraryFiles" value="false" />
+    <option name="outputDirectoryForJsLibraryFiles" value="libktln" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/idea/testData/configuration/project106InconsistentVersionInConfig/.idea/libraries/KotlinJavaRuntime.xml b/idea/testData/configuration/project106InconsistentVersionInConfig/.idea/libraries/KotlinJavaRuntime.xml
new file mode 100644
index 00000000000..c630c0b8796
--- /dev/null
+++ b/idea/testData/configuration/project106InconsistentVersionInConfig/.idea/libraries/KotlinJavaRuntime.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="KotlinJavaRuntime">
+    <CLASSES>
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime.jar!/" />
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/idea/testData/configuration/project106InconsistentVersionInConfig/.idea/misc.xml b/idea/testData/configuration/project106InconsistentVersionInConfig/.idea/misc.xml
new file mode 100644
index 00000000000..6e95083dfb7
--- /dev/null
+++ b/idea/testData/configuration/project106InconsistentVersionInConfig/.idea/misc.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ClientPropertiesManager">
+    <properties class="javax.swing.AbstractButton">
+      <property name="hideActionText" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JComponent">
+      <property name="html.disable" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JEditorPane">
+      <property name="JEditorPane.w3cLengthUnits" class="java.lang.Boolean" />
+      <property name="JEditorPane.honorDisplayProperties" class="java.lang.Boolean" />
+      <property name="charset" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.JList">
+      <property name="List.isFileList" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JPasswordField">
+      <property name="JPasswordField.cutCopyAllowed" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JSlider">
+      <property name="Slider.paintThumbArrowShape" class="java.lang.Boolean" />
+      <property name="JSlider.isFilled" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTable">
+      <property name="Table.isFileList" class="java.lang.Boolean" />
+      <property name="JTable.autoStartsEdit" class="java.lang.Boolean" />
+      <property name="terminateEditOnFocusLost" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JToolBar">
+      <property name="JToolBar.isRollover" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTree">
+      <property name="JTree.lineStyle" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.text.JTextComponent">
+      <property name="caretAspectRatio" class="java.lang.Double" />
+      <property name="caretWidth" class="java.lang.Integer" />
+    </properties>
+  </component>
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="1.6" />
+  </component>
+  <component name="KotlinCompilerWorkspaceSettings">
+    <option name="enableDaemon" value="false" />
+    <option name="preciseIncrementalEnabled" value="false" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/idea/testData/configuration/project106InconsistentVersionInConfig/.idea/modules.xml b/idea/testData/configuration/project106InconsistentVersionInConfig/.idea/modules.xml
new file mode 100644
index 00000000000..ad383958950
--- /dev/null
+++ b/idea/testData/configuration/project106InconsistentVersionInConfig/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/createdIn106.iml" filepath="$PROJECT_DIR$/createdIn106.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/idea/testData/configuration/project106InconsistentVersionInConfig/createdIn106.iml b/idea/testData/configuration/project106InconsistentVersionInConfig/createdIn106.iml
new file mode 100644
index 00000000000..6f227774ac8
--- /dev/null
+++ b/idea/testData/configuration/project106InconsistentVersionInConfig/createdIn106.iml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="1">
+        <option name="compilerInfo">
+          <KotlinCompilerInfo>
+            <option name="compilerSettings">
+              <CompilerSettings>
+                <option name="additionalArguments" value="-version" />
+                <option name="copyJsLibraryFiles" value="true" />
+                <option name="outputDirectoryForJsLibraryFiles" value="lib" />
+              </CompilerSettings>
+            </option>
+            <option name="k2jsCompilerArguments">
+              <K2JSCompilerArguments>
+                <option name="outputFile" />
+                <option name="noStdlib" value="false" />
+                <option name="libraryFiles" />
+                <option name="sourceMap" value="true" />
+                <option name="metaInfo" value="false" />
+                <option name="kjsm" value="false" />
+                <option name="target" />
+                <option name="moduleKind" value="amd" />
+                <option name="main" />
+                <option name="outputPrefix" value="pre_" />
+                <option name="outputPostfix" value="_post" />
+                <option name="languageVersion" />
+                <option name="apiVersion" />
+                <option name="suppressWarnings" value="false" />
+                <option name="verbose" value="false" />
+                <option name="version" value="false" />
+                <option name="help" value="false" />
+                <option name="extraHelp" value="false" />
+                <option name="noInline" value="false" />
+                <option name="repeat" />
+                <option name="pluginClasspaths" />
+                <option name="pluginOptions" />
+                <option name="freeArgs">
+                  <list />
+                </option>
+                <option name="unknownExtraFlags">
+                  <list />
+                </option>
+              </K2JSCompilerArguments>
+            </option>
+            <option name="_commonCompilerArguments">
+              <DummyImpl>
+                <option name="languageVersion" />
+                <option name="apiVersion" />
+                <option name="suppressWarnings" value="true" />
+                <option name="verbose" value="false" />
+                <option name="version" value="false" />
+                <option name="help" value="false" />
+                <option name="extraHelp" value="false" />
+                <option name="noInline" value="false" />
+                <option name="repeat" />
+                <option name="pluginClasspaths" />
+                <option name="pluginOptions" />
+                <option name="freeArgs">
+                  <list />
+                </option>
+                <option name="unknownExtraFlags">
+                  <list />
+                </option>
+              </DummyImpl>
+            </option>
+          </KotlinCompilerInfo>
+        </option>
+        <option name="versionInfo">
+          <KotlinVersionInfo>
+            <option name="apiLevel" value="1.0" />
+            <option name="languageLevel" value="1.0" />
+            <option name="targetPlatformName" value="JVM 1.6" />
+          </KotlinVersionInfo>
+        </option>
+      </configuration>
+    </facet>
+  </component>
+  <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="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/idea/testData/configuration/project106InconsistentVersionInConfig/src/Test3.kt b/idea/testData/configuration/project106InconsistentVersionInConfig/src/Test3.kt
new file mode 100644
index 00000000000..40e7ac42ed6
--- /dev/null
+++ b/idea/testData/configuration/project106InconsistentVersionInConfig/src/Test3.kt
@@ -0,0 +1,3 @@
+package  test3
+
+class C
diff --git a/idea/testData/configuration/project107InconsistentVersionInConfig/.idea/createdIn107.iml b/idea/testData/configuration/project107InconsistentVersionInConfig/.idea/createdIn107.iml
new file mode 100644
index 00000000000..7277e4b32f6
--- /dev/null
+++ b/idea/testData/configuration/project107InconsistentVersionInConfig/.idea/createdIn107.iml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="1">
+        <option name="compilerInfo">
+          <KotlinCompilerInfo>
+            <option name="compilerSettings">
+              <CompilerSettings>
+                <option name="additionalArguments" value="-version" />
+                <option name="copyJsLibraryFiles" value="true" />
+                <option name="outputDirectoryForJsLibraryFiles" value="lib" />
+              </CompilerSettings>
+            </option>
+            <option name="k2jsCompilerArguments">
+              <K2JSCompilerArguments>
+                <option name="outputFile" />
+                <option name="noStdlib" value="false" />
+                <option name="libraryFiles" />
+                <option name="sourceMap" value="true" />
+                <option name="metaInfo" value="false" />
+                <option name="kjsm" value="false" />
+                <option name="target" />
+                <option name="moduleKind" value="amd" />
+                <option name="main" />
+                <option name="outputPrefix" value="pre_" />
+                <option name="outputPostfix" value="_post" />
+                <option name="languageVersion" />
+                <option name="apiVersion" />
+                <option name="suppressWarnings" value="false" />
+                <option name="verbose" value="false" />
+                <option name="version" value="false" />
+                <option name="help" value="false" />
+                <option name="extraHelp" value="false" />
+                <option name="noInline" value="false" />
+                <option name="repeat" />
+                <option name="pluginClasspaths" />
+                <option name="pluginOptions" />
+                <option name="freeArgs">
+                  <list />
+                </option>
+                <option name="unknownExtraFlags">
+                  <list />
+                </option>
+              </K2JSCompilerArguments>
+            </option>
+            <option name="_commonCompilerArguments">
+              <DummyImpl>
+                <option name="languageVersion" />
+                <option name="apiVersion" />
+                <option name="suppressWarnings" value="true" />
+                <option name="verbose" value="false" />
+                <option name="version" value="false" />
+                <option name="help" value="false" />
+                <option name="extraHelp" value="false" />
+                <option name="noInline" value="false" />
+                <option name="repeat" />
+                <option name="pluginClasspaths" />
+                <option name="pluginOptions" />
+                <option name="freeArgs">
+                  <list />
+                </option>
+                <option name="unknownExtraFlags">
+                  <list />
+                </option>
+              </DummyImpl>
+            </option>
+          </KotlinCompilerInfo>
+        </option>
+        <option name="versionInfo">
+          <KotlinVersionInfo>
+            <option name="apiLevel" value="1.0" />
+            <option name="languageLevel" value="1.0" />
+            <option name="targetPlatformName" value="JVM 1.6" />
+          </KotlinVersionInfo>
+        </option>
+      </configuration>
+    </facet>
+  </component>
+  <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="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/idea/testData/configuration/project107InconsistentVersionInConfig/.idea/kotlinc.xml b/idea/testData/configuration/project107InconsistentVersionInConfig/.idea/kotlinc.xml
new file mode 100644
index 00000000000..a86b0591b70
--- /dev/null
+++ b/idea/testData/configuration/project107InconsistentVersionInConfig/.idea/kotlinc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="sourceMap" value="true" />
+    <option name="moduleKind" value="amd" />
+    <option name="outputPrefix" value="pre_" />
+    <option name="outputPostfix" value="_post" />
+  </component>
+  <component name="KotlinCommonCompilerArguments">
+    <option name="suppressWarnings" value="true" />
+  </component>
+  <component name="KotlinCompilerSettings">
+    <option name="additionalArguments" value="-version -verbose" />
+    <option name="copyJsLibraryFiles" value="false" />
+    <option name="outputDirectoryForJsLibraryFiles" value="libktln" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/idea/testData/configuration/project107InconsistentVersionInConfig/.idea/misc.xml b/idea/testData/configuration/project107InconsistentVersionInConfig/.idea/misc.xml
new file mode 100644
index 00000000000..b7952696cf7
--- /dev/null
+++ b/idea/testData/configuration/project107InconsistentVersionInConfig/.idea/misc.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="1.6" />
+  </component>
+  <component name="KotlinCompilerWorkspaceSettings">
+    <option name="enableDaemon" value="false" />
+    <option name="preciseIncrementalEnabled" value="false" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/idea/testData/configuration/project107InconsistentVersionInConfig/.idea/modules.xml b/idea/testData/configuration/project107InconsistentVersionInConfig/.idea/modules.xml
new file mode 100644
index 00000000000..ff7e548a15f
--- /dev/null
+++ b/idea/testData/configuration/project107InconsistentVersionInConfig/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/createdIn107.iml" filepath="$PROJECT_DIR$/.idea/createdIn107.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/idea/testData/configuration/project107InconsistentVersionInConfig/src/Test1.kt b/idea/testData/configuration/project107InconsistentVersionInConfig/src/Test1.kt
new file mode 100644
index 00000000000..b4978d41654
--- /dev/null
+++ b/idea/testData/configuration/project107InconsistentVersionInConfig/src/Test1.kt
@@ -0,0 +1,3 @@
+package test1
+
+class A
diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
index 3204ac5813c..0971f06066c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.configuration
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.impl.ApplicationImpl
 import com.intellij.openapi.util.io.FileUtil
+import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
 import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.idea.project.getLanguageVersionSettings
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
@@ -62,4 +63,18 @@ class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinTest() {
         Assert.assertEquals(LanguageVersion.KOTLIN_1_1, module.languageVersionSettings.languageVersion)
         Assert.assertTrue(project.baseDir.findFileByRelativePath(".idea/kotlinc.xml") == null)
     }
+
+    fun testProject106InconsistentVersionInConfig() {
+        val settings = KotlinFacetSettingsProvider.getInstance(myProject).getSettings(module)
+        Assert.assertEquals(false, settings.useProjectSettings)
+        Assert.assertEquals("1.0", settings.languageLevel!!.description)
+        Assert.assertEquals("1.0", settings.apiLevel!!.description)
+    }
+
+    fun testProject107InconsistentVersionInConfig() {
+        val settings = KotlinFacetSettingsProvider.getInstance(myProject).getSettings(module)
+        Assert.assertEquals(false, settings.useProjectSettings)
+        Assert.assertEquals("1.0", settings.languageLevel!!.description)
+        Assert.assertEquals("1.0", settings.apiLevel!!.description)
+    }
 }