Refactoring: change "// BUNCH: xxx" format

It wasn't obvious how to use this comment properly.
Now it should be clear

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt

@@ -9,7 +9,7 @@ import com.intellij.core.CoreApplicationEnvironment
 import com.intellij.openapi.extensions.ExtensionsArea
 import java.io.File
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun registerExtensionPointAndExtensionsEx(pluginFile: File, fileName: String, area: ExtensionsArea) {
     @Suppress("MissingRecentApi")
     CoreApplicationEnvironment.registerExtensionPointAndExtensions(pluginFile, fileName, area)

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt.201

@@ -10,7 +10,7 @@ import com.intellij.openapi.extensions.ExtensionsArea
 import java.io.File
 import java.nio.file.FileSystems
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun registerExtensionPointAndExtensionsEx(pluginFile: File, fileName: String, area: ExtensionsArea) {
     val pluginRoot = FileSystems.getDefault().getPath(pluginFile.path)
     @Suppress("MissingRecentApi")

compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt

@@ -138,7 +138,7 @@ class CodeConformanceTest : TestCase() {
         for (sourceFile in FileUtil.findFilesByMask(SOURCES_BUNCH_FILE_PATTERN, root)) {
             if (EXCLUDED_FILES_AND_DIRS.any { FileUtil.isAncestor(it, sourceFile, false) }) continue
 
-            val matches = Regex("BUNCH: (\\w+)").findAll(sourceFile.readText())
+            val matches = Regex("BUNCH (\\w+)").findAll(sourceFile.readText())
                 .map { it.groupValues[1] }.toSet().filterNot { it in extensions }
             for (bunch in matches) {
                 val filename = FileUtil.toSystemIndependentName(sourceFile.absoluteFile.toRelativeString(root))

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.caches
 import com.intellij.psi.PsiMethod
 import com.intellij.util.Processor
 
-// BUNCH 193
+// FIX ME WHEN BUNCH 193 REMOVED
 typealias StringProcessor = Processor<String>
 typealias PsiMethodProcessor = Processor<PsiMethod>
 

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.201

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.caches
 import com.intellij.psi.PsiMethod
 import com.intellij.util.Processor
 
-// BUNCH 193
+// FIX ME WHEN BUNCH 193 REMOVED
 typealias StringProcessor = Processor<in String>
 typealias PsiMethodProcessor = Processor<in PsiMethod>
 

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt

@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.idea.KotlinLanguage
 /**
  * Tested in OutOfBlockModificationTestGenerated
  */
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 class KotlinCodeBlockModificationListener(
     project: Project,
     treeAspect: TreeAspect
@@ -24,7 +24,7 @@ class KotlinCodeBlockModificationListener(
     @Suppress("UnstableApiUsage")
     private val isLanguageTrackerEnabled = modificationTrackerImpl.isEnableLanguageTrackerCompat
 
-    // BUNCH: 191
+    // FIX ME WHEN BUNCH 191 REMOVED
     // When there're we no per-language trackers we had to increment global tracker first and process result afterward
     private val customIncrement = if (isLanguageTrackerEnabled) 0 else 1
 

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt.201

@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.psi.KtFile
 /**
  * Tested in OutOfBlockModificationTestGenerated
  */
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 class KotlinCodeBlockModificationListener(project: Project) : KotlinCodeBlockModificationListenerCompat(project) {
 
     init {

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt

@@ -37,7 +37,7 @@ val KOTLIN_CONSOLE_KEY = Key.create<Boolean>("kotlin.console")
 /**
  * Tested in OutOfBlockModificationTestGenerated
  */
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 abstract class KotlinCodeBlockModificationListenerCompat(protected val project: Project) : PsiTreeChangePreprocessor {
     protected val modificationTrackerImpl: PsiModificationTrackerImpl =
         PsiModificationTracker.SERVICE.getInstance(project) as PsiModificationTrackerImpl

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.caches.trackers
 
 import com.intellij.psi.impl.PsiModificationTrackerImpl
 
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 @Suppress("unused")
 val PsiModificationTrackerImpl.isEnableLanguageTrackerCompat
     get() = true

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt.191

@@ -7,6 +7,6 @@ package org.jetbrains.kotlin.idea.caches.trackers
 
 import com.intellij.psi.impl.PsiModificationTrackerImpl
 
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 @Suppress("unused")
 val PsiModificationTrackerImpl.isEnableLanguageTrackerCompat get() = isEnableLanguageTracker

idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/AbstractKotlinInspection.kt

@@ -39,7 +39,7 @@ abstract class AbstractKotlinInspection : LocalInspectionTool() {
         registerProblem(problemDescriptor)
     }
 
-    // BUNCH: 191
+    // FIX ME WHEN BUNCH 191 REMOVED
     // a workaround for IDEA-211491
     override fun getProblemElement(psiElement: PsiElement): PsiNamedElement? {
         val parent = psiElement.parents().firstOrNull { parent ->

idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.klib
 
 import com.intellij.openapi.application.ApplicationManager
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class KlibLoadingMetadataCache : KlibLoadingMetadataCacheCompat() {
 
     companion object {

idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt.192

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.klib
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.BaseComponent
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class KlibLoadingMetadataCache : KlibLoadingMetadataCacheCompat(), BaseComponent {
 
     companion object {

idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCacheCompat.kt

@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
 import java.io.IOException
 import java.util.*
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 abstract class KlibLoadingMetadataCacheCompat {
 
     // Use special CacheKey class instead of VirtualFile for cache keys. Certain types of VirtualFiles (for example, obtained from JarFileSystem)

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.completion.test.handlers
 
 import com.intellij.codeInsight.lookup.impl.LookupImpl
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun LookupImpl.setFocusedFocusDegree() {
     focusDegree = LookupImpl.FocusDegree.FOCUSED
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt.201

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.completion.test.handlers
 import com.intellij.codeInsight.lookup.LookupFocusDegree
 import com.intellij.codeInsight.lookup.impl.LookupImpl
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun LookupImpl.setFocusedFocusDegree() {
     this.lookupFocusDegree = LookupFocusDegree.FOCUSED
 }

idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinFileTypeFactory.java

@@ -30,7 +30,7 @@ import java.util.Set;
 
 import static org.jetbrains.kotlin.library.KotlinLibraryUtilsKt.KLIB_FILE_EXTENSION;
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 public class KotlinFileTypeFactory extends FileTypeFactory {
     public final static String[] KOTLIN_EXTENSIONS = new String[] { "kt", "kts" };
     private final static FileType[] KOTLIN_FILE_TYPES = new FileType[] { KotlinFileType.INSTANCE };

idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeABICompatibilityChecker.kt

@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.idea.versions.UnsupportedAbiVersionNotificationPanel
 import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion
 import org.jetbrains.kotlin.konan.library.KONAN_STDLIB_NAME
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 /** TODO: merge [KotlinNativeABICompatibilityChecker] in the future with [UnsupportedAbiVersionNotificationPanelProvider], KT-34525 */
 class KotlinNativeABICompatibilityChecker : StartupActivity {
     override fun runActivity(project: Project) {

idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeABICompatibilityChecker.kt.192

@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion
 import org.jetbrains.kotlin.konan.library.KONAN_STDLIB_NAME
 import org.jetbrains.kotlin.idea.klib.KlibCompatibilityInfo.IncompatibleMetadata
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 /** TODO: merge [KotlinNativeABICompatibilityChecker] in the future with [UnsupportedAbiVersionNotificationPanelProvider], KT-34525 */
 class KotlinNativeABICompatibilityChecker(private val project: Project) : ProjectComponent, Disposable {
 

idea/idea-gradle-tooling-api/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 jvmTarget = "1.6"
 
-// BUNCH 193: this module is no longer needed since IDEA 2020.1
+// FIX ME WHEN BUNCH 193 REMOVED: this module is no longer needed since IDEA 2020.1
 Platform[193].orLower {
     dependencies {
         compileOnly(intellijPluginDep("gradle"))

idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt

@@ -11,7 +11,7 @@ import com.intellij.openapi.externalSystem.model.project.ProjectData
 import org.gradle.tooling.model.idea.IdeaModule
 import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 abstract class AbstractProjectResolverExtensionCompat : AbstractProjectResolverExtension() {
     override fun createModule(gradleModule: IdeaModule, projectDataNode: DataNode<ProjectData>): DataNode<ModuleData> {
         return super.createModule(gradleModule, projectDataNode).also {

idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt.201

@@ -11,7 +11,7 @@ import com.intellij.openapi.externalSystem.model.project.ProjectData
 import org.gradle.tooling.model.idea.IdeaModule
 import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 abstract class AbstractProjectResolverExtensionCompat : AbstractProjectResolverExtension() {
     override fun createModule(gradleModule: IdeaModule, projectDataNode: DataNode<ProjectData>): DataNode<ModuleData>? {
         return super.createModule(gradleModule, projectDataNode)?.also {

idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt

@@ -935,7 +935,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
                     }
                 }
 
-                // BUNCH: 191 Can't use property because there's no getter in 192 and thus it isn't property anymore
+                // FIX ME WHEN BUNCH 191 REMOVED Can't use property because there's no getter in 192 and thus it isn't property anymore
                 @Suppress("UsePropertyAccessSyntax")
                 sourceSet.setSources(sourcesWithTypes.toMap())
             }
@@ -952,7 +952,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
                 sourceSet.targetCompatibility = ktSourceSetData.targetCompatibility
                 sourceSet.dependencies += ktSourceSet.dependencies.mapNotNull { mppModel.dependencyMap[it] }
 
-                // BUNCH: 191 Can't use property because there's no getter in 192 and thus it isn't property anymore
+                // FIX ME WHEN BUNCH 191 REMOVED Can't use property because there's no getter in 192 and thus it isn't property anymore
                 @Suppress("UsePropertyAccessSyntax")
                 sourceSet.setSources(linkedMapOf(
                     ktSourceSet.sourceType to DefaultExternalSourceDirectorySet().also { dirSet ->

idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunnerUtil.kt

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.gradle.execution
 import com.intellij.openapi.module.Module
 import org.jetbrains.plugins.gradle.settings.GradleProjectSettings
 
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 fun isDelegatedBuild(module: Module): Boolean {
     val projectUrl = module.project.presentableUrl
     if (projectUrl == null || !GradleProjectSettings.isDelegatedBuildEnabled(module)) {

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemTestCaseBunch.java

@@ -15,7 +15,7 @@ import com.intellij.testFramework.PlatformTestUtil;
 import org.jetbrains.concurrency.Promise;
 import java.util.Arrays;
 
-//BUNCH: 192
+//FIX ME WHEN BUNCH 192 REMOVED
 class ExternalSystemTestCaseBunch {
 
     protected static boolean isDefaultRefreshCallback(Object callback) {

idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.kt

@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.idea.ThreadTrackerPatcherForTeamCityTesting.patchThr
 import org.jetbrains.kotlin.idea.debugger.filter.addKotlinStdlibDebugFilterIfNeeded
 import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class JvmPluginStartupActivity : StartupActivity {
     override fun runActivity(project: Project) {
         if (isUnitTestMode()) {

idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.kt.192

@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.idea.ThreadTrackerPatcherForTeamCityTesting.patchThr
 import org.jetbrains.kotlin.idea.debugger.filter.addKotlinStdlibDebugFilterIfNeeded
 import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class JvmPluginStartupComponent : BaseComponent {
     override fun getComponentName(): String = JvmPluginStartupComponent::class.java.name
 

idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.kt

@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.js.JavaScript
 import java.io.PrintStream
 import java.io.PrintWriter
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class KotlinCompilerStartupActivity : StartupActivity {
     // Extending PluginException ensures that Exception Analyzer recognizes this as a Kotlin exception
     private class KotlinCompilerException(private val text: String) :

idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.kt.192

@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.js.JavaScript
 import java.io.PrintStream
 import java.io.PrintWriter
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class KotlinCompilerManager(project: Project, manager: CompilerManager) : ProjectComponent {
     // Extending PluginException ensures that Exception Analyzer recognizes this as a Kotlin exception
     private class KotlinCompilerException(private val text: String) :

idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchFileModuleInfoProvider.kt

@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.util.projectStructure.getModule
 import org.jetbrains.kotlin.parsing.KotlinParserDefinition.Companion.STD_SCRIPT_SUFFIX
 import org.jetbrains.kotlin.psi.KtFile
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class ScratchFileModuleInfoProvider : StartupActivity {
     private val LOG = Logger.getInstance(this.javaClass)
 

idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchFileModuleInfoProvider.kt.192

@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.util.projectStructure.getModule
 import org.jetbrains.kotlin.parsing.KotlinParserDefinition.Companion.STD_SCRIPT_SUFFIX
 import org.jetbrains.kotlin.psi.KtFile
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class ScratchFileModuleInfoProvider(val project: Project) : ProjectComponent {
     private val LOG = Logger.getInstance(this.javaClass)
 

idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.liveTemplates;
 
 import com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider;
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 public class KotlinLiveTemplatesProvider implements DefaultLiveTemplatesProvider {
     @Override
     public String[] getDefaultLiveTemplateFiles() {

idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt

@@ -9,7 +9,7 @@ import com.intellij.codeInsight.template.impl.TemplateManagerImpl
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.project.Project
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun setTemplateTestingCompat(project: Project, disposable: Disposable) {
     TemplateManagerImpl.setTemplateTesting(project, disposable)
 }

idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt.201

@@ -9,7 +9,7 @@ import com.intellij.codeInsight.template.impl.TemplateManagerImpl
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.project.Project
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun setTemplateTestingCompat(project: Project, disposable: Disposable) {
     TemplateManagerImpl.setTemplateTesting(disposable)
 }

idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinImporterComponentCompat.kt

@@ -8,6 +8,6 @@ package org.jetbrains.kotlin.idea.maven
 import com.intellij.openapi.module.Module
 import org.jetbrains.kotlin.idea.util.application.getServiceSafe
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 internal val Module.kotlinImporterComponent: KotlinImporterComponent
     get() = this.getServiceSafe()

idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinImporterComponentCompat.kt.192

@@ -7,6 +7,6 @@ package org.jetbrains.kotlin.idea.maven
 
 import com.intellij.openapi.module.Module
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 internal val Module.kotlinImporterComponent: KotlinImporterComponent
     get() = getComponent(KotlinImporterComponent::class.java) ?: throw IllegalStateException("No maven importer state configured")

idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenImportListener.kt

@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.idea.configuration.KotlinMigrationProjectService
 import org.jetbrains.kotlin.idea.configuration.notifyOutdatedBundledCompilerIfNecessary
 import org.jetbrains.kotlin.idea.util.ProgressIndicatorUtils.runUnderDisposeAwareIndicator
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class MavenImportListener : StartupActivity {
 
     override fun runActivity(project: Project) {

idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenImportListener.kt.192

@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.configuration.KotlinMigrationProjectService
 import org.jetbrains.kotlin.idea.configuration.notifyOutdatedBundledCompilerIfNecessary
 import org.jetbrains.kotlin.idea.util.ProgressIndicatorUtils.runUnderDisposeAwareIndicator
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class MavenImportListener(val project: Project) : MavenProjectsManager.Listener {
     init {
         project.messageBus.connect(project).subscribe(

idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeFileTypeFactory.kt

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.ide.konan
 import com.intellij.openapi.fileTypes.FileTypeConsumer
 import com.intellij.openapi.fileTypes.FileTypeFactory
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class KotlinNativeFileTypeFactory : FileTypeFactory() {
     override fun createFileTypes(consumer: FileTypeConsumer) {
         consumer.consume(NativeDefinitionsFileType, KOTLIN_NATIVE_DEFINITIONS_FILE_EXTENSION)

idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.191

@@ -28,7 +28,7 @@ import org.jetbrains.plugins.gradle.action.ImportProjectFromScriptAction
 import org.jetbrains.plugins.gradle.util.GradleConstants
 import java.nio.file.Path
 
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 class IdeaGradleWizardService(private val project: Project) : ProjectImportingWizardService,
     IdeaWizardService {
     override fun isSuitableFor(buildSystemType: BuildSystemType): Boolean =

idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.192

@@ -28,7 +28,7 @@ import org.jetbrains.plugins.gradle.action.ImportProjectFromScriptAction
 import org.jetbrains.plugins.gradle.util.GradleConstants
 import java.nio.file.Path
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class IdeaGradleWizardService(private val project: Project) : ProjectImportingWizardService,
     IdeaWizardService {
     override fun isSuitableFor(buildSystemType: BuildSystemType): Boolean =

idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.201

@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.isGradle
 import org.jetbrains.plugins.gradle.service.project.open.linkAndRefreshGradleProject
 import java.nio.file.Path
 
-// BUNCH: 201
+// FIX ME WHEN BUNCH 201 REMOVED
 class IdeaGradleWizardService(private val project: Project) : ProjectImportingWizardService,
     IdeaWizardService {
     override fun isSuitableFor(buildSystemType: BuildSystemType): Boolean =

idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightTestCase.kt

@@ -10,7 +10,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase
 import com.intellij.util.ThrowableRunnable
 
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class KotlinLightPlatformCodeInsightTestCase : LightPlatformCodeInsightTestCase() {
     protected inline val project_: Project get() = project
     protected inline val editor_: Editor get() = editor

idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightTestCase.kt.191

@@ -11,7 +11,7 @@ import com.intellij.testFramework.LightPlatformCodeInsightTestCase
 import com.intellij.testFramework.LightPlatformTestCase
 import com.intellij.util.ThrowableRunnable
 
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class KotlinLightPlatformCodeInsightTestCase : LightPlatformCodeInsightTestCase() {
     protected inline val project_: Project get() = LightPlatformTestCase.getProject()
     protected inline val editor_: Editor get() = LightPlatformCodeInsightTestCase.getEditor()

idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt

@@ -10,12 +10,12 @@ import com.intellij.ide.startup.impl.StartupManagerImpl
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupManager
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 fun editorTrackerProjectOpened(project: Project) {
     EditorTracker.getInstance(project)
 }
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun runPostStartupActivitiesOnce(project: Project) {
     (StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivities()
 }

idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.192

@@ -10,12 +10,12 @@ import com.intellij.ide.startup.impl.StartupManagerImpl
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupManager
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 fun editorTrackerProjectOpened(project: Project) {
     project.getComponent(EditorTracker::class.java)?.projectOpened()
 }
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun runPostStartupActivitiesOnce(project: Project) {
     (StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivities()
 }

idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.201

@@ -10,12 +10,12 @@ import com.intellij.ide.startup.impl.StartupManagerImpl
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupManager
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 fun editorTrackerProjectOpened(project: Project) {
     EditorTracker.getInstance(project)
 }
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun runPostStartupActivitiesOnce(project: Project) {
     (StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivitiesRegisteredDynamically()
 }

idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt

@@ -15,8 +15,8 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 import com.intellij.testFramework.LightIdeaTestCase
 
-// BUNCH: as36
+// FIX ME WHEN BUNCH as36 REMOVED
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 @Suppress("DEPRECATION")
 @Deprecated("Use KotlinLightCodeInsightFixtureTestCase instead")
 abstract class KotlinLightCodeInsightTestCase : com.intellij.testFramework.LightCodeInsightTestCase() {
@@ -31,8 +31,8 @@ abstract class KotlinLightCodeInsightTestCase : com.intellij.testFramework.Light
     }
 }
 
-// BUNCH: as36
+// FIX ME WHEN BUNCH as36 REMOVED
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class KotlinLightIdeaTestCase : LightIdeaTestCase() {
     protected inline val project_: Project get() = project
     protected inline val module_: Module get() = module

idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt.191

@@ -17,8 +17,8 @@ import com.intellij.testFramework.LightIdeaTestCase
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase
 import com.intellij.testFramework.LightPlatformTestCase
 
-// BUNCH: as36
+// FIX ME WHEN BUNCH as36 REMOVED
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 @Suppress("DEPRECATION")
 @Deprecated("Use KotlinLightCodeInsightFixtureTestCase instead")
 abstract class KotlinLightCodeInsightTestCase : com.intellij.testFramework.LightCodeInsightTestCase() {
@@ -33,8 +33,8 @@ abstract class KotlinLightCodeInsightTestCase : com.intellij.testFramework.Light
     }
 }
 
-// BUNCH: as36
+// FIX ME WHEN BUNCH as36 REMOVED
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class KotlinLightIdeaTestCase : LightIdeaTestCase() {
     protected inline val project_: Project get() = LightPlatformTestCase.getProject()
     protected inline val module_: Module get() = LightPlatformTestCase.getModule()

idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt.as40

@@ -15,8 +15,8 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 import com.intellij.testFramework.LightIdeaTestCase
 
-// BUNCH: as36
+// FIX ME WHEN BUNCH as36 REMOVED
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 @Suppress("DEPRECATION")
 @Deprecated("Use KotlinLightCodeInsightFixtureTestCase instead")
 abstract class KotlinLightCodeInsightTestCase : com.intellij.testFramework.LightCodeInsightTestCase() {
@@ -31,8 +31,8 @@ abstract class KotlinLightCodeInsightTestCase : com.intellij.testFramework.Light
     }
 }
 
-// BUNCH: as36
+// FIX ME WHEN BUNCH as36 REMOVED
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class KotlinLightIdeaTestCase : LightIdeaTestCase() {
     protected inline val project_: Project get() = project
     protected inline val module_: Module get() = module

idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt

@@ -8,11 +8,11 @@ package org.jetbrains.kotlin.idea.testFramework
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ex.ProjectManagerEx
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun ProjectManagerEx.forceCloseProjectEx(project: Project, dispose: Boolean): Boolean {
     if (!dispose) error("dispose should be true")
     return this.forceCloseProject(project, true)
 }
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 typealias TestApplicationManager = com.intellij.idea.IdeaTestApplication

idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt.201

@@ -8,11 +8,11 @@ package org.jetbrains.kotlin.idea.testFramework
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ex.ProjectManagerEx
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun ProjectManagerEx.forceCloseProjectEx(project: Project, dispose: Boolean): Boolean {
     if (!dispose) error("dispose should be true")
     return this.forceCloseProject(project)
 }
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 typealias TestApplicationManager = com.intellij.testFramework.TestApplicationManager

idea/src/org/jetbrains/kotlin/idea/KotlinBuiltInFileTypeFactory.kt

@@ -21,7 +21,7 @@ import com.intellij.openapi.fileTypes.FileTypeFactory
 import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType
 import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class KotlinBuiltInFileTypeFactory : FileTypeFactory() {
     override fun createFileTypes(consumer: FileTypeConsumer) {
         consumer.consume(KotlinBuiltInFileType, KotlinBuiltInFileType.defaultExtension)

idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt

@@ -5,5 +5,5 @@
 
 package org.jetbrains.kotlin.idea
 
-// BUNCH 201
+// FIX ME WHEN BUNCH 201 REMOVED
 class KotlinDocumentationProvider : KotlinDocumentationProviderCompatBase()

idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt.201

@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtFile
 import java.util.function.Consumer
 
-// BUNCH 201
+// FIX ME WHEN BUNCH 201 REMOVED
 class KotlinDocumentationProvider : KotlinDocumentationProviderCompatBase() {
 
     override fun collectDocComments(file: PsiFile, sink: Consumer<PsiDocCommentBase>) {

idea/src/org/jetbrains/kotlin/idea/KotlinJavaScriptMetaFileTypeFactory.kt

@@ -20,7 +20,7 @@ import com.intellij.openapi.fileTypes.FileTypeConsumer
 import com.intellij.openapi.fileTypes.FileTypeFactory
 import org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileType
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 class KotlinJavaScriptMetaFileTypeFactory : FileTypeFactory() {
     override fun createFileTypes(consumer: FileTypeConsumer) {
         consumer.consume(KotlinJavaScriptMetaFileType, KotlinJavaScriptMetaFileType.defaultExtension)

idea/src/org/jetbrains/kotlin/idea/KotlinModuleFileFactory.java

@@ -21,7 +21,7 @@ import com.intellij.openapi.fileTypes.FileTypeFactory;
 import org.jetbrains.annotations.NotNull;
 
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 public class KotlinModuleFileFactory extends FileTypeFactory {
     @Override
     public void createFileTypes(@NotNull FileTypeConsumer consumer) {

idea/src/org/jetbrains/kotlin/idea/codeInsight/BreadcrumbsProviderCompatBase.kt

@@ -7,5 +7,5 @@ package org.jetbrains.kotlin.idea.codeInsight
 
 import com.intellij.xml.breadcrumbs.BreadcrumbsInfoProvider
 
-// BUNCH 201
+// FIX ME WHEN BUNCH 201 REMOVED
 typealias BreadcrumbsProviderCompatBase = BreadcrumbsInfoProvider

idea/src/org/jetbrains/kotlin/idea/codeInsight/BreadcrumbsProviderCompatBase.kt.201

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.codeInsight
 import com.intellij.ide.ui.UISettings
 import com.intellij.ui.breadcrumbs.BreadcrumbsProvider
 
-// BUNCH 201
+// FIX ME WHEN BUNCH 201 REMOVED
 abstract class BreadcrumbsProviderCompatBase : BreadcrumbsProvider {
     override fun isShownByDefault(): Boolean =
         !UISettings.instance.showMembersInNavigationBar

idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinBreadcrumbsInfoProvider.kt

@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.renderer.render
 import org.jetbrains.kotlin.resolve.calls.callUtil.getValueArgumentsInParentheses
 import kotlin.reflect.KClass
 
-// BUNCH 201
+// FIX ME WHEN BUNCH 201 REMOVED
 class KotlinBreadcrumbsInfoProvider : BreadcrumbsProviderCompatBase() {
     private abstract class ElementHandler<TElement : KtElement>(val type: KClass<TElement>) {
         abstract fun elementInfo(element: TElement): String

idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt

@@ -30,7 +30,7 @@ import java.util.*
 import javax.swing.event.HyperlinkEvent
 import javax.swing.event.HyperlinkListener
 
-// BUNCH 192
+// FIX ME WHEN BUNCH 192 REMOVED
 object ReviewAddedImports {
     @get:TestOnly
     var importsToBeReviewed: Collection<String> = emptyList()

idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt.192

@@ -31,7 +31,7 @@ import java.util.*
 import javax.swing.event.HyperlinkEvent
 import javax.swing.event.HyperlinkListener
 
-// BUNCH 192
+// FIX ME WHEN BUNCH 192 REMOVED
 object ReviewAddedImports {
     @get:TestOnly
     var importsToBeReviewed: Collection<String> = emptyList()

idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMigrationProjectService.kt.192

@@ -5,6 +5,6 @@
 
 package org.jetbrains.kotlin.idea.configuration
 
-// BUNCH: 192
+// FIX ME WHEN BUNCH 192 REMOVED
 typealias KotlinMigrationProjectService = KotlinMigrationProjectComponent
 typealias MigrationTestState = KotlinMigrationProjectComponent.MigrationTestState

idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt

@@ -9,6 +9,6 @@ import com.intellij.slicer.SliceUsage
 import com.intellij.usageView.UsageInfo
 import com.intellij.util.Processor
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 typealias UsageInfoProcessor = Processor<UsageInfo>
 typealias SliceUsageProcessor = Processor<SliceUsage>

idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt.201

@@ -9,6 +9,6 @@ import com.intellij.slicer.SliceUsage
 import com.intellij.usageView.UsageInfo
 import com.intellij.util.Processor
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 typealias UsageInfoProcessor = Processor<in UsageInfo>
 typealias SliceUsageProcessor = Processor<in SliceUsage>

idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt

@@ -12,12 +12,12 @@ import com.intellij.ide.hierarchy.call.CallerMethodsTreeStructure
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiMethod
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun createCallerMethodsTreeStructure(project: Project, method: PsiMethod, scopeType: String): CallerMethodsTreeStructure {
     return CallerMethodsTreeStructure(project, method, scopeType)
 }
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun createCalleeMethodsTreeStructure(project: Project, method: PsiMethod, scopeType: String): CalleeMethodsTreeStructure {
     return CalleeMethodsTreeStructure(project, method, scopeType)
 }

idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt.201

@@ -13,12 +13,12 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiMember
 import com.intellij.psi.PsiMethod
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun createCallerMethodsTreeStructure(project: Project, method: PsiMethod, scopeType: String): CallerMethodsTreeStructure {
     return CallerMethodsTreeStructure(project, method as PsiMember, scopeType)
 }
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun createCalleeMethodsTreeStructure(project: Project, method: PsiMethod, scopeType: String): CalleeMethodsTreeStructure {
     return CalleeMethodsTreeStructure(project, method as PsiMember, scopeType)
 }

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
 
-// BUNCH: as35
+// FIX ME WHEN BUNCH as35 REMOVED
 internal fun createDslStyleIcon(styleId: Int): Icon {
     val globalScheme = EditorColorsManager.getInstance().globalScheme
     val markersColor = globalScheme.getAttributes(DslHighlighterExtension.styleById(styleId)).foregroundColor

idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.191

@@ -13,8 +13,8 @@ import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension
 import javax.swing.Icon
 
-// BUNCH: as35
+// FIX ME WHEN BUNCH as35 REMOVED
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 internal fun createDslStyleIcon(styleId: Int): Icon {
     val globalScheme = EditorColorsManager.getInstance().globalScheme
     val markersColor = globalScheme.getAttributes(DslHighlighterExtension.styleById(styleId)).foregroundColor

idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as35

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.highlighter.markers
 import com.intellij.icons.AllIcons
 import javax.swing.Icon
 
-// BUNCH: as35
+// FIX ME WHEN BUNCH as35 REMOVED
 internal fun createDslStyleIcon(styleId: Int): Icon {
     return AllIcons.Gutter.Colors
 }

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
 
-// BUNCH: as35
+// FIX ME WHEN BUNCH as35 REMOVED
 internal fun createDslStyleIcon(styleId: Int): Icon {
     return AllIcons.Gutter.Colors
 }

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
 
-// BUNCH: as35
+// FIX ME WHEN BUNCH as35 REMOVED
 internal fun createDslStyleIcon(styleId: Int): Icon {
     return AllIcons.Gutter.Colors
 }

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
 
-// BUNCH: as35
+// FIX ME WHEN BUNCH as35 REMOVED
 internal fun createDslStyleIcon(styleId: Int): Icon {
     return AllIcons.Gutter.Colors
 }

idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.navigationToolbar
 import com.intellij.ide.navigationToolbar.AbstractNavBarModelExtension
 import com.intellij.psi.PsiElement
 
-// BUNCH 201
+// FIX ME WHEN BUNCH 201 REMOVED
 abstract class AbstractNavBarModelExtensionCompatBase : AbstractNavBarModelExtension() {
 
     protected abstract fun adjustElementImpl(psiElement: PsiElement?): PsiElement?

idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt.201

@@ -10,7 +10,7 @@ import com.intellij.lang.Language
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.idea.KotlinLanguage
 
-// BUNCH 201
+// FIX ME WHEN BUNCH 201 REMOVED
 abstract class AbstractNavBarModelExtensionCompatBase : StructureAwareNavBarModelExtension() {
 
     protected abstract fun adjustElementImpl(psiElement: PsiElement?): PsiElement?

idea/src/org/jetbrains/kotlin/idea/navigationToolbar/KotlinNavBarModelExtension.kt

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.idea.projectView.KtDeclarationTreeNode.Companion.try
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtFile
 
-// BUNCH 201
+// FIX ME WHEN BUNCH 201 REMOVED
 class KotlinNavBarModelExtension : AbstractNavBarModelExtensionCompatBase() {
     override fun getPresentableText(item: Any?): String? =
         (item as? KtDeclaration)?.let { tryGetRepresentableText(it, it.project) }

idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt

@@ -7,5 +7,5 @@ package org.jetbrains.kotlin.idea.projectView
 
 import com.intellij.ide.util.treeView.AbstractTreeNode
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 typealias AbstractTreeNodeAny = AbstractTreeNode<Any>

idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt.201

@@ -7,5 +7,5 @@ package org.jetbrains.kotlin.idea.projectView
 
 import com.intellij.ide.util.treeView.AbstractTreeNode
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 typealias AbstractTreeNodeAny = AbstractTreeNode<*>

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/BunchedDeprecation.java

@@ -11,7 +11,7 @@ import com.intellij.usageView.UsageInfo;
 
 import java.util.Collection;
 
-// BUNCH: 201
+// FIX ME WHEN BUNCH 201 REMOVED
 final class BunchedDeprecation {
     public static void findNonCodeUsages(
             PsiElement element,

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/BunchedDeprecation.java.201

@@ -12,7 +12,7 @@ import com.intellij.usageView.UsageInfo;
 
 import java.util.Collection;
 
-// BUNCH: 201
+// FIX ME WHEN BUNCH 201 REMOVED
 final class BunchedDeprecation {
     public static void findNonCodeUsages(
             PsiElement element,

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt

@@ -11,7 +11,7 @@ import com.intellij.openapi.ui.Messages.OkCancelResult
 import org.jetbrains.kotlin.descriptors.Visibility
 import javax.swing.Icon
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 
 @OkCancelResult
 fun showOkCancelDialog(

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193

@@ -10,7 +10,7 @@ import com.intellij.openapi.ui.Messages
 import com.intellij.openapi.ui.Messages.OkCancelResult
 import javax.swing.Icon
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 
 @OkCancelResult
 fun showOkCancelDialog(

idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.refactoring.move
 import com.intellij.refactoring.move.MoveHandlerDelegate
 import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesHandler
 
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 typealias MoveHandlerDelegateCompat = MoveHandlerDelegate
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 typealias MoveFilesOrDirectoriesHandlerCompat = MoveFilesOrDirectoriesHandler

idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt.191

@@ -10,7 +10,7 @@ import com.intellij.psi.PsiReference
 import com.intellij.refactoring.move.MoveHandlerDelegate
 import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesHandler
 
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class MoveHandlerDelegateCompat : MoveHandlerDelegate() {
     override fun canMove(elements: Array<PsiElement>, targetContainer: PsiElement?): Boolean =
         canMove(elements, targetContainer, null)
@@ -19,7 +19,7 @@ abstract class MoveHandlerDelegateCompat : MoveHandlerDelegate() {
         super.canMove(elements, targetContainer)
 }
 
-// BUNCH: 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class MoveFilesOrDirectoriesHandlerCompat : MoveFilesOrDirectoriesHandler() {
     override fun canMove(elements: Array<PsiElement>, targetContainer: PsiElement?): Boolean =
         canMove(elements, targetContainer, null)

idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/BunchedDeprecation.java

@@ -11,7 +11,7 @@ import com.intellij.usageView.UsageInfo;
 
 import java.util.Collection;
 
-// BUNCH: 201
+// FIX ME WHEN BUNCH 201 REMOVED
 final class BunchedDeprecation {
     public static void findNonCodeUsages(
             PsiElement element,

idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/BunchedDeprecation.java.201

@@ -12,7 +12,7 @@ import com.intellij.usageView.UsageInfo;
 
 import java.util.Collection;
 
-// BUNCH: 201
+// FIX ME WHEN BUNCH 201 REMOVED
 final class BunchedDeprecation {
     public static void findNonCodeUsages(
             PsiElement element,

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessor.kt

@@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiReference
 import com.intellij.psi.search.SearchScope
 
-// BUNCH 191
+// FIX ME WHEN BUNCH 191 REMOVED
 class RenameKotlinClassifierProcessor : RenameKotlinClassifierProcessorCompat() {
 
     override fun findReferences(

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessor.kt.191

@@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiReference
 import com.intellij.psi.search.SearchScope
 
-// BUNCH 191
+// FIX ME WHEN BUNCH 191 REMOVED
 class RenameKotlinClassifierProcessor : RenameKotlinClassifierProcessorCompat() {
 
     override fun findReferences(element: PsiElement): Collection<PsiReference> {

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessorCompat.kt

@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.utils.SmartList
 import java.util.*
 
-// BUNCH 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class RenameKotlinClassifierProcessorCompat : RenameKotlinPsiProcessor() {
     override fun canProcessElement(element: PsiElement): Boolean {
         return element is KtClassOrObject || element is KtLightClass || element is KtConstructor<*> || element is KtTypeAlias

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt

@@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiReference
 import com.intellij.psi.search.SearchScope
 
-// BUNCH 191
+// FIX ME WHEN BUNCH 191 REMOVED
 class RenameKotlinFunctionProcessor : RenameKotlinFunctionProcessorCompat() {
 
     override fun findReferences(

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt.191

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiReference
 
-// BUNCH 191
+// FIX ME WHEN BUNCH 191 REMOVED
 class RenameKotlinFunctionProcessor : RenameKotlinFunctionProcessorCompat() {
 
     override fun findReferences(element: PsiElement): Collection<PsiReference> {

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessorCompat.kt

@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import java.util.*
 
-// BUNCH 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class RenameKotlinFunctionProcessorCompat : RenameKotlinPsiProcessor() {
     private val javaMethodProcessorInstance = RenameJavaMethodProcessor()
 

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt

@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded
 import org.jetbrains.kotlin.resolve.DataClassDescriptorResolver
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 
-// BUNCH 191
+// FIX ME WHEN BUNCH 191 REMOVED
 class RenameKotlinPropertyProcessor : RenameKotlinPropertyProcessorCompat() {
 
     override fun findReferences(

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt.191

@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded
 import org.jetbrains.kotlin.resolve.DataClassDescriptorResolver
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 
-// BUNCH 191
+// FIX ME WHEN BUNCH 191 REMOVED
 class RenameKotlinPropertyProcessor : RenameKotlinPropertyProcessorCompat() {
 
     override fun findReferences(element: PsiElement): Collection<PsiReference> {

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessorCompat.kt

@@ -54,7 +54,7 @@ import org.jetbrains.kotlin.util.findCallableMemberBySignature
 import org.jetbrains.kotlin.utils.DFS
 import org.jetbrains.kotlin.utils.SmartList
 
-// BUNCH 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class RenameKotlinPropertyProcessorCompat : RenameKotlinPsiProcessor() {
     override fun canProcessElement(element: PsiElement): Boolean {
         val namedUnwrappedElement = element.namedUnwrappedElement

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt

@@ -11,7 +11,7 @@ import com.intellij.psi.search.SearchScope
 import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions
 import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchParameters
 
-// BUNCH 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class RenameKotlinPsiProcessor : RenameKotlinPsiProcessorCompat() {
 
     override fun findReferences(

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.191

@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchPar
 import org.jetbrains.kotlin.idea.search.or
 import org.jetbrains.kotlin.idea.search.projectScope
 
-// BUNCH 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class RenameKotlinPsiProcessor : RenameKotlinPsiProcessorCompat() {
 
     override fun findReferences(element: PsiElement): Collection<PsiReference> {

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessorCompat.kt

@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.resolve.ImportPath
 import java.util.ArrayList
 import kotlin.collections.*
 
-// BUNCH 191
+// FIX ME WHEN BUNCH 191 REMOVED
 abstract class RenameKotlinPsiProcessorCompat : RenamePsiElementProcessor() {
     class MangledJavaRefUsageInfo(
         val manglingSuffix: String,

idea/src/org/jetbrains/kotlin/idea/startupCompat.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea
 
 import com.intellij.openapi.project.Project
 
-// BUNCH: 193
+// FIX ME WHEN BUNCH 193 REMOVED
 fun runActivity(project: Project) {
     // nothing for 193
 }

idea/src/org/jetbrains/kotlin/idea/startupCompat.kt.201

@@ -14,7 +14,7 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.util.concurrency.AppExecutorUtil
 import java.util.concurrent.Callable
 
-// BUNCH: 201
+// FIX ME WHEN BUNCH 201 REMOVED
 
 fun runActivity(project: Project) {
     nonBlocking(Callable {