From b9753164c9a46c20c355e77fc1e544c71bc4d517 Mon Sep 17 00:00:00 2001
From: Andrey Uskov <Andrey.Uskov@jetbrains.com>
Date: Thu, 1 Nov 2018 17:16:47 +0300
Subject: [PATCH] Fix dependency resolution on model post-processing

#KT-27265 Fixed
---
 .../configure/KotlinAndroidGradleMPPModuleDataService.kt   | 7 ++++++-
 .../KotlinAndroidGradleMPPModuleDataService.kt.181         | 7 ++++++-
 .../KotlinAndroidGradleMPPModuleDataService.kt.as31        | 7 ++++++-
 .../KotlinAndroidGradleMPPModuleDataService.kt.as32        | 7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

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 a77048ef234..4f2dbc97508 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
@@ -68,7 +68,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
             val rootModel = modelsProvider.getModifiableRootModel(module)
-            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
+            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: emptyList()
             for (sourceSetInfo in kotlinAndroidSourceSets) {
                 val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
                 for (sourceSet in compilation.sourceSets) {
@@ -82,6 +82,11 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             }
             addExtraDependeeModules(nodeToImport, projectNode, modelsProvider, rootModel, false)
             addExtraDependeeModules(nodeToImport, projectNode, modelsProvider, rootModel, true)
+
+            if (nodeToImport.kotlinAndroidSourceSets == null) {
+                continue
+            }
+
             val androidModel = getAndroidModuleModel(nodeToImport) ?: continue
             val variantName = androidModel.selectedVariant.name
             val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
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 98cb67258c3..d2231c8586d 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
@@ -68,7 +68,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
             val rootModel = modelsProvider.getModifiableRootModel(module)
-            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
+            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: emptyList()
             for (sourceSetInfo in kotlinAndroidSourceSets) {
                 val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
                 for (sourceSet in compilation.sourceSets) {
@@ -82,6 +82,11 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             }
             addExtraDependeeModules(nodeToImport, projectNode, modelsProvider, rootModel, false)
             addExtraDependeeModules(nodeToImport, projectNode, modelsProvider, rootModel, true)
+
+            if (nodeToImport.kotlinAndroidSourceSets == null) {
+                continue
+            }
+
             val androidModel = getAndroidModuleModel(nodeToImport) ?: continue
             val variantName = androidModel.selectedVariant.name
             val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
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 205b920e0d8..d4ffc1a1185 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
@@ -79,7 +79,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
             val rootModel = modelsProvider.getModifiableRootModel(module)
-            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
+            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: emptyList()
             for (sourceSetInfo in kotlinAndroidSourceSets) {
                 val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
                 for (sourceSet in compilation.sourceSets) {
@@ -93,6 +93,11 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             }
             addExtraDependeeModules(nodeToImport, projectNode, modelsProvider, rootModel, false)
             addExtraDependeeModules(nodeToImport, projectNode, modelsProvider, rootModel, true)
+
+            if (nodeToImport.kotlinAndroidSourceSets == null) {
+                continue
+            }
+
             val androidModel = getAndroidModuleModel(nodeToImport) ?: continue
             val variantName = androidModel.selectedVariant.name
             val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()
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 a77048ef234..4f2dbc97508 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
@@ -68,7 +68,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
             val rootModel = modelsProvider.getModifiableRootModel(module)
-            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
+            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: emptyList()
             for (sourceSetInfo in kotlinAndroidSourceSets) {
                 val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
                 for (sourceSet in compilation.sourceSets) {
@@ -82,6 +82,11 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             }
             addExtraDependeeModules(nodeToImport, projectNode, modelsProvider, rootModel, false)
             addExtraDependeeModules(nodeToImport, projectNode, modelsProvider, rootModel, true)
+
+            if (nodeToImport.kotlinAndroidSourceSets == null) {
+                continue
+            }
+
             val androidModel = getAndroidModuleModel(nodeToImport) ?: continue
             val variantName = androidModel.selectedVariant.name
             val activeSourceSetInfos = nodeToImport.kotlinAndroidSourceSets?.filter { it.kotlinModule.name.startsWith(variantName) } ?: emptyList()