Don't replace explicitly configured project settings with autodetected ones

(cherry picked from commit f16f975)
2017-02-17 14:04:57 +01:00
parent 7bae72113b
commit 83d64e8eba
1 changed files with 6 additions and 2 deletions
@@ -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 {