From 83d64e8eba5ad789c062833543696d804f0f8662 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 17 Feb 2017 14:04:57 +0100
Subject: [PATCH] Don't replace explicitly configured project settings with
 autodetected ones

(cherry picked from commit f16f975)
---
 .../src/org/jetbrains/kotlin/idea/project/Platform.kt     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
index 34656502d45..9181648980f 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
@@ -54,8 +54,12 @@ fun Module.getAndCacheLanguageLevelByDependencies(): LanguageVersion {
     val facetSettings = KotlinFacetSettingsProvider.getInstance(project).getSettings(this)
     if (facetSettings.useProjectSettings) {
         with(KotlinCommonCompilerArgumentsHolder.getInstance(project).settings) {
-            languageVersion = languageLevel.versionString
-            apiVersion = languageLevel.versionString
+            if (languageVersion == null) {
+                languageVersion = languageLevel.versionString
+            }
+            if (apiVersion == null) {
+                apiVersion = languageLevel.versionString
+            }
         }
     }
     else {