One more fix
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt
index 5ded681..97eabb8 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt
@@ -21,6 +21,7 @@
import org.jetbrains.kotlin.idea.project.platform
import org.jetbrains.kotlin.idea.util.module
import org.jetbrains.kotlin.platform.SimplePlatform
+import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.idePlatformKind
import org.jetbrains.kotlin.platform.impl.CommonIdePlatformKind
import org.jetbrains.kotlin.platform.impl.isCommon
@@ -47,14 +48,14 @@
return ::getCommonRuntimeLibraryVersion
}
- private fun getRelevantToolings(projectPlatforms: Set<SimplePlatform>?): List<IdePlatformKindTooling> {
+ private fun getRelevantToolings(platform: TargetPlatform?): List<IdePlatformKindTooling> {
return getInstances()
.filter { it != this }
- .filter { tooling -> projectPlatforms?.any { tooling.kind.isCompatibleWith(it) } ?: true }
+ .filter { platform == null || it.kind.isCompatibleWith(platform) }
}
override fun getTestIcon(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor): Icon? {
- val icons = getRelevantToolings(declaration.module?.platform?.componentPlatforms)
+ val icons = getRelevantToolings(declaration.module?.platform)
.mapNotNull { it.getTestIcon(declaration, descriptor) }
.distinct()
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/testRunningUtils.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/testRunningUtils.kt
index b63d654..0cafcb8 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/testRunningUtils.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/testRunningUtils.kt
@@ -13,6 +13,7 @@
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.platform.IdePlatformKind
import org.jetbrains.kotlin.platform.SimplePlatform
+import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.impl.CommonIdePlatformKind
import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind
import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
@@ -78,11 +79,11 @@
return classDescriptor.declaredCallableMembers.any { it.isKotlinTestDeclaration() }
}
-internal fun IdePlatformKind<*>.isCompatibleWith(platform: SimplePlatform): Boolean {
+internal fun IdePlatformKind<*>.isCompatibleWith(platform: TargetPlatform): Boolean {
return when (this) {
- is JvmIdePlatformKind -> platform is JvmPlatform
- is NativeIdePlatformKind -> platform is NativePlatform
- is JsIdePlatformKind -> platform is JsPlatform
+ is JvmIdePlatformKind -> platform.componentPlatforms.any { it is JvmPlatform }
+ is NativeIdePlatformKind -> platform.componentPlatforms.any { it is NativePlatform }
+ is JsIdePlatformKind -> platform.componentPlatforms.any { it is JsPlatform }
is CommonIdePlatformKind -> true
else -> false
}
