From 2d52865415586b4145c566d3c08da1d0f9710ff7 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 26 Sep 2018 19:17:28 +0200 Subject: [PATCH] Default to plain 'Run' icon when calculating icons for common code #KT-26942 Fixed --- .../idea/platform/CommonIdePlatformKindTooling.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 7015cf4cc7d..7b37424865e 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 @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.idea.core.platform.impl +import com.intellij.icons.AllIcons import com.intellij.openapi.project.Project import com.intellij.openapi.roots.libraries.Library import org.jetbrains.kotlin.analyzer.common.CommonAnalyzerFacade @@ -47,12 +48,15 @@ object CommonIdePlatformKindTooling : IdePlatformKindTooling() { } override fun getTestIcon(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor): Icon? { - return IdePlatformKindTooling.getInstances() - .asSequence() + val icons = IdePlatformKindTooling.getInstances() .filter { it != this } .mapNotNull { it.getTestIcon(declaration, descriptor) } .distinct() - .singleOrNull() + + return when (icons.size) { + 0 -> null + else -> icons.singleOrNull() ?: AllIcons.RunConfigurations.TestState.Run + } } override fun acceptsAsEntryPoint(function: KtFunction): Boolean {