diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java index 11f210ce349..4b734c0ab33 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java @@ -135,7 +135,7 @@ public final class KotlinDescriptorIconProvider { } if (descriptor instanceof TypeAliasDescriptor) { - return PlatformIcons.CLASS_ICON; + return KotlinIcons.TYPE_ALIAS; } LOG.warn("No icon for descriptor: " + descriptor); 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 0a7bd2b0d7d..272e7fd0f9d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt @@ -115,6 +115,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 } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java index 7179ef80cbb..a7c8fbddb84 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -43,6 +43,7 @@ public interface KotlinIcons { Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_value.png"); Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_variable.png"); Icon CLASS_INITIALIZER = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classInitializerKotlin.png"); + Icon TYPE_ALIAS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/typeAlias.png"); Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.png"); } diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/typeAlias.png b/idea/resources/org/jetbrains/kotlin/idea/icons/typeAlias.png new file mode 100644 index 00000000000..3f979a69dff Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/typeAlias.png differ diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/typeAlias@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/typeAlias@2x.png new file mode 100644 index 00000000000..49cbe48d820 Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/typeAlias@2x.png differ