From 8965bb8977c0b45f51d3628d30c2456bc493f360 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 15 Feb 2017 18:13:01 +0300 Subject: [PATCH] Navigation: new icons for header <---> impl #KT-15842 Fixed --- .../org/jetbrains/kotlin/idea/KotlinIcons.java | 2 ++ .../jetbrains/kotlin/idea/icons/fromHeader.png | Bin 0 -> 267 bytes .../jetbrains/kotlin/idea/icons/fromHeader@2x.png | Bin 0 -> 383 bytes .../org/jetbrains/kotlin/idea/icons/fromImpl.png | Bin 0 -> 272 bytes .../jetbrains/kotlin/idea/icons/fromImpl@2x.png | Bin 0 -> 369 bytes .../markers/KotlinLineMarkerProvider.kt | 5 +++-- 6 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/fromHeader.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/fromHeader@2x.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/fromImpl.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/fromImpl@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 0971330922c..fcb6286c700 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -46,6 +46,8 @@ public interface KotlinIcons { Icon TYPE_ALIAS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/typeAlias.png"); Icon SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall.png"); + Icon FROM_HEADER = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/fromHeader.png"); + Icon FROM_IMPL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/fromImpl.png"); Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.png"); } diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/fromHeader.png b/idea/resources/org/jetbrains/kotlin/idea/icons/fromHeader.png new file mode 100644 index 0000000000000000000000000000000000000000..7cbbad1148677ddf467aba3ba63b9c5df2eead85 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X)_S@)hE&{2N?0IZkR<$P)4gfj9;r+lr9xha3HU$fwE5G! zfHB~#tAkFr+Eu;yHD}bxEqgD&|Ig!? zFr9tEvlV>;8d*waCrZ89YAL@cGp%72YvhRoETy}oBn>&P9d^mIN@!v`rfc-&o>SSu zl8gfe3)mkWTz&s(V$K$aIevRHmUuZW@(NN@H-5;f(7d4SAqxW|8$)_#`2E%m^REFN O&fw|l=d#Wzp$PyO5@j&} literal 0 HcmV?d00001 diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/fromHeader@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/fromHeader@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d10f7fd316746f5513de57098c39281a399c46ae GIT binary patch literal 383 zcmV-_0f7FAP)NCukyH&|*4qjLDPJJg z2VyR$@HZg72*jIt0uR5XnFD~9%L1t)B#Y4j$RT||M?9vw1BkGkEJrX>*>aK{!AJwk zNpb`ujVveH5sWmnoG3>y(%5o>j$kCm@~GaI?%2ea6^rjA)e%hO_*`9@^%XH1QF z$l}XAC%)#F7cQuZ*|fb{Xd|_9`h*percC4!Y+J_LG?P=GVJF+PM+J-x49pBosR0!y TLaeRgTe~DWM4f!l7e^ literal 0 HcmV?d00001 diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/fromImpl@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/fromImpl@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..363ee4dd861372c15d8be0479e9c442e6c28141d GIT binary patch literal 369 zcmV-%0gnEOP)NCukyH&|*4qjLDPJJg z2VyR$@HZg72*jIt0uR5XnFD~9%L1t)B#Y4j$RT||M?9vw1BkGkEJrX>*>aK{!AJwk zNpb`ujVveH5sWmnoG3>y(%5o>j$kC!@~GaI?jU+uvG`76#0fcqiN-!h1|Tzwpmtz7 z09wM)%5ro^2xAKYUm9DE>|csJ literal 0 HcmV?d00001 diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt index 6d5be92d43e..89117dfda23 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt @@ -32,6 +32,7 @@ import com.intellij.psi.search.searches.ClassInheritorsSearch import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.idea.KotlinIcons import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor import org.jetbrains.kotlin.idea.core.toDescriptor import org.jetbrains.kotlin.idea.util.ProjectRootsUtil @@ -245,7 +246,7 @@ private fun collectImplementationMarkers(declaration: KtNamedDeclaration, result.add(LineMarkerInfo( anchor, anchor.textRange, - IMPLEMENTED_MARK, + KotlinIcons.FROM_HEADER, Pass.UPDATE_OVERRIDDEN_MARKERS, PLATFORM_IMPLEMENTATION.tooltip, PLATFORM_IMPLEMENTATION.navigationHandler, @@ -266,7 +267,7 @@ private fun collectHeaderMarkers(declaration: KtNamedDeclaration, result.add(LineMarkerInfo( anchor, anchor.textRange, - IMPLEMENTING_MARK, + KotlinIcons.FROM_IMPL, Pass.UPDATE_OVERRIDDEN_MARKERS, HEADER_DECLARATION.tooltip, HEADER_DECLARATION.navigationHandler,