From 0993fb82fe4a61bb696e56595924266050cabf37 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Mon, 22 Jul 2019 17:56:25 +0300 Subject: [PATCH] multiplatformUtil: `implementedModules` shouldn't ignore android test module Relates to #KT-30799 --- .../jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt | 4 +++- 1 file changed, 3 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 9ca51a202f3..50fbc6e7680 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 @@ -19,6 +19,7 @@ import org.jetbrains.kotlin.config.KotlinFacetSettings import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.idea.caches.project.SourceType.PRODUCTION import org.jetbrains.kotlin.idea.caches.project.SourceType.TEST +import org.jetbrains.kotlin.idea.core.isAndroidModule import org.jetbrains.kotlin.idea.facet.KotlinFacet import org.jetbrains.kotlin.idea.facet.KotlinFacetType import org.jetbrains.kotlin.idea.facet.KotlinFacetType.Companion.ID @@ -68,7 +69,8 @@ val Module.implementedModules: List CachedValueProvider.Result( if (isNewMPPModule) { rootManager.dependencies.filter { - it.isNewMPPModule && it.platform.isCommon() && it.externalProjectId == externalProjectId && it.isTestModule == isTestModule + // TODO: remove additional android check + it.isNewMPPModule && it.platform.isCommon() && it.externalProjectId == externalProjectId && (isAndroidModule() || it.isTestModule == isTestModule) } } else { val modelsProvider = IdeModelsProviderImpl(project)