From 79493985beddd7fe826be42a8f34c3d9a8892424 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Fri, 9 Jun 2017 18:15:24 +0300
Subject: [PATCH] Kotlin Facet: Fix facet existence check during Gradle import

EA-101476 Fixed
---
 .../idea/configuration/KotlinGradleSourceSetDataService.kt  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
index 79458797fbd..96f3c5f7e4a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
@@ -110,7 +110,11 @@ private fun configureFacetByGradleModule(
         modelsProvider: IdeModifiableModelsProvider
 ): KotlinFacet? {
     if (!moduleNode.hasKotlinPlugin) {
-        KotlinFacet.get(ideModule)?.let { modelsProvider.getModifiableFacetModel(ideModule).removeFacet(it) }
+        val facetModel = modelsProvider.getModifiableFacetModel(ideModule)
+        val facet = facetModel.getFacetByType(KotlinFacetType.TYPE_ID)
+        if (facet != null) {
+            facetModel.removeFacet(facet)
+        }
         return null
     }