From b1e371a2dd6a2f58710774aa5ec1af593b3070c2 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Mon, 15 Jul 2019 18:10:54 +0300 Subject: [PATCH] MPP: don't return `Main` modules from `implementedModules` for `Test` modules #KT-28529 Fixed #KT-30799 Fixed --- .../kotlin/idea/caches/project/multiplatformUtil.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 da5391d9fbe..9ca51a202f3 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 @@ -39,6 +39,9 @@ val Module.sourceType: SourceType? val Module.isMPPModule: Boolean get() = facetSettings?.isMPPModule ?: false +val Module.isTestModule: Boolean + get() = facetSettings?.isTestModule ?: false + val KotlinFacetSettings.isMPPModule: Boolean get() = targetPlatform.isCommon() || implementedModuleNames.isNotEmpty() || kind.isNewMPP @@ -65,7 +68,7 @@ val Module.implementedModules: List CachedValueProvider.Result( if (isNewMPPModule) { rootManager.dependencies.filter { - it.isNewMPPModule && it.platform.isCommon() && it.externalProjectId == externalProjectId + it.isNewMPPModule && it.platform.isCommon() && it.externalProjectId == externalProjectId && it.isTestModule == isTestModule } } else { val modelsProvider = IdeModelsProviderImpl(project)