From cd88209cf41b49ca70a22b6e28ad745692681883 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Thu, 25 Oct 2018 21:23:49 +0300
Subject: [PATCH] Fix Android Extension imports resolution after project
 reopening (KT-27793)

---
 .../configure/KotlinAndroidGradleMPPModuleDataService.kt       | 3 ++-
 .../configure/KotlinAndroidGradleMPPModuleDataService.kt.173   | 3 ++-
 .../configure/KotlinAndroidGradleMPPModuleDataService.kt.181   | 3 ++-
 .../configure/KotlinAndroidGradleMPPModuleDataService.kt.as31  | 3 ++-
 .../configure/KotlinAndroidGradleMPPModuleDataService.kt.as32  | 3 ++-
 5 files changed, 10 insertions(+), 5 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 80e1381ca60..a77048ef234 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,8 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
             val rootModel = modelsProvider.getModifiableRootModel(module)
-            for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
+            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
+            for (sourceSetInfo in kotlinAndroidSourceSets) {
                 val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
                 for (sourceSet in compilation.sourceSets) {
                     if (sourceSet.platform == KotlinPlatform.ANDROID) {
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 e7d6a781ffb..317ef7a6038 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
@@ -64,7 +64,8 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
             val rootModel = modelsProvider.getModifiableRootModel(module)
-            for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
+            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
+            for (sourceSetInfo in kotlinAndroidSourceSets) {
                 val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
                 for (sourceSet in compilation.sourceSets) {
                     if (sourceSet.platform == KotlinPlatform.ANDROID) {
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 c665deeb634..98cb67258c3 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,8 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
             val rootModel = modelsProvider.getModifiableRootModel(module)
-            for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
+            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
+            for (sourceSetInfo in kotlinAndroidSourceSets) {
                 val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
                 for (sourceSet in compilation.sourceSets) {
                     if (sourceSet.platform == KotlinPlatform.ANDROID) {
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 1a44c9f8a10..205b920e0d8 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,8 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
             val rootModel = modelsProvider.getModifiableRootModel(module)
-            for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
+            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
+            for (sourceSetInfo in kotlinAndroidSourceSets) {
                 val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
                 for (sourceSet in compilation.sourceSets) {
                     if (sourceSet.platform == KotlinPlatform.ANDROID) {
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 80e1381ca60..a77048ef234 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,8 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
             val rootModel = modelsProvider.getModifiableRootModel(module)
-            for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
+            val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
+            for (sourceSetInfo in kotlinAndroidSourceSets) {
                 val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
                 for (sourceSet in compilation.sourceSets) {
                     if (sourceSet.platform == KotlinPlatform.ANDROID) {