From af35b6c3c8a6ac1c844edb3c1c1cebf572f30c23 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Fri, 28 Aug 2020 23:46:39 +0300 Subject: [PATCH] Provide icons to Kotlin Light-elements (KT-26235) --- .../src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt index bd4e945dc2f..d8163e706c4 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt @@ -15,6 +15,7 @@ import com.intellij.ui.RowIcon import com.intellij.util.PlatformIcons import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration +import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.idea.KotlinIcons.ACTUAL import org.jetbrains.kotlin.idea.KotlinIcons.EXPECT import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration @@ -132,7 +133,7 @@ class KotlinIconProvider : IconProvider(), DumbAware { is KtProperty -> if (isVar) KotlinIcons.FIELD_VAR else KotlinIcons.FIELD_VAL is KtClassInitializer -> KotlinIcons.CLASS_INITIALIZER is KtTypeAlias -> KotlinIcons.TYPE_ALIAS - else -> null + else -> unwrapped?.takeIf { it != this }?.getBaseIcon() } } }