From deb9258994eee916904b2fd4db4ffdebd618ff7d Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 26 Jan 2017 14:50:33 +0300
Subject: [PATCH] Misc: Reverted 1fb90ac0fd0af48eff6f25dc904b1df18013ec50 'Copy
 compiler arguments from iml even if "Use project settings" checkbox is
 checked' as it's rendered obsolete due to "Use project settings" being turned
 off by default in Gradle/Maven projects

---
 .../kotlin/jps/JpsKotlinCompilerSettings.kt   | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt
index 568f9599f40..99d006e70af 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt
@@ -65,22 +65,16 @@ class JpsKotlinCompilerSettings : JpsElementBase<JpsKotlinCompilerSettings>() {
         fun getCommonCompilerArguments(module: JpsModule): CommonCompilerArguments {
             val defaultArguments = getSettings(module.project).commonCompilerArguments
             val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments
+            if (facetSettings.useProjectSettings) return defaultArguments
             val (languageLevel, apiLevel) = facetSettings.versionInfo
             val facetArguments = facetSettings.compilerInfo.commonCompilerArguments ?: return defaultArguments
             return copyBean(facetArguments).apply {
-                if (facetSettings.useProjectSettings) {
-                    languageVersion = defaultArguments.languageVersion
-                    apiVersion = defaultArguments.apiVersion
-                    multiPlatform = defaultArguments.multiPlatform
-                }
-                else {
-                    languageVersion = languageLevel?.description
-                    apiVersion = apiLevel?.description
-                    multiPlatform = module
-                            .dependenciesList
-                            .dependencies
-                            .any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Common }
-                }
+                languageVersion = languageLevel?.description
+                apiVersion = apiLevel?.description
+                multiPlatform = module
+                        .dependenciesList
+                        .dependencies
+                        .any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Common }
             }
         }