From 4f01a438c46f9b23be883575103948b707fe129e Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 20 Sep 2018 18:54:08 +0300
Subject: [PATCH] MPP: Add all android-targeted compilation source roots to the
 module

---
 ...KotlinAndroidGradleMPPModuleDataService.kt | 31 +++++++++++--------
 ...inAndroidGradleMPPModuleDataService.kt.173 | 31 +++++++++++--------
 ...inAndroidGradleMPPModuleDataService.kt.181 | 31 +++++++++++--------
 ...nAndroidGradleMPPModuleDataService.kt.as31 | 31 +++++++++++--------
 ...nAndroidGradleMPPModuleDataService.kt.as32 | 31 +++++++++++--------
 5 files changed, 90 insertions(+), 65 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 a5e88fda92f..ad4ba982e00 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
@@ -63,19 +63,25 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val moduleData = nodeToImport.data
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
+            val rootModel = modelsProvider.getModifiableRootModel(module)
+            for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
+                val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+                for (sourceSet in compilation.sourceSets) {
+                    if (sourceSet.platform == KotlinPlatform.ANDROID) {
+                        val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
+                        val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
+                        sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
+                        sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
+                    }
+                }
+            }
             val androidModel = AndroidModuleModel.get(module) ?: continue
             val variantName = androidModel.selectedVariant.name
-            val sourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
-            val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
-            val rootModel = modelsProvider.getModifiableRootModel(module)
-            for (sourceSet in compilation.sourceSets) {
-                if (sourceSet.platform == KotlinPlatform.ANDROID) {
-                    val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
-                    val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
-                    sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
-                    sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
-                } else {
-                    val sourceSetId = sourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
+            val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
+            val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+            for (sourceSet in mainCompilation.sourceSets) {
+                if (sourceSet.platform != KotlinPlatform.ANDROID) {
+                    val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
                     val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
                         (it.data as? ModuleData)?.id == sourceSetId
                     }?.data as? ModuleData ?: continue
@@ -83,8 +89,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
                     rootModel.addModuleOrderEntry(sourceSetModule)
                 }
             }
-
-            KotlinSourceSetDataService.configureFacet(moduleData, sourceSetInfo, nodeToImport, module, modelsProvider)
+            KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
 
             val kotlinFacet = KotlinFacet.get(module)
             if (kotlinFacet != null) {
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 6bc64536baa..27ce9a89b49 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
@@ -62,19 +62,25 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val moduleData = nodeToImport.data
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
+            val rootModel = modelsProvider.getModifiableRootModel(module)
+            for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
+                val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+                for (sourceSet in compilation.sourceSets) {
+                    if (sourceSet.platform == KotlinPlatform.ANDROID) {
+                        val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
+                        val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
+                        sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
+                        sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
+                    }
+                }
+            }
             val androidModel = AndroidModuleModel.get(module) ?: continue
             val variantName = androidModel.selectedVariant.name
-            val sourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
-            val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
-            val rootModel = modelsProvider.getModifiableRootModel(module)
-            for (sourceSet in compilation.sourceSets) {
-                if (sourceSet.platform == KotlinPlatform.ANDROID) {
-                    val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
-                    val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
-                    sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
-                    sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
-                } else {
-                    val sourceSetId = sourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
+            val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
+            val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+            for (sourceSet in mainCompilation.sourceSets) {
+                if (sourceSet.platform != KotlinPlatform.ANDROID) {
+                    val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
                     val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
                         (it.data as? ModuleData)?.id == sourceSetId
                     }?.data as? ModuleData ?: continue
@@ -82,8 +88,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
                     rootModel.addModuleOrderEntry(sourceSetModule)
                 }
             }
-
-            KotlinSourceSetDataService.configureFacet(moduleData, sourceSetInfo, nodeToImport, module, modelsProvider)
+            KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
 
             val kotlinFacet = KotlinFacet.get(module)
             if (kotlinFacet != null) {
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 5a9ae3abb36..a079e127dc9 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
@@ -63,19 +63,25 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val moduleData = nodeToImport.data
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
+            val rootModel = modelsProvider.getModifiableRootModel(module)
+            for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
+                val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+                for (sourceSet in compilation.sourceSets) {
+                    if (sourceSet.platform == KotlinPlatform.ANDROID) {
+                        val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
+                        val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
+                        sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
+                        sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
+                    }
+                }
+            }
             val androidModel = AndroidModuleModel.get(module) ?: continue
             val variantName = androidModel.selectedVariant.name
-            val sourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
-            val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
-            val rootModel = modelsProvider.getModifiableRootModel(module)
-            for (sourceSet in compilation.sourceSets) {
-                if (sourceSet.platform == KotlinPlatform.ANDROID) {
-                    val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
-                    val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
-                    sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
-                    sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
-                } else {
-                    val sourceSetId = sourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
+            val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
+            val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+            for (sourceSet in mainCompilation.sourceSets) {
+                if (sourceSet.platform != KotlinPlatform.ANDROID) {
+                    val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
                     val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
                         (it.data as? ModuleData)?.id == sourceSetId
                     }?.data as? ModuleData ?: continue
@@ -83,8 +89,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
                     rootModel.addModuleOrderEntry(sourceSetModule)
                 }
             }
-
-            KotlinSourceSetDataService.configureFacet(moduleData, sourceSetInfo, nodeToImport, module, modelsProvider)
+            KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
 
             val kotlinFacet = KotlinFacet.get(module)
             if (kotlinFacet != null) {
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 4a319a8f140..016857f15f3 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
@@ -76,19 +76,25 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val moduleData = nodeToImport.data
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
+            val rootModel = modelsProvider.getModifiableRootModel(module)
+            for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
+                val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+                for (sourceSet in compilation.sourceSets) {
+                    if (sourceSet.platform == KotlinPlatform.ANDROID) {
+                        val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
+                        val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
+                        sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
+                        sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
+                    }
+                }
+            }
             val androidModel = AndroidModuleModel.get(module) ?: continue
             val variantName = androidModel.selectedVariant.name
-            val sourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
-            val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
-            val rootModel = modelsProvider.getModifiableRootModel(module)
-            for (sourceSet in compilation.sourceSets) {
-                if (sourceSet.platform == KotlinPlatform.ANDROID) {
-                    val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
-                    val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
-                    sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
-                    sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
-                } else {
-                    val sourceSetId = sourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
+            val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
+            val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+            for (sourceSet in mainCompilation.sourceSets) {
+                if (sourceSet.platform != KotlinPlatform.ANDROID) {
+                    val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
                     val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
                         (it.data as? ModuleData)?.id == sourceSetId
                     }?.data as? ModuleData ?: continue
@@ -96,8 +102,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
                     rootModel.addModuleOrderEntry(sourceSetModule)
                 }
             }
-
-            KotlinSourceSetDataService.configureFacet(moduleData, sourceSetInfo, nodeToImport, module, modelsProvider)
+            KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
 
             val kotlinFacet = KotlinFacet.get(module)
             if (kotlinFacet != null) {
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 a5e88fda92f..ad4ba982e00 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
@@ -63,19 +63,25 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
             val moduleData = nodeToImport.data
             val module = modelsProvider.findIdeModule(moduleData) ?: continue
             val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
+            val rootModel = modelsProvider.getModifiableRootModel(module)
+            for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
+                val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+                for (sourceSet in compilation.sourceSets) {
+                    if (sourceSet.platform == KotlinPlatform.ANDROID) {
+                        val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
+                        val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
+                        sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
+                        sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
+                    }
+                }
+            }
             val androidModel = AndroidModuleModel.get(module) ?: continue
             val variantName = androidModel.selectedVariant.name
-            val sourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
-            val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
-            val rootModel = modelsProvider.getModifiableRootModel(module)
-            for (sourceSet in compilation.sourceSets) {
-                if (sourceSet.platform == KotlinPlatform.ANDROID) {
-                    val sourceType = if (sourceSet.isTestModule) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
-                    val resourceType = if (sourceSet.isTestModule) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
-                    sourceSet.sourceDirs.forEach { addSourceRoot(it, sourceType, rootModel, shouldCreateEmptySourceRoots) }
-                    sourceSet.resourceDirs.forEach { addSourceRoot(it, resourceType, rootModel, shouldCreateEmptySourceRoots) }
-                } else {
-                    val sourceSetId = sourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
+            val mainSourceSetInfo = nodeToImport.kotlinAndroidSourceSets?.firstOrNull { it.kotlinModule.name == variantName } ?: continue
+            val mainCompilation = mainSourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
+            for (sourceSet in mainCompilation.sourceSets) {
+                if (sourceSet.platform != KotlinPlatform.ANDROID) {
+                    val sourceSetId = mainSourceSetInfo.sourceSetIdsByName[sourceSet.name] ?: continue
                     val sourceSetData = ExternalSystemApiUtil.findFirstRecursively(projectNode) {
                         (it.data as? ModuleData)?.id == sourceSetId
                     }?.data as? ModuleData ?: continue
@@ -83,8 +89,7 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
                     rootModel.addModuleOrderEntry(sourceSetModule)
                 }
             }
-
-            KotlinSourceSetDataService.configureFacet(moduleData, sourceSetInfo, nodeToImport, module, modelsProvider)
+            KotlinSourceSetDataService.configureFacet(moduleData, mainSourceSetInfo, nodeToImport, module, modelsProvider)
 
             val kotlinFacet = KotlinFacet.get(module)
             if (kotlinFacet != null) {