From d36ee02499a7b3265a23e7ba62c9d8f2b9b48ece Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Wed, 3 Oct 2018 17:46:11 +0300
Subject: [PATCH] Gradle: Retrieve AndroidModuleModel using
 IdeModifiableModelsProvider

Otherwise it may be null if module is just created by the import
---
 .../KotlinAndroidGradleMPPModuleDataService.kt  |  2 +-
 ...tlinAndroidGradleMPPModuleDataService.kt.173 |  2 +-
 ...tlinAndroidGradleMPPModuleDataService.kt.181 |  2 +-
 ...linAndroidGradleMPPModuleDataService.kt.as31 |  2 +-
 ...linAndroidGradleMPPModuleDataService.kt.as32 |  2 +-
 .../kotlin/android/configure/androidUtils.kt    | 17 +++++++++++++++++
 6 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 idea/idea-android/src/org/jetbrains/kotlin/android/configure/androidUtils.kt

diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt
index 4391b64fa05..76a73502b26 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt
@@ -78,7 +78,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
                     }
                 }
             }
-            val androidModel = AndroidModuleModel.get(module) ?: continue
+            val androidModel = module.getAndroidModel(modelsProvider) ?: continue
             val variantName = androidModel.selectedVariant.name
             val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
             for (activeSourceSetInfo in activeSourceSetInfos) {
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.173 b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.173
index 4c17f9e9e5c..e7d6a781ffb 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.173
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.173
@@ -75,7 +75,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
                     }
                 }
             }
-            val androidModel = AndroidModuleModel.get(module) ?: continue
+            val androidModel = module.getAndroidModel(modelsProvider) ?: continue
             val variantName = androidModel.selectedVariant.name
             val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
             for (activeSourceSetInfo in activeSourceSetInfos) {
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.181 b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.181
index 864b8eb4895..2b1f20b4113 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.181
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.181
@@ -78,7 +78,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
                     }
                 }
             }
-            val androidModel = AndroidModuleModel.get(module) ?: continue
+            val androidModel = module.getAndroidModel(modelsProvider) ?: continue
             val variantName = androidModel.selectedVariant.name
             val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
             for (activeSourceSetInfo in activeSourceSetInfos) {
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as31 b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as31
index aeb44084155..06bfa3b4fb4 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as31
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as31
@@ -89,7 +89,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
                     }
                 }
             }
-            val androidModel = AndroidModuleModel.get(module) ?: continue
+            val androidModel = module.getAndroidModel(modelsProvider) ?: continue
             val variantName = androidModel.selectedVariant.name
             val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
             for (activeSourceSetInfo in activeSourceSetInfos) {
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as32 b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as32
index 4391b64fa05..76a73502b26 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as32
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as32
@@ -78,7 +78,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
                     }
                 }
             }
-            val androidModel = AndroidModuleModel.get(module) ?: continue
+            val androidModel = module.getAndroidModel(modelsProvider) ?: continue
             val variantName = androidModel.selectedVariant.name
             val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
             for (activeSourceSetInfo in activeSourceSetInfos) {
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/androidUtils.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/androidUtils.kt
new file mode 100644
index 00000000000..38e1848d615
--- /dev/null
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/androidUtils.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.android.configure
+
+import com.android.tools.idea.gradle.project.model.AndroidModuleModel
+import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider
+import com.intellij.openapi.module.Module
+import org.jetbrains.android.facet.AndroidFacet
+
+fun Module.getAndroidModel(modelsProvider: IdeModifiableModelsProvider? = null): AndroidModuleModel? {
+    if (modelsProvider == null) return AndroidModuleModel.get(this)
+    val androidFacet = modelsProvider.getModifiableFacetModel(this).getFacetByType(AndroidFacet.getFacetType().id) ?: return null
+    return AndroidModuleModel.get(androidFacet)
+}
\ No newline at end of file