From 4b152a635eba4225ca6bfb126c8c08d31ca51056 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Wed, 30 Sep 2020 12:25:25 +0200
Subject: [PATCH] multiplatformUtil; Module.implementedModules: Extend Android
 M2 fallback to also include M3 relevant modules

Port of `kotlin-ide` commit: 9053046ad5731b7aca73e2f74b93e8bd8251f507
---
 .../kotlin/idea/caches/project/multiplatformUtil.kt   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
index fd2d62b5200..493dcc508f3 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
@@ -117,16 +117,13 @@ val Module.implementedModules: List<Module>
             null -> emptyList()
 
             KotlinMultiplatformVersion.M3 -> {
-                if (isAndroidModule()) {
+                facetSettings.dependsOnModuleNames
+                    .mapNotNull { project.modulesByLinkedKey[it] }
                     // HACK: we do not import proper dependsOn for android source-sets in M3, so fallback to M2-impl
                     // to at least not make things worse.
                     // See KT-33809 for details
-                    implementedModulesM2()
-                } else {
-                    facetSettings.dependsOnModuleNames.mapNotNull {
-                        project.modulesByLinkedKey[it]
-                    }
-                }
+                    .plus(if (isAndroidModule()) implementedModulesM2() else emptyList())
+                    .distinct()
             }
 
             KotlinMultiplatformVersion.M2 -> {