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 00000000000..7cbbad11486 Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/fromHeader.png differ 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 00000000000..d10f7fd3167 Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/fromHeader@2x.png differ diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/fromImpl.png b/idea/resources/org/jetbrains/kotlin/idea/icons/fromImpl.png new file mode 100644 index 00000000000..f635512ced0 Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/fromImpl.png differ 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 00000000000..363ee4dd861 Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/fromImpl@2x.png differ 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,