From 414966b27e7bc3af71ac6059589311adf1fe39d7 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 18 Apr 2012 18:30:58 +0400 Subject: [PATCH] More adjustment in icons --- .../jetbrains/jet/plugin/icons/field_value.png | Bin 0 -> 633 bytes .../jet/plugin/icons/field_variable.png | Bin 0 -> 713 bytes .../jet/plugin/JetDescriptorIconProvider.java | 16 ++++++++++++++-- .../jetbrains/jet/plugin/JetIconProvider.java | 6 +++--- idea/src/org/jetbrains/jet/plugin/JetIcons.java | 2 ++ 5 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 idea/resources/org/jetbrains/jet/plugin/icons/field_value.png create mode 100644 idea/resources/org/jetbrains/jet/plugin/icons/field_variable.png diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/field_value.png b/idea/resources/org/jetbrains/jet/plugin/icons/field_value.png new file mode 100644 index 0000000000000000000000000000000000000000..f49d3094c631fec90fe3e6927f2f78df45d62a8f GIT binary patch literal 633 zcmV-<0*3vGP)bDCxTuvz zL;VPrh&p8!#f1y;SNIDAH!kYma1|63apTsV;M$D~v#=smO9X9_X|+jds+-A7XXak- zeJ>5E;;I98?tAm*oO8dPVP+iXnbFtVN3X7NP7f%jfb$&U$0qBHz*B2-=WAlkyDuKD zTLJ}F=Fi+-3>vkQ^QS$d-!!mXj9AXut|=n??(D^1TCLgLA6a5GSB!9|cmm6;`6RUE6bkSKu~C9+S2I5ntL=R8eo zLZJD==#OkwSD!q?=j{+hQ^cqCH>|#VigL9Kj)Wu;P_Y0a{)>QM6(MT=;$?hTZ=+BW zg3fm=*XqcJIXITzVnVK|9gRSc60)%o6yOV>-P;nS8GQY@h2UZx*`5^QK!7pZNSUSy zY^&H7ic^BWZ~;-Apcn2~A1pP5fLtB2ak}Fa4%_HbNL|I%{Dn(+{`w94^P;|+f=0P( zsWG<2hXXj30$hk{k-^Qg4TSpx+`4)l=^$|_{%;cPgh_EMiMC4ete>jl@tynNp?p>W zi)O3H2~7wl5$J^3VM&b3Pp407lF1&iGD!8c&bKL9vM}PqU$zg+Q TnIjmn00000NkvXXu0mjf({d+| literal 0 HcmV?d00001 diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/field_variable.png b/idea/resources/org/jetbrains/jet/plugin/icons/field_variable.png new file mode 100644 index 0000000000000000000000000000000000000000..dc47319f827e2188ba03597d15b291006dd32eec GIT binary patch literal 713 zcmV;)0yh1LP)2;Y=|kKq#kUHXpC1wym<9uO%Eo$8q@d}=%F?0!9M{_Jb5rNp)n>RG}W{PTEJr3 z0@4ql>@MugI7@f2dhI0dOm_0jZ{B(KeNBup9A|WC)0;c9NB4X@CV7N-c=WwB9&sKE zJeCdN{dZ3f0mcUhMcfnPGZ(^_1AV6)Rza|ssYD@H8k3d$=H2wy#YCx)e{nl99sLlU z|C@oHMI?0Z*0a&@xJwkf1*%X`nF0cX#V%Tg+`}hq*8Z#MZ+%Yva8#SjM%wNx{uy`J z@3PoLfe-?fsGxi$l!B=y5S7B#W4Dfs28JC2&IkHaJAlct8=-)uTNG%MVtV#DmQq=m zhzZH13?99lL-$D$RAR6R{XI^XFR1&}0fg*B4l8RhXn>&CgZN^KZ*xFq9f5NmsJ{tl zjY4fQ^jZh)y2%}YN9f{)X>V2-{KHld@>VuCpZ=W4)eF0__5`YMxgvma zNlTAvqb_BCC3Ds4)+?i=%|}W(y8dJFaU%9HmQSygtCc;u)*@6QgzigKd83#vf6si1 vZEmkVxpwnm)Hr9-y74&8WIAp;{}EsSX(v24yHFAq00000NkvXXu0mjfm#9Kv literal 0 HcmV?d00001 diff --git a/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java b/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java index 2b6506cfc7c..1317a34b943 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java @@ -76,7 +76,8 @@ public final class JetDescriptorIconProvider { return PlatformIcons.PACKAGE_OPEN_ICON; } if (descriptor instanceof FunctionDescriptor) { - return JetIcons.FUNCTION; + return descriptor.getContainingDeclaration() instanceof ClassDescriptor ? + PlatformIcons.METHOD_ICON : JetIcons.FUNCTION; } if (descriptor instanceof ClassDescriptor) { switch (((ClassDescriptor)descriptor).getKind()) { @@ -97,9 +98,20 @@ public final class JetDescriptorIconProvider { return null; } } + if (descriptor instanceof ValueParameterDescriptor) { + return JetIcons.PARAMETER; + } + + if (descriptor instanceof LocalVariableDescriptor) { + return ((LocalVariableDescriptor)descriptor).isVar() ? JetIcons.VAR : JetIcons.VAL; + } if (descriptor instanceof PropertyDescriptor) { - return ((PropertyDescriptor)descriptor).isVar() ? JetIcons.VAR : JetIcons.VAL; + return ((PropertyDescriptor)descriptor).isVar() ? JetIcons.FIELD_VAR : JetIcons.FIELD_VAL; + } + + if (descriptor instanceof TypeParameterDescriptor) { + return PlatformIcons.CLASS_ICON; } LOG.warn("No icon for descriptor: " + descriptor); diff --git a/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java b/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java index 970a9f2f58a..a237db389ea 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java @@ -64,7 +64,7 @@ public class JetIconProvider extends IconProvider { } if (psiElement instanceof JetNamedFunction) { return PsiTreeUtil.getParentOfType(psiElement, JetNamedDeclaration.class) instanceof JetClass - ? JetIcons.LAMBDA + ? PlatformIcons.METHOD_ICON : JetIcons.FUNCTION; } if (psiElement instanceof JetClass) { @@ -90,14 +90,14 @@ public class JetIconProvider extends IconProvider { if (parameter.getValOrVarNode() != null) { JetParameterList parameterList = PsiTreeUtil.getParentOfType(psiElement, JetParameterList.class); if (parameterList != null && parameterList.getParent() instanceof JetClass) { - return parameter.isVarArg() ? JetIcons.VAR : JetIcons.VAL; + return parameter.isMutable() ? JetIcons.FIELD_VAR : JetIcons.FIELD_VAL; } } return JetIcons.PARAMETER; } if (psiElement instanceof JetProperty) { JetProperty property = (JetProperty)psiElement; - return property.isVar() ? JetIcons.VAR : JetIcons.VAL; + return property.isVar() ? JetIcons.FIELD_VAR : JetIcons.FIELD_VAL; } return null; } diff --git a/idea/src/org/jetbrains/jet/plugin/JetIcons.java b/idea/src/org/jetbrains/jet/plugin/JetIcons.java index 79ef34542c1..8e9969cec3f 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetIcons.java +++ b/idea/src/org/jetbrains/jet/plugin/JetIcons.java @@ -34,4 +34,6 @@ public interface JetIcons { Icon VAR = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/variable.png"); Icon VAL = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/value.png"); Icon PARAMETER = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/parameter.png"); + Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/field_value.png"); + Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/field_variable.png"); }