From 44cbdd142b57cc230c81f839d99f89bbe0fbec5f Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Mon, 3 Jun 2019 09:33:01 +0300 Subject: [PATCH] [Expect/Actual] Collect expectedBy modules correctly in case of HMPP --- .../kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt index e3a738269f3..72b3bcdac51 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt @@ -17,6 +17,7 @@ import com.intellij.openapi.roots.ProjectRootModificationTracker import com.intellij.psi.util.CachedValueProvider import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.isCommon +import org.jetbrains.kotlin.types.typeUtil.closure import java.util.concurrent.ConcurrentHashMap fun getModuleInfosFromIdeaModel(project: Project, platform: TargetPlatform): List { @@ -78,7 +79,7 @@ private fun mergePlatformModules( listOf(module to module.expectedBy) else emptyList() }.map { (module, expectedBys) -> - PlatformModuleInfo(module, expectedBys) + PlatformModuleInfo(module, expectedBys.closure { it.expectedBy }.toList()) } val rest = allModules - platformModules.flatMap { it.containedModules }