From 8a77fca44902184cee76f4e42fe7503c91ce3a46 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 30 Dec 2014 17:12:39 +0300 Subject: [PATCH] Add icon for declarations without modifier list --- .../kotlin/idea/JetIconProvider.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIconProvider.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIconProvider.java index 065c44b46b6..34449055df6 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIconProvider.java @@ -68,9 +68,7 @@ public class JetIconProvider extends IconProvider implements DumbAware { Icon result = getBaseIcon(psiElement); if ((flags & Iconable.ICON_FLAG_VISIBILITY) > 0 && psiElement instanceof JetModifierListOwner) { JetModifierList list = ((JetModifierListOwner) psiElement).getModifierList(); - if (list != null) { - result = createRowIcon(result, getVisibilityIcon(list)); - } + result = createRowIcon(result, getVisibilityIcon(list)); } return result; } @@ -82,16 +80,19 @@ public class JetIconProvider extends IconProvider implements DumbAware { return rowIcon; } - public static Icon getVisibilityIcon(JetModifierList list) { - if (list.hasModifier(JetTokens.PRIVATE_KEYWORD)) { - return PlatformIcons.PRIVATE_ICON; - } - if (list.hasModifier(JetTokens.PROTECTED_KEYWORD)) { - return PlatformIcons.PROTECTED_ICON; - } - if (list.hasModifier(JetTokens.PUBLIC_KEYWORD)) { - return PlatformIcons.PUBLIC_ICON; + public static Icon getVisibilityIcon(@Nullable JetModifierList list) { + if (list != null) { + if (list.hasModifier(JetTokens.PRIVATE_KEYWORD)) { + return PlatformIcons.PRIVATE_ICON; + } + if (list.hasModifier(JetTokens.PROTECTED_KEYWORD)) { + return PlatformIcons.PROTECTED_ICON; + } + if (list.hasModifier(JetTokens.PUBLIC_KEYWORD)) { + return PlatformIcons.PUBLIC_ICON; + } } + return PlatformIcons.PACKAGE_LOCAL_ICON; }