From 186575060655ca309978dcd3f6f132660ab66902 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 24 May 2016 19:22:36 +0200 Subject: [PATCH] add icon for Kotlin annotation classes #KT-11814 Fixed --- .../idea/KotlinDescriptorIconProvider.java | 2 +- .../jetbrains/kotlin/idea/KotlinIconProvider.kt | 3 ++- .../org/jetbrains/kotlin/idea/KotlinIcons.java | 3 ++- .../kotlin/idea/icons/annotationKotlin.png | Bin 0 -> 1565 bytes .../kotlin/idea/icons/annotationKotlin@2x.png | Bin 0 -> 2647 bytes .../kotlin/idea/actions/NewKotlinFileAction.java | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/annotationKotlin.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/annotationKotlin@2x.png 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 075a070180d..ac0b8308f74 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java @@ -102,7 +102,7 @@ public final class KotlinDescriptorIconProvider { if (descriptor instanceof ClassDescriptor) { switch (((ClassDescriptor) descriptor).getKind()) { case INTERFACE: - return KotlinIcons.TRAIT; + return KotlinIcons.INTERFACE; case ENUM_CLASS: return KotlinIcons.ENUM; case ENUM_ENTRY: 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 dc5d22ba11d..1f5f7b80bc0 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt @@ -99,8 +99,9 @@ class KotlinIconProvider : IconProvider(), DumbAware { } is KtFunctionLiteral -> KotlinIcons.LAMBDA is KtClass -> when { - isInterface() -> KotlinIcons.TRAIT + isInterface() -> KotlinIcons.INTERFACE isEnum() -> KotlinIcons.ENUM + isAnnotation() -> KotlinIcons.ANNOTATION this is KtEnumEntry && getPrimaryConstructorParameterList() == null -> KotlinIcons.ENUM else -> KotlinIcons.CLASS } 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 0b2e6255b33..507a49c1f3b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -32,7 +32,8 @@ public interface KotlinIcons { Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file.png"); Icon ACTIVITY = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_activity.png"); Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/objectKotlin.png"); - Icon TRAIT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin.png"); + Icon INTERFACE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin.png"); + Icon ANNOTATION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/annotationKotlin.png"); Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/function.png"); Icon EXTENSION_FUNCTION = PlatformIcons.FUNCTION_ICON; Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/lambda.png"); diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/annotationKotlin.png b/idea/resources/org/jetbrains/kotlin/idea/icons/annotationKotlin.png new file mode 100644 index 0000000000000000000000000000000000000000..c8272a616e14d3e9b15d293188894939b8f8b7b2 GIT binary patch literal 1565 zcmaJ>c~BE~6ppkWTpox@l_|@{vyf~yA=eHOb80L>2oa(!j7zd4Tas+pT}*%}RuGS( z)uI&zYpn>=dLe36thQ8?4j!pER!7tkTOr~x*y@16irpY+|FHgM_IJGbzW2U&%&tjJ znj0E4If%t#g=*)i^vpTd|BV{K>`{+jpv>_etv1rBL^kb0NsJ{o6ImFbwWAhHkD=!L z+!idJ#d>EtZZOhDT_R#4>|E53;kxZkhRtHdC%B!cDF>s0EX;yCWMKD?KZ5{nmVxO) z9Z%;}Vpe=!0g0s+BpFNvIVPzYOqdPCyAj5L9ivgeZMQin#4Q5{{36WVZ-zi%07B=; zz?Y(ox@15}kQgB3iZ~`1h5@mZ3kxLzzAzTx^I##wlR_|$!-El+hwyp8-~yRwq&XYW zt2BeLn3oK+(zFwSAeYOgciWgw&UWeRquPWQ^OgBmOpQ!>bnIw6?LgY0&HUIS=~)?=?_yb(+PyuHAIPXdRD>zdjyY(pN(M3(t{FEY8d$1SYNR5bS|x#DwMfEO zz*3Ds%!8$IJb@x^h^uu_H0m&6LtOkdSNK*gq9ietCP)K8*oL~7Y$a%dvJy@}sT}AQ zFf$!@mwHS#n#mpL#umc12LGU+dP^jf{wL}f8#3}`&Unm#Jm2$B-PM{F+ zC2A@@Np|9`m=J9IyF$Xj8Bs1DZkuQnG3RtIA z$qnwdUHXi9sc1xzr}K*o7g|!p;*;M48E#a*ddJ?=QgfFES}mF6-P`@FEikpaVD@&()7u|^>)H11 zj`EhN{Uh-wt-@uNqnwJ1I``%SJnZrKg21Tpnx4Sq^9`1io*gH?{PUQ_x3wpB&$Xb9 z(IvjHztgmm_qpRt-;UPj#=z^W`H}YMg>rVCcU9TLB+u!p(Xry_Y3;$jjpd*a2Nw@d zBM*Arnd2;R5%nMJ&+7Dr>|8#R%ARDd-dPh+tYoe8O@5Mpc^9JlIHqz=VP@^`^z(I$Gt1>-YX3mHeY|{LD`~h z_@1dhxG_UT&!OS=E-hP7TKzJ8nlp!$%ci&e|!L)_hhh470@?zTH$EXmF)f z*Y4?Cu)Z`+RZ$(gvNRfMVd1hVI5$~Pc6U%SO684>``^i23=%=>F2J6_01<&IX z`zpFJkH$DvDVwt4$hGP#>GkY~b5bT~IKCo}`iAFZWx}z`SF5LW^(5Y(qHk?Af=k5_ zqd7%m`ZokFtH1MLVsm(b?bqpry+;m=c~Yrw(H8U#yZfBe$kLUBzli+0@VftptyL$f J_A8bY{|mnySN8w_ literal 0 HcmV?d00001 diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/annotationKotlin@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/annotationKotlin@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4fe9ba0bea0b7bd61b0b57a621a75efcf7fd107b GIT binary patch literal 2647 zcmaJ@c|6p4AGf6vO{kP3(=_gD?lERU%_Sp)W^#-oW9FBcn8VD-Af3*Lv=k8=sT{4N zk&t3iIXc$rk}NhA)#C_DOL<0H?eoVz`+dEB-{bRozdxV%=lJ87?B%f)q-m(Brltm> zxl$Oa6SDAWELH8&=;%q+VIZUW$(W)&vPiZBP$P0h!2pCNV21zzM7tC-dID5u zlpoy-LKaB?2o`2<$3Y^I5F8$c#5$l+SX&4RfyBZQcsLSahd>gL2m%TL`MRL0XcF!o z0)yi6HJ0k-1m($OVgei<85s$SM8iaq5I7Q#$HNgQI0|K_LfA>8gfh0=PAE0`=79o8 zITF5D#uo`83m)0Qq6nE2RHgK<6a->A{kvnK^lPD1C43Qtch=$ygE+heo*Is1ynj|BXu%N@Z*z2l&S2|INkzE0;i)0Bo5^vO^>a z`_?@#o=7H=@eS=KdL#UNUj zDXtFJHnrKJO~5n^n`)N6>8P82oi{)K;Na(1yNF$wxdM92{EO7#T)J_^9%EVP_^$N^ zGXX#KP~%?3eT?%b9oU0U;&0aSEx!+0OCbh_FC^;9A+Ei0cSp+V+k>zz3aA#}Q zuFf~hE5?UWH|S=xWZIr64)B~gDb|W<#STLI-X965?rc;~hWt`&9(;m>a>;^R|Db0X z9?yCct6WVP-0m{er{m`~bH=M_&Hc*L;#WV`tUsC&lxXraZB>l!&#lgr$5$et^hw;6 zc}?YS!wv(naZc`dCZQuh`*inmf#$lLC_g4-RIrRu?j*JXJRYnFWMn=oPqKHbBmlSe!IQvsV>~Ph#5y%fx#9YZ;hMf zvGpnHDIJ=TWTf@lN6Pn#p_ki?&0cKXuX{5WT&r_td2*P#zs7`Q1>Um5=DybhpNP-1 zEAx7L(kQn0J|0RbISVQ+4?6$wZumeV`qFOaW!@?8ChOdNTtOM0m*`f;qn<8@1a~JK zFN9Hif-p=<^4(k6_L?8Q9cP&AGio}K?%CNpyQwayh^4%o4tEKRa#qA8Y`M9?4MEy@ zLTlR%J=|sCk;j6qPirkYYZ{E>uY@$YkFumE$f%Ce@R|hhx@s;qqbYX(Pi@Et1&4=t z>LJsLiP;>RH_E^f(tH(IHsX-R+XBwD(-^yF-JEx7iM~T;N@w7PdTm+Z=Yia*jZvmC z4ue$dTyUQL60K+H)M|0p#flrd8+3hNR<6bO^KEbUmjvd`Os=E2)|EXudTf*MP|dSu zy9;qet{ThNJhXYKr9WbL?*x!>j~_5$F>%-*4Ch`Lf4yPkdduvQoVFx~+F8uAzI>x? zhz2vOL;+b0QCo~R%MG;~9M|qPYCn->;x^n<-=;B!u}D&8Paxmaujy~R{OB+*+scq; zKEJblGQ2A3OzOZclY3NIh2Su)t>5+S7@HG1CX~-C?uYnU9+q+ddlA9!Q-sDcDu>!RLKXbq8wx zml?~M943=%+8X|=_(@&e0BplMa-L7%RKM-Dw@!-Z`Y_{9T6Px#O57ax7n|_o};^*p1bt^t4*6WTZbT+=jl!AF%Zk>sGF}c?@ zewd)OLP394P}0AB^asaCzR?=;uV+qfB$Ytxj0IO;-?Djn<2o-GJdnC)}O z-Q@c5eAJ=NnB!v}koAzwt!8)HDy_oun@j#sL@1vkTQ;(A6zXX<1g`oyN+LqwK?oXNWCmz!sJlw1~`{Hvs^zar$Q?mLiNMY%s534^x z+DE$DyFR_qqsz;p*?UGlGGc)Gz9k_H(u*lVwoOlQ_K zQJ~8hzZltAmp5*_wDXTsxs{D~P