From 571cab305c1afccab6e0bf196e8748e457ba28c2 Mon Sep 17 00:00:00 2001 From: Yunir Salimzyanov Date: Fri, 5 Jun 2020 14:38:15 +0300 Subject: [PATCH] Cleanup as35 patchset logic (KTI-267) --- .../jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt | 2 +- .../kotlin/idea/highlighter/markers/dslStyleIcon.kt.as36 | 2 +- .../kotlin/idea/highlighter/markers/dslStyleIcon.kt.as40 | 2 +- .../kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41 | 2 +- idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt index 7ab522333af..160456e9a52 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.KotlinIcons import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension import javax.swing.Icon -// FIX ME WHEN BUNCH as35 REMOVED +// FIX ME WHEN BUNCH as36 REMOVED internal fun createDslStyleIcon(styleId: Int): Icon { val globalScheme = EditorColorsManager.getInstance().globalScheme val markersColor = globalScheme.getAttributes(DslHighlighterExtension.styleById(styleId)).foregroundColor diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as36 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as36 index 81a8246bf13..9743a86c33e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as36 +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as36 @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.highlighter.markers import com.intellij.icons.AllIcons import javax.swing.Icon -// FIX ME WHEN BUNCH as35 REMOVED +// FIX ME WHEN BUNCH as36 REMOVED internal fun createDslStyleIcon(styleId: Int): Icon { return AllIcons.Gutter.Colors } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as40 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as40 index 81a8246bf13..9743a86c33e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as40 +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as40 @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.highlighter.markers import com.intellij.icons.AllIcons import javax.swing.Icon -// FIX ME WHEN BUNCH as35 REMOVED +// FIX ME WHEN BUNCH as36 REMOVED internal fun createDslStyleIcon(styleId: Int): Icon { return AllIcons.Gutter.Colors } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41 index 81a8246bf13..9743a86c33e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41 +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41 @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.highlighter.markers import com.intellij.icons.AllIcons import javax.swing.Icon -// FIX ME WHEN BUNCH as35 REMOVED +// FIX ME WHEN BUNCH as36 REMOVED internal fun createDslStyleIcon(styleId: Int): Icon { return AllIcons.Gutter.Colors } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt b/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt index 65c833b1409..2bd403c7eae 100644 --- a/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt +++ b/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt @@ -6,6 +6,6 @@ package org.jetbrains.kotlin.idea // Remove the function, when there's no dependency to cidr during running Kotlin tests. -// FIX ME WHEN BUNCH as35 REMOVED +// FIX ME WHEN BUNCH as36 REMOVED fun registerAdditionalResourceBundleInTests() { } \ No newline at end of file