From fcd77261d047d78bf9dfae7bd3136b9dabde982b 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

Original commit: 2bb7bdfc3fd776000d021b7a884b78e04a501ca3
---
 .../jetbrains/kotlin/config/facetSerialization.kt   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
index 348190d62cb..eb2b094b2d8 100644
--- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
+++ b/jps/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
         }