From 3c3e7b617b09a8404f32224e6753e0f52bb205e4 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 11 Oct 2018 19:10:28 +0200 Subject: [PATCH] KotlinMultiplatformRunLocationsProvider: fix tests in android modules Android modules are considered to be 'production' but can contain tests and test roots #KT-27371 In progress --- .../multiplatform/KotlinMultiplatformRunLocationsProvider.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/multiplatform/KotlinMultiplatformRunLocationsProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/multiplatform/KotlinMultiplatformRunLocationsProvider.kt index 1967959dee3..fdc98d746ef 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/multiplatform/KotlinMultiplatformRunLocationsProvider.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/multiplatform/KotlinMultiplatformRunLocationsProvider.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.idea.caches.project.isNewMPPModule import org.jetbrains.kotlin.idea.caches.project.sourceType import org.jetbrains.kotlin.idea.configuration.toModuleGroup import org.jetbrains.kotlin.idea.core.getSourceType +import org.jetbrains.kotlin.idea.core.isAndroidModule import org.jetbrains.kotlin.idea.facet.KotlinFacet class KotlinMultiplatformRunLocationsProvider : MultipleRunLocationsProvider() { @@ -51,5 +52,5 @@ private fun modulesToRunFrom( val compilations = modules.filter { KotlinFacet.get(it)?.configuration?.settings?.kind == KotlinModuleKind.COMPILATION_AND_SOURCE_SET_HOLDER } - return compilations.filter { it.sourceType == originalSourceType } + return compilations.filter { it.isAndroidModule() || it.sourceType == originalSourceType } } \ No newline at end of file