From 888a93115ff605c730603560fd29b60b08304982 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 27 Aug 2019 19:21:09 +0300 Subject: [PATCH] Use function icon from the platform after removing 182 #KT-33536 Fixed --- .../org/jetbrains/kotlin/idea/KotlinIcons.java | 5 ++--- .../org/jetbrains/kotlin/idea/icons/function.png | Bin 197 -> 0 bytes .../org/jetbrains/kotlin/idea/icons/function.svg | 6 ------ .../jetbrains/kotlin/idea/icons/function@2x.png | Bin 380 -> 0 bytes 4 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/function.png delete mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/function.svg delete mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/function@2x.png 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 6522f7c1ff5..be753aa66b5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea; +import com.intellij.icons.AllIcons; import com.intellij.openapi.util.IconLoader; import com.intellij.util.PlatformIcons; @@ -35,9 +36,7 @@ public interface KotlinIcons { Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/objectKotlin." + IconExtensionChooser.iconExtension()); Icon INTERFACE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin." + IconExtensionChooser.iconExtension()); Icon ANNOTATION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/annotationKotlin." + IconExtensionChooser.iconExtension()); - // BUNCH: 182 - //todo: Use AllIcons.nodes instead (actually the same icon) - Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/function." + IconExtensionChooser.iconExtension()); + Icon FUNCTION = AllIcons.Nodes.Function; Icon EXTENSION_FUNCTION = PlatformIcons.FUNCTION_ICON; Icon ABSTRACT_EXTENSION_FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstract_extension_function." + IconExtensionChooser.iconExtension()); Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/lambda." + IconExtensionChooser.iconExtension()); diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/function.png b/idea/resources/org/jetbrains/kotlin/idea/icons/function.png deleted file mode 100644 index a2c5949faf88436bf3df461da74d2e42a906ab83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`J)SO(Ar-fh6Bd~LxM}Op*rD98 zgORuShzLjKw*!j=W!WEGl5uEBllXSvSq@L@-i04mE3cI~*YM%spIaw0K5?C3OZZ&O z?D6=^i7Bb;XD#2B#4Vh{Y+#aqT4z3^(E?M2Ear}0U*0%o2ft$vOCIqwR5s?ZxlBlO vU^$qflF-0pxl*9oN$H{h|E*NDA_j)L78|%L7Dna+-NoSP>gTe~DWM4fx*bT0 diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/function.svg b/idea/resources/org/jetbrains/kotlin/idea/icons/function.svg deleted file mode 100644 index 954bb48cf0c..00000000000 --- a/idea/resources/org/jetbrains/kotlin/idea/icons/function.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/function@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/function@2x.png deleted file mode 100644 index b54fea6cb5b73f01d8a5df3bd9198fa2e253462b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmV-?0fYXDP)hIuK2R_(h|5|COMIXx067MP2_!(2#E8uSM7bVY z!h>N_LW67v9L%qs48plCKKnqHwgyCPfQgZi2+4N