diff --git a/.bunch b/.bunch index aa7974813dd..266c1dc3f95 100644 --- a/.bunch +++ b/.bunch @@ -2,7 +2,6 @@ 193 191 183_191 -as34_183_191 as35_191 as36 as40_193 diff --git a/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt b/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt index 9fc1cd62bbe..105f78d1d8c 100644 --- a/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt +++ b/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt @@ -46,7 +46,6 @@ enum class Ide(val platform: Platform) : CompatibilityPredicate { IJ192(Platform.P192), IJ193(Platform.P193), - AS34(Platform.P183), AS35(Platform.P183), AS36(Platform.P192), AS40(Platform.P193); 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 02dd025c745..61a4808b40a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension import javax.swing.Icon // BUNCH: as35 -// BUNCH: as34 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.191 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.191 index 189cd7a4fd7..83249ab0a94 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.191 +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.191 @@ -14,7 +14,6 @@ import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension import javax.swing.Icon // BUNCH: as35 -// BUNCH: as34 // BUNCH: 191 internal fun createDslStyleIcon(styleId: Int): Icon { val globalScheme = EditorColorsManager.getInstance().globalScheme diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as35 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as35 index c1ae1f2d614..fda2d9471e4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as35 +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as35 @@ -9,7 +9,6 @@ import com.intellij.icons.AllIcons import javax.swing.Icon // BUNCH: as35 -// BUNCH: as34 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.as36 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as36 index c1ae1f2d614..fda2d9471e4 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 @@ -9,7 +9,6 @@ import com.intellij.icons.AllIcons import javax.swing.Icon // BUNCH: as35 -// BUNCH: as34 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 c1ae1f2d614..fda2d9471e4 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 @@ -9,7 +9,6 @@ import com.intellij.icons.AllIcons import javax.swing.Icon // BUNCH: as35 -// BUNCH: as34 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 8f0095f3b2d..181a7bff37c 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. -// BUNCH: as34 +// BUNCH: as35 fun registerAdditionalResourceBundleInTests() { } \ No newline at end of file