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

Add icon for declarations without modifier list

Browse Source
This commit is contained in:
Nikolay Krasko
2014-12-30 17:12:39 +03:00
parent 6215b3962c
commit 8a77fca449
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIconProvider.java
+13 -12
View File
@@ -68,9 +68,7 @@ public class JetIconProvider extends IconProvider implements DumbAware {
Icon result = getBaseIcon(psiElement); Icon result = getBaseIcon(psiElement);
if ((flags & Iconable.ICON_FLAG_VISIBILITY) > 0 && psiElement instanceof JetModifierListOwner) { if ((flags & Iconable.ICON_FLAG_VISIBILITY) > 0 && psiElement instanceof JetModifierListOwner) {
JetModifierList list = ((JetModifierListOwner) psiElement).getModifierList(); JetModifierList list = ((JetModifierListOwner) psiElement).getModifierList();
if (list != null) { result = createRowIcon(result, getVisibilityIcon(list));
result = createRowIcon(result, getVisibilityIcon(list));
}
} }
return result; return result;
} }
@@ -82,16 +80,19 @@ public class JetIconProvider extends IconProvider implements DumbAware {
return rowIcon; return rowIcon;
} }
public static Icon getVisibilityIcon(JetModifierList list) { public static Icon getVisibilityIcon(@Nullable JetModifierList list) {
if (list.hasModifier(JetTokens.PRIVATE_KEYWORD)) { if (list != null) {
return PlatformIcons.PRIVATE_ICON; if (list.hasModifier(JetTokens.PRIVATE_KEYWORD)) {
} return PlatformIcons.PRIVATE_ICON;
if (list.hasModifier(JetTokens.PROTECTED_KEYWORD)) { }
return PlatformIcons.PROTECTED_ICON; if (list.hasModifier(JetTokens.PROTECTED_KEYWORD)) {
} return PlatformIcons.PROTECTED_ICON;
if (list.hasModifier(JetTokens.PUBLIC_KEYWORD)) { }
return PlatformIcons.PUBLIC_ICON; if (list.hasModifier(JetTokens.PUBLIC_KEYWORD)) {
return PlatformIcons.PUBLIC_ICON;
}
} }
return PlatformIcons.PACKAGE_LOCAL_ICON; return PlatformIcons.PACKAGE_LOCAL_ICON;
} }