azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: rename expect/actual icon constants

Browse Source 
Reflect icons' content
This commit is contained in:
Pavel V. Talanov
2018-03-14 17:07:53 +01:00
parent 9c9cdee7f0
commit c86a6cf21d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java
+2 -2
View File
@@ -49,8 +49,8 @@ public interface KotlinIcons {
Icon SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall.png"); 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 ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual.png");
Icon FROM_ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect.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"); Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.png");
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+2 -2
View File
@@ -353,7 +353,7 @@ private fun collectActualMarkers(declaration: KtNamedDeclaration,
val lineMarkerInfo = LineMarkerInfo( val lineMarkerInfo = LineMarkerInfo(
anchor, anchor,
anchor.textRange, anchor.textRange,
KotlinIcons.FROM_EXPECTED, KotlinIcons.ACTUAL,
Pass.LINE_MARKERS, Pass.LINE_MARKERS,
PLATFORM_ACTUAL.tooltip, PLATFORM_ACTUAL.tooltip,
PLATFORM_ACTUAL.navigationHandler, PLATFORM_ACTUAL.navigationHandler,
@@ -379,7 +379,7 @@ private fun collectExpectedMarkers(declaration: KtNamedDeclaration,
val lineMarkerInfo = LineMarkerInfo( val lineMarkerInfo = LineMarkerInfo(
anchor, anchor,
anchor.textRange, anchor.textRange,
KotlinIcons.FROM_ACTUAL, KotlinIcons.EXPECT,
Pass.LINE_MARKERS, Pass.LINE_MARKERS,
EXPECTED_DECLARATION.tooltip, EXPECTED_DECLARATION.tooltip,
EXPECTED_DECLARATION.navigationHandler, EXPECTED_DECLARATION.navigationHandler,