From a7b51070a754757d2c70a66146e037055df41dfa Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 13 Aug 2018 12:42:32 +0300 Subject: [PATCH] MPP: find modules for expect / actual: filter non-new MPP modules --- .../jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 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 11598fb528b..94b1cafe8bb 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 @@ -30,7 +30,7 @@ val Module.implementingModules: List val moduleManager = ModuleManager.getInstance(project) CachedValueProvider.Result( if (isNewMPPModule) { - moduleManager.getModuleDependentModules(this) + moduleManager.getModuleDependentModules(this).filter { it.isNewMPPModule } } else { moduleManager.modules.filter { name in it.findOldFashionedImplementedModuleNames() } }, @@ -43,7 +43,7 @@ val Module.implementedModules: List CachedValueProvider { CachedValueProvider.Result( if (isNewMPPModule) { - rootManager.dependencies.toList() + rootManager.dependencies.filter { it.isNewMPPModule } } else { val modelsProvider = IdeModelsProviderImpl(project) findOldFashionedImplementedModuleNames().mapNotNull { modelsProvider.findIdeModule(it) }