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 6f28c6cf028..37d5ff12fcb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -48,8 +48,9 @@ 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"); + // TODO: change icon files themselves! + Icon FROM_EXPECTED = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/fromHeader.png"); + Icon FROM_ACTUAL = 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/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt index ebeab318a72..b3a5e2f686e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt @@ -299,7 +299,7 @@ private fun collectActualMarkers(declaration: KtNamedDeclaration, result.add(LineMarkerInfo( anchor, anchor.textRange, - KotlinIcons.FROM_HEADER, + KotlinIcons.FROM_EXPECTED, Pass.LINE_MARKERS, PLATFORM_ACTUAL.tooltip, PLATFORM_ACTUAL.navigationHandler, @@ -320,7 +320,7 @@ private fun collectExpectedMarkers(declaration: KtNamedDeclaration, result.add(LineMarkerInfo( anchor, anchor.textRange, - KotlinIcons.FROM_IMPL, + KotlinIcons.FROM_ACTUAL, Pass.LINE_MARKERS, EXPECTED_DECLARATION.tooltip, EXPECTED_DECLARATION.navigationHandler,