From 0d2122bb1d6e03239d061244a5c5a9bbe4c7b565 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Wed, 15 Feb 2017 12:26:28 +0300
Subject: [PATCH] Kotlin Facet: Do not rewrite language/API version based on
 compiler arguments if they do not contain explicit language/API version

---
 idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
index 12530acb04f..34494486fbf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
@@ -242,8 +242,8 @@ fun parseCompilerArgumentsToFacet(arguments: List<String>, defaultArguments: Lis
         val restoreCoroutineSupport =
                 !compilerArguments.coroutinesEnable && !compilerArguments.coroutinesWarn && !compilerArguments.coroutinesError
 
-        versionInfo.apiLevel = LanguageVersion.fromVersionString(compilerArguments.apiVersion)
-        versionInfo.languageLevel = LanguageVersion.fromVersionString(compilerArguments.languageVersion)
+        compilerArguments.apiVersion?.let { versionInfo.apiLevel = LanguageVersion.fromVersionString(it) }
+        compilerArguments.languageVersion?.let { versionInfo.languageLevel = LanguageVersion.fromVersionString(it) }
 
         if (versionInfo.targetPlatformKind is TargetPlatformKind.Jvm) {
             val jvmTarget = compilerInfo.k2jvmCompilerArguments!!.jvmTarget