From 0ad28228d7d8df241134c8fff462958ba65b84a1 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Fri, 24 Mar 2017 19:21:47 +0300
Subject: [PATCH] Kotlin Facet: Fix settings initialization

---
 .../kotlin/idea/facet/KotlinFacetSettingsProviderImpl.kt   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetSettingsProviderImpl.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetSettingsProviderImpl.kt
index 2a753b3eedc..b46b0d44ca0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetSettingsProviderImpl.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetSettingsProviderImpl.kt
@@ -46,7 +46,12 @@ class KotlinFacetSettingsProviderImpl(private val project: Project) : KotlinFace
     override fun getSettings(module: Module) = KotlinFacet.get(module)?.configuration?.settings
 
     override fun getInitializedSettings(module: Module): KotlinFacetSettings {
-        getSettings(module)?.let { return it }
+        getSettings(module)?.let {
+            it.initializeIfNeeded(module, null)
+            return it
+        }
+
+        module.facetSettingsCache?.let { return it }
 
         return KotlinFacetSettings().apply {
             initializeIfNeeded(module, null)