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

Cleanup as35 patchset logic (KTI-267)

Browse Source
This commit is contained in:
Yunir Salimzyanov
2020-06-05 14:38:15 +03:00
parent dce19b0ace
commit 571cab305c
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt
+1 -1
View File
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.KotlinIcons
import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension
import javax.swing.Icon import javax.swing.Icon
// FIX ME WHEN BUNCH as35 REMOVED // FIX ME WHEN BUNCH as36 REMOVED
internal fun createDslStyleIcon(styleId: Int): Icon { internal fun createDslStyleIcon(styleId: Int): Icon {
val globalScheme = EditorColorsManager.getInstance().globalScheme val globalScheme = EditorColorsManager.getInstance().globalScheme
val markersColor = globalScheme.getAttributes(DslHighlighterExtension.styleById(styleId)).foregroundColor val markersColor = globalScheme.getAttributes(DslHighlighterExtension.styleById(styleId)).foregroundColor
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as36
+1 -1
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.highlighter.markers
import com.intellij.icons.AllIcons import com.intellij.icons.AllIcons
import javax.swing.Icon import javax.swing.Icon
// FIX ME WHEN BUNCH as35 REMOVED // FIX ME WHEN BUNCH as36 REMOVED
internal fun createDslStyleIcon(styleId: Int): Icon { internal fun createDslStyleIcon(styleId: Int): Icon {
return AllIcons.Gutter.Colors return AllIcons.Gutter.Colors
} }
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as40
+1 -1
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.highlighter.markers
import com.intellij.icons.AllIcons import com.intellij.icons.AllIcons
import javax.swing.Icon import javax.swing.Icon
// FIX ME WHEN BUNCH as35 REMOVED // FIX ME WHEN BUNCH as36 REMOVED
internal fun createDslStyleIcon(styleId: Int): Icon { internal fun createDslStyleIcon(styleId: Int): Icon {
return AllIcons.Gutter.Colors return AllIcons.Gutter.Colors
} }
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41
+1 -1
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.highlighter.markers
import com.intellij.icons.AllIcons import com.intellij.icons.AllIcons
import javax.swing.Icon import javax.swing.Icon
// FIX ME WHEN BUNCH as35 REMOVED // FIX ME WHEN BUNCH as36 REMOVED
internal fun createDslStyleIcon(styleId: Int): Icon { internal fun createDslStyleIcon(styleId: Int): Icon {
return AllIcons.Gutter.Colors return AllIcons.Gutter.Colors
} }
idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt
+1 -1
View File
@@ -6,6 +6,6 @@
package org.jetbrains.kotlin.idea package org.jetbrains.kotlin.idea
// Remove the function, when there's no dependency to cidr during running Kotlin tests. // 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() { fun registerAdditionalResourceBundleInTests() {
} }