azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KotlinMultiplatformRunLocationsProvider: fix tests in android modules

Browse Source 
Android modules are considered to be 'production' but can contain tests
    and test roots

 #KT-27371 In progress
This commit is contained in:
Pavel V. Talanov
2018-10-11 19:10:28 +02:00
parent a2b7912db9
commit 3c3e7b617b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/multiplatform/KotlinMultiplatformRunLocationsProvider.kt
+2 -1
View File
@@ -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.caches.project.sourceType
import org.jetbrains.kotlin.idea.configuration.toModuleGroup import org.jetbrains.kotlin.idea.configuration.toModuleGroup
import org.jetbrains.kotlin.idea.core.getSourceType import org.jetbrains.kotlin.idea.core.getSourceType
import org.jetbrains.kotlin.idea.core.isAndroidModule
import org.jetbrains.kotlin.idea.facet.KotlinFacet import org.jetbrains.kotlin.idea.facet.KotlinFacet
class KotlinMultiplatformRunLocationsProvider : MultipleRunLocationsProvider() { class KotlinMultiplatformRunLocationsProvider : MultipleRunLocationsProvider() {
@@ -51,5 +52,5 @@ private fun modulesToRunFrom(
val compilations = modules.filter { val compilations = modules.filter {
KotlinFacet.get(it)?.configuration?.settings?.kind == KotlinModuleKind.COMPILATION_AND_SOURCE_SET_HOLDER 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 }
} }