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

Default to plain 'Run' icon when calculating icons for common code

Browse Source 
#KT-26942 Fixed
This commit is contained in:
Pavel V. Talanov
2018-09-26 19:17:28 +02:00
parent 8d3e997a82
commit 2d52865415
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt
+7 -3
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.idea.core.platform.impl package org.jetbrains.kotlin.idea.core.platform.impl
import com.intellij.icons.AllIcons
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.libraries.Library import com.intellij.openapi.roots.libraries.Library
import org.jetbrains.kotlin.analyzer.common.CommonAnalyzerFacade import org.jetbrains.kotlin.analyzer.common.CommonAnalyzerFacade
@@ -47,12 +48,15 @@ object CommonIdePlatformKindTooling : IdePlatformKindTooling() {
} }
override fun getTestIcon(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor): Icon? { override fun getTestIcon(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor): Icon? {
return IdePlatformKindTooling.getInstances() val icons = IdePlatformKindTooling.getInstances()
.asSequence()
.filter { it != this } .filter { it != this }
.mapNotNull { it.getTestIcon(declaration, descriptor) } .mapNotNull { it.getTestIcon(declaration, descriptor) }
.distinct() .distinct()
.singleOrNull()
return when (icons.size) {
0 -> null
else -> icons.singleOrNull() ?: AllIcons.RunConfigurations.TestState.Run
}
} }
override fun acceptsAsEntryPoint(function: KtFunction): Boolean { override fun acceptsAsEntryPoint(function: KtFunction): Boolean {