From aeb6af546f66d37abc219c471cacaf5f56fd66fe Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Fri, 13 Jan 2017 19:20:26 +0300
Subject: [PATCH] Kotlin Facet: Switch off "Use project settings" on
 Maven/Gradle import  #KT-15682 Fixed

---
 .../org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt    | 2 +-
 .../idea/configuration/KotlinGradleProjectDataService.kt      | 2 +-
 idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt        | 4 ++--
 .../jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
index cb634b04675..01730ca6871 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
@@ -107,7 +107,7 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_
     private fun configureFacet(mavenProject: MavenProject, modifiableModelsProvider: IdeModifiableModelsProvider, module: Module) {
         val compilerVersion = mavenProject.findPlugin(KotlinMavenConfigurator.GROUP_ID, KotlinMavenConfigurator.MAVEN_PLUGIN_ID)?.version
                               ?: return
-        val kotlinFacet = module.getOrCreateFacet(modifiableModelsProvider)
+        val kotlinFacet = module.getOrCreateFacet(modifiableModelsProvider, false)
         val platform = detectPlatformByExecutions(mavenProject) ?: detectPlatformByLibraries(mavenProject)
 
         kotlinFacet.configureFacet(compilerVersion, CoroutineSupport.DEFAULT, platform, modifiableModelsProvider)
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectDataService.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectDataService.kt
index 537c028cb36..6c62fa0527b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectDataService.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectDataService.kt
@@ -86,7 +86,7 @@ class KotlinGradleProjectDataService : AbstractProjectDataService<GradleSourceSe
 
             val coroutinesProperty = findKotlinCoroutinesProperty(project)
 
-            val kotlinFacet = ideModule.getOrCreateFacet(modelsProvider)
+            val kotlinFacet = ideModule.getOrCreateFacet(modelsProvider, false)
             kotlinFacet.configureFacet(compilerVersion, coroutinesProperty, platformKind, modelsProvider)
             GradleProjectImportHandler.getInstances(project).forEach { it(kotlinFacet, sourceSetNode) }
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
index cac9a9838ad..fe2e7fb6ecf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
@@ -150,14 +150,14 @@ val TargetPlatformKind<*>.mavenLibraryId: String
         is TargetPlatformKind.Common -> MAVEN_COMMON_STDLIB_ID
     }
 
-fun Module.getOrCreateFacet(modelsProvider: IdeModifiableModelsProvider): KotlinFacet {
+fun Module.getOrCreateFacet(modelsProvider: IdeModifiableModelsProvider, useProjectSettings: Boolean): KotlinFacet {
     val facetModel = modelsProvider.getModifiableFacetModel(this)
 
     facetModel.findFacet(KotlinFacetType.TYPE_ID, KotlinFacetType.INSTANCE.defaultFacetName)?.let { return it }
 
     val facet = with(KotlinFacetType.INSTANCE) { createFacet(this@getOrCreateFacet, defaultFacetName, createDefaultConfiguration(), null) }
     facetModel.addFacet(facet)
-    facet.configuration.settings.useProjectSettings = true
+    facet.configuration.settings.useProjectSettings = useProjectSettings
     return facet
 }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt
index beda6eb8868..b425cc1b4ed 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt
@@ -78,7 +78,7 @@ abstract class AbstractMultiModuleTest : DaemonAnalyzerTestCase() {
         val accessToken = WriteAction.start()
         try {
             val modelsProvider = IdeModifiableModelsProviderImpl(project)
-            getOrCreateFacet(modelsProvider)
+            getOrCreateFacet(modelsProvider, true)
             modelsProvider.commit()
         }
         finally {