From c86a6cf21d427b20f1466d04427499672ed028bb Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 14 Mar 2018 17:07:53 +0100 Subject: [PATCH] Minor: rename expect/actual icon constants Reflect icons' content --- .../src/org/jetbrains/kotlin/idea/KotlinIcons.java | 4 ++-- .../idea/highlighter/markers/KotlinLineMarkerProvider.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 16fcf64cae1..08f121adcf1 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -49,8 +49,8 @@ public interface KotlinIcons { Icon SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall.png"); - Icon FROM_EXPECTED = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual.png"); - Icon FROM_ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect.png"); + Icon ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual.png"); + Icon EXPECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect.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 14ade315cbd..83cb8d91ef1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt @@ -353,7 +353,7 @@ private fun collectActualMarkers(declaration: KtNamedDeclaration, val lineMarkerInfo = LineMarkerInfo( anchor, anchor.textRange, - KotlinIcons.FROM_EXPECTED, + KotlinIcons.ACTUAL, Pass.LINE_MARKERS, PLATFORM_ACTUAL.tooltip, PLATFORM_ACTUAL.navigationHandler, @@ -379,7 +379,7 @@ private fun collectExpectedMarkers(declaration: KtNamedDeclaration, val lineMarkerInfo = LineMarkerInfo( anchor, anchor.textRange, - KotlinIcons.FROM_ACTUAL, + KotlinIcons.EXPECT, Pass.LINE_MARKERS, EXPECTED_DECLARATION.tooltip, EXPECTED_DECLARATION.navigationHandler,