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

JetDescriptorIconProvider now return abstract icons for abstract functions

Browse Source
This commit is contained in:
Vladimir Rudev
2012-11-04 11:24:45 +04:00
committed by Nikolay Krasko
parent 0be6b8bb22
commit d9d4683989
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java
+13 -4
View File
@@ -49,7 +49,7 @@ public final class JetDescriptorIconProvider {
public static Icon getVisibilityIcon(@NotNull DeclarationDescriptor descriptor) {
if (descriptor instanceof DeclarationDescriptorWithVisibility) {
DeclarationDescriptorWithVisibility descriptorWithVisibility = (DeclarationDescriptorWithVisibility)descriptor;
DeclarationDescriptorWithVisibility descriptorWithVisibility = (DeclarationDescriptorWithVisibility) descriptor;
Visibility visibility = descriptorWithVisibility.getVisibility();
if (visibility == Visibilities.PUBLIC) {
return PlatformIcons.PUBLIC_ICON;
@@ -81,11 +81,20 @@ public final class JetDescriptorIconProvider {
return JetIcons.EXTENSION_FUNCTION;
}
return descriptor.getContainingDeclaration() instanceof ClassDescriptor ?
PlatformIcons.METHOD_ICON : JetIcons.FUNCTION;
if (descriptor.getContainingDeclaration() instanceof ClassDescriptor) {
if (Modality.ABSTRACT == ((FunctionDescriptor) descriptor).getModality()) {
return PlatformIcons.ABSTRACT_METHOD_ICON;
}
else {
return PlatformIcons.METHOD_ICON;
}
}
else {
return JetIcons.FUNCTION;
}
}
if (descriptor instanceof ClassDescriptor) {
switch (((ClassDescriptor)descriptor).getKind()) {
switch (((ClassDescriptor) descriptor).getKind()) {
case TRAIT:
return JetIcons.TRAIT;
case ENUM_CLASS: