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

Migration to expect/actual minor: rename icon constants

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-09-15 12:41:59 +03:00
parent 19b8ecab61
commit d20ba5d082
2 changed files with 5 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
+3 -2
View File
@@ -48,8 +48,9 @@ public interface KotlinIcons {
Icon TYPE_ALIAS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/typeAlias.png"); 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 SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall.png");
Icon FROM_HEADER = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/fromHeader.png"); // TODO: change icon files themselves!
Icon FROM_IMPL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/fromImpl.png"); 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"); 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
@@ -299,7 +299,7 @@ private fun collectActualMarkers(declaration: KtNamedDeclaration,
result.add(LineMarkerInfo( result.add(LineMarkerInfo(
anchor, anchor,
anchor.textRange, anchor.textRange,
KotlinIcons.FROM_HEADER, KotlinIcons.FROM_EXPECTED,
Pass.LINE_MARKERS, Pass.LINE_MARKERS,
PLATFORM_ACTUAL.tooltip, PLATFORM_ACTUAL.tooltip,
PLATFORM_ACTUAL.navigationHandler, PLATFORM_ACTUAL.navigationHandler,
@@ -320,7 +320,7 @@ private fun collectExpectedMarkers(declaration: KtNamedDeclaration,
result.add(LineMarkerInfo( result.add(LineMarkerInfo(
anchor, anchor,
anchor.textRange, anchor.textRange,
KotlinIcons.FROM_IMPL, KotlinIcons.FROM_ACTUAL,
Pass.LINE_MARKERS, Pass.LINE_MARKERS,
EXPECTED_DECLARATION.tooltip, EXPECTED_DECLARATION.tooltip,
EXPECTED_DECLARATION.navigationHandler, EXPECTED_DECLARATION.navigationHandler,