From 9a4fa3a871d50714e1a9c5ebf2350e69b1bac9a0 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 23 Nov 2016 18:20:45 +0300 Subject: [PATCH] Presentation: Add icons for type aliases --- .../idea/KotlinDescriptorIconProvider.java | 2 +- .../jetbrains/kotlin/idea/KotlinIconProvider.kt | 1 + .../org/jetbrains/kotlin/idea/KotlinIcons.java | 1 + .../jetbrains/kotlin/idea/icons/typeAlias.png | Bin 0 -> 1444 bytes .../jetbrains/kotlin/idea/icons/typeAlias@2x.png | Bin 0 -> 2039 bytes 5 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/typeAlias.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/typeAlias@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 11f210ce349..4b734c0ab33 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java @@ -135,7 +135,7 @@ public final class KotlinDescriptorIconProvider { } if (descriptor instanceof TypeAliasDescriptor) { - return PlatformIcons.CLASS_ICON; + return KotlinIcons.TYPE_ALIAS; } LOG.warn("No icon for descriptor: " + descriptor); 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 0a7bd2b0d7d..272e7fd0f9d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt @@ -115,6 +115,7 @@ class KotlinIconProvider : IconProvider(), DumbAware { } is KtProperty -> if (isVar) KotlinIcons.FIELD_VAR else KotlinIcons.FIELD_VAL is KtClassInitializer -> KotlinIcons.CLASS_INITIALIZER + is KtTypeAlias -> KotlinIcons.TYPE_ALIAS else -> null } } 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 7179ef80cbb..a7c8fbddb84 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -43,6 +43,7 @@ public interface KotlinIcons { Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_value.png"); Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_variable.png"); Icon CLASS_INITIALIZER = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classInitializerKotlin.png"); + Icon TYPE_ALIAS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/typeAlias.png"); Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.png"); } diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/typeAlias.png b/idea/resources/org/jetbrains/kotlin/idea/icons/typeAlias.png new file mode 100644 index 0000000000000000000000000000000000000000..3f979a69dffe8044121f9cd283d4dfbe1ff132e9 GIT binary patch literal 1444 zcmaJ>drT8|96w&wL7OlKQc%OKouDi2-L@IVs?_1j1!}AAje9Yaj<~Es_+sV zv%2?P#xnsREXh`CVoZi2)It(6EP#=@2#R9^KxUSU!Ynm71Df$Fn_VNCyD%sMZB~tF zx6%L`s64#dmS0cfJL`)}E%h}PwN;e04a{_*oB)9{80aEu?GDtX5iRMW+&*v(iNGZY zQ=<_*OUh(0f_Ws3gG!l7YC#YLOjFAcWx7JHOabLEqJ&^Iguqf5K@k|0!{G8G;-b;k zO0-0)Uyj9{G@@#Tp->2NI-N47LPpY65TaJAAy^K{ScUWi} z#n?zY7*NE_WF4asahX0VfuL4o?T+O(aSel97zH6RI8ag$XfXUglpt2n4yFYEC*S`R zc9gm)94f&bWF2kc23IK#grd+q8pjxtE+xs@U>A+mBttr?Neax%Tk0CPWw*_4C7q6~ zOB{m%EwDQn%x=L8v>FkoBD2}7s5)J*Q|7Al=`f;35S=O~9oFk~N;#}hq^ea)ILOtK zmO28rGeNF(g_{Pi$_?0opt#6doVM-9t$Layz@@TL+v>S!SJhkQT35|QrCXH?amhe| z;r?sb!7I)|f$fTQxxre)T)ozA(( z*>TAstrKPi*wOll`|Ozy0dYpMr2UJHuk}`pLc^E;oS%AU+|$SkTI0VB-zAPb<39Fr z3n1Q*A^DE=@J&d5ap8{lpFg?&^X>c_5$77RuVJ4`k}fHHKL3H~r$_quKYJVay(zu? zP41|n$QzR;VfGtY7yV_x-7=)b93pIsI~m*hNImAAf)!mSUVJM_|2_NHV(0X%f8c0y zk)|Umb<$KWTx4~-*0y5|(l0R$-TY}s=pTt=vxg6N@PJDnjR}DE=5<%e&c4%BnB5ny zkIl%CyiI^{Lbd{kNH{RuJ;2}49fNFHY#agC6bdu^ECSo9;$T4<^Q! zX}$t#c+FQbe@ymY+(;jchi85`I@jIk_Z?VAC{HVfQg03R@g>K~=@=YdsE8)JKqzncEuiNe&pm-7pI)}K1`oOE;o*wZsV^V`6}b#m%;_rmQN z5?l&`@M2zA@JWU&=qUH I&aG(q8x;%_%>V!Z literal 0 HcmV?d00001 diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/typeAlias@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/typeAlias@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..49cbe48d820d60d2415fb6b0904e4d67a6c314ec GIT binary patch literal 2039 zcmaJ?dpJ~iA0J*1s#hwqUA!FQGWNmDoMFtR88U{Qk#QUAQf_1BV9LxHGY8|+Yk81H zM3l5dR@-JPHliX)dS#PMMM<@@o6x(PT#D2i?-`qR|9HLUdCvJ=p3mp=y?vhN?DzBe z!eI55)ff!MfXiVApevwx^>xv&A~p3jx@<-~LJ&S2gCq;&5XMaeM?(NtB8Y_oAb}_) zp$B4MFn_ZV2ZkUaJa4)Xmf!^%3|=Xbp==C>;i{AggnJ+ah=yXtQYQ9Q>s2fu7BR8G zWFCd~6fiFoIGbBY=3Krle&ckN5wf63HjD z0ttZr%=do^D*{tw5Fr3kz=?7pI=C21O(+@NT@DElSRM$&@ylKGi-QqZ5eLfvclV{P z0k*+nsR&M1e7?lt@#tKs0ue}s5SPuwqAGZ?SVU)mB&rj|i9#iUG!XP~b^|@gG%Aba z4zg$@7R6(k%Z7!C5=e?Hb47o0sVj0dc96)>$ZSY1PJ%?9a##W^l}#6~oC|qHy^mbc z%DFhN$R(i35H!R6%dnTPPzPzYpR9`>KA9hqqK=oN*2euSVG4uMiRH500+o-tf_KFm zL&gg+Ny)QMCkCH1-{-V6eQ9=p5Ot5^Uw2r~`r1Q1i^;ECih*}u`K$aaoI#uR>Zxlx z+U&H1{KL9CYS^biE8S~RT{VVVjMgB-;YqEnm6bzN6$wd0x9qnG&8a;t+sZN)WGNAC;k3|V4g!X^#ZSD`rY&hPq|BmmtbsiT_phS0Y{c-CsY#Uoy<<}s}q@P#GN*j*AVN$&;3&S?8Rrnq)oEy;kotKu} z$IZt2*(26k)tU2&Pc448il^ug*)(KMes0mJs<;*Kbt}Ab$-!i-8c6RtlTvRfN_tXOmKpa&$ppp9zq5FE z<$zAoxY5e<@*}j5}bFL9o@w>;r4{tBgOE{l(C^&6A zse===QRm@IkHP?^l#6E6K78$gpMHD3-KIE?(0TJ)vd+XW=JgK@&PEZccKzek8?J}; zhZvVT-*@MaG!@+th;I!1ddTbFQi|oe!I?bUPH9dvJ;Hd0+h=uOs}_CJqTXz6On9zy zv9`HxUfa~C|C}L109DkKR#B z@y}da@+?c*7hX)CT&U*X!iVq5% zovn(yNqR6Ne=Mfk!p`hw-KnguTKLK4pos7_?a!LM`~z$GLr`cG|35g>w=Ep^yr?G(S3A-;fP_$afB`b3J0>CoCC?}=QUidy@F zz%;9x{p*!Nt+qj0c2)S@>!r%1A?D^v;Bol$eztaF@HuR`mqkkx`~8_CHO2M$Kjtr1 zA+x^}Ok_^ad&&a0Hm2b(#ucdpTg&p0ndaIbLLB`}4lERF$JRLJ9!yK?9ZfsVF`hh1 z+&vb5Ge3RU_C$J+GKa`hH-;TgRA}Gk&)v4Ni4K2LT2@oWF||*ex^eG^oW>KU$31dJ zCMhW|@BhfKNlg!OWpa*Ct?cKNcvHvoKbzkvOdeiHe;ui%i}_Xy_w(wKuAel&Vy=e| J`y4AO>%Vq;OLhPN literal 0 HcmV?d00001