From 046a0e059c7cc2dd2192fe62ff4df7b185374078 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 17 Jan 2019 16:12:08 +0300
Subject: [PATCH] Always add last version of idea for which change is needed to
 BUNCH

BUNCH directive should contain last idea IDEA version this change is
meant for.
---
 .../psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt   | 2 +-
 .../src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.181   | 2 +-
 .../src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.182   | 2 +-
 .../kotlin/idea/formatter/KtCodeStyleSettings.kt          | 2 +-
 .../jetbrains/kotlin/compatibility/ExecutorProcessor.kt   | 2 +-
 .../kotlin/compatibility/ExecutorProcessor.kt.181         | 2 +-
 .../kotlin/idea/completion/LookupCancelWatcher.kt         | 6 +++---
 .../ui/notifications/NewCodeStyleNotification.kt          | 2 +-
 .../org/jetbrains/kotlin/idea/internal/baseDecompiler.kt  | 2 +-
 .../jetbrains/kotlin/idea/internal/baseDecompiler.kt.181  | 2 +-
 .../run/JavaRunConfigurationExtensionManagerUtil.java     | 2 +-
 .../kotlin/idea/run/runConfigurationsCompat.kt.182        | 8 ++++----
 .../kotlin/idea/run/runConfigurationsCompat.kt.as34       | 8 ++++----
 .../org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt | 1 +
 .../jetbrains/kotlin/test/HierarchyViewTestFixture.kt.181 | 1 +
 .../kotlin/test/HierarchyViewTestFixtureCompat.java       | 2 +-
 16 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt b/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt
index f1f6d59ddbe..6f002f8432f 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt
+++ b/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt
@@ -12,7 +12,7 @@ import com.intellij.util.AstLoadingFilter
 /**
  * Absent in 181. Methods were renamed in 183.
  *
- * BUNCH: 183
+ * BUNCH: 182
  */
 @Suppress("IncompatibleAPI")
 object AstLoadingFilter {
diff --git a/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.181 b/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.181
index 83a3758c2a3..c0823d19a01 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.181
+++ b/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.181
@@ -11,7 +11,7 @@ import com.intellij.psi.PsiFile
 /**
  * Absent in 181. Methods were renamed in 183.
  *
- * BUNCH: 183
+ * BUNCH: 182
  */
 @Suppress("IncompatibleAPI")
 object AstLoadingFilter {
diff --git a/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.182 b/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.182
index 99dae84a78a..bdb4d21676b 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.182
+++ b/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.182
@@ -12,7 +12,7 @@ import com.intellij.util.AstLoadingFilter
 /**
  * Absent in 181. Methods were renamed in 183.
  *
- * BUNCH: 183
+ * BUNCH: 182
  */
 @Suppress("IncompatibleAPI")
 object AstLoadingFilter {
diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KtCodeStyleSettings.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KtCodeStyleSettings.kt
index f6fab5fbaa5..0d07ae9afae 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KtCodeStyleSettings.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KtCodeStyleSettings.kt
@@ -31,7 +31,7 @@ fun KtCodeStyleSettings.restore() {
 }
 
 fun ktCodeStyleSettings(project: Project): KtCodeStyleSettings? {
-    @Suppress("DEPRECATION") // Suggested update is not supported in 173. BUNCH: 181
+    @Suppress("DEPRECATION") // Suggested update is not supported in 173. BUNCH: 173
     val settings = CodeStyleSettingsManager.getSettings(project)
 
     val ktCommonSettings = settings.getCommonSettings(KotlinLanguage.INSTANCE) as KotlinCommonCodeStyleSettings
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt b/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt
index 245123922d3..7800a8f2d94 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt
@@ -9,6 +9,6 @@ import com.intellij.util.Processor
 
 /**
  * Processor<T> till IDEA 181 and Processor<in T> since 182.
- * BUNCH: 182
+ * BUNCH: 181
  */
 typealias ExecutorProcessor<T> = Processor<in T>
\ No newline at end of file
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt.181 b/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt.181
index 197d921880d..19f50784245 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt.181
+++ b/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt.181
@@ -9,6 +9,6 @@ import com.intellij.util.Processor
 
 /**
  * Processor<T> till IDEA 181 and Processor<in T> since 182.
- * BUNCH: 182
+ * BUNCH: 181
  */
 typealias ExecutorProcessor<T> = Processor<T>
\ No newline at end of file
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelWatcher.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelWatcher.kt
index 4e134437aed..b1dd41fa37e 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelWatcher.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelWatcher.kt
@@ -93,12 +93,12 @@ class LookupCancelWatcher(val project: Project) : ProjectComponent {
         }
 
         override fun itemSelected(event: LookupEvent) {
-            // BUNCH: 183
+            // BUNCH: 182
             // Has default implementation since 183
         }
 
         override fun currentItemChanged(event: LookupEvent) {
-            // BUNCH: 183
+            // BUNCH: 182
             // Has default implementation since 183
         }
     }
@@ -113,7 +113,7 @@ class LookupCancelWatcher(val project: Project) : ProjectComponent {
                 }
 
                 override fun editorCreated(event: EditorFactoryEvent) {
-                    // BUNCH: 183 Has default implementation since 183
+                    // BUNCH: 182 Has default implementation since 183
                     // Do nothing
                 }
             },
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/NewCodeStyleNotification.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/NewCodeStyleNotification.kt
index 0cc45b92739..58dba53b9e3 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/NewCodeStyleNotification.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/NewCodeStyleNotification.kt
@@ -22,7 +22,7 @@ private const val KOTLIN_UPDATE_CODE_STYLE_PROPERTY_NAME = "update.kotlin.code.s
 fun notifyKotlinStyleUpdateIfNeeded(project: Project) {
     if (!isDefaultOfficialCodeStyle) return
 
-    @Suppress("DEPRECATION") // Suggested fix is absent in 173. BUNCH: 181
+    @Suppress("DEPRECATION") // Suggested fix is absent in 173. BUNCH: 173
     val isProjectSettings = CodeStyleSettingsManager.getInstance(project).USE_PER_PROJECT_SETTINGS
     val settingsComponent: PropertiesComponent = if (isProjectSettings) {
         PropertiesComponent.getInstance(project)
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt
index 749b5dff138..a50e72a59bf 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt
@@ -10,7 +10,7 @@ import java.io.File
 
 /**
  * `addSpace` method is deprecated in 182. `addSource` and `addLibrary` were introduced instead.
- * BUNCH: 182
+ * BUNCH: 181
  */
 @Suppress("IncompatibleAPI")
 fun BaseDecompiler.addSpaceEx(file: File, isOwn: Boolean) {
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt.181 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt.181
index a476e852491..5bcc51cbe8e 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt.181
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt.181
@@ -10,7 +10,7 @@ import java.io.File
 
 /**
  * `addSpace` method is deprecated in 182. `addSource` and `addLibrary` were introduced instead.
- * BUNCH: 182
+ * BUNCH: 181
  */
 @Suppress("IncompatibleAPI")
 fun BaseDecompiler.addSpaceEx(file: File, isOwn: Boolean) {
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JavaRunConfigurationExtensionManagerUtil.java b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JavaRunConfigurationExtensionManagerUtil.java
index 310549f8a33..0bb495edad8 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JavaRunConfigurationExtensionManagerUtil.java
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JavaRunConfigurationExtensionManagerUtil.java
@@ -10,7 +10,7 @@ import com.intellij.execution.JavaRunConfigurationExtensionManager;
 // Introduced for compatibility reasons only.
 // Method JavaRunConfigurationExtensionManager.getInstance() was rewritten to Kotlin in 191 and
 // can't be called from Kotlin anymore.
-// BUNCH: 191
+// BUNCH: 183
 public class JavaRunConfigurationExtensionManagerUtil {
     public static JavaRunConfigurationExtensionManager getInstance() {
         //noinspection IncompatibleAPI
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.182 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.182
index 76daf1f43e5..7a82284416a 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.182
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.182
@@ -13,17 +13,17 @@ import com.intellij.execution.configurations.RunConfigurationBase
 import org.jdom.Element
 
 // Generalized in 183
-// BUNCH: 183
+// BUNCH: 182
 typealias RunConfigurationBaseAny = RunConfigurationBase
 
 // Generalized in 183
-// BUNCH: 183
+// BUNCH: 182
 typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*>
 
 // Generalized in 183
-// BUNCH: 183
+// BUNCH: 182
 typealias LocatableConfigurationBaseAny = LocatableConfigurationBase
 
 // Generalized in 183
-// BUNCH: 183
+// BUNCH: 182
 typealias ModuleBasedConfigurationElement<T> = ModuleBasedConfiguration<T>
\ No newline at end of file
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34
index acdce22db61..cac768bef53 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34
@@ -13,17 +13,17 @@ import com.intellij.execution.configurations.RunConfigurationBase
 import org.jdom.Element
 
 // Generalized in 183
-// BUNCH: 183
+// BUNCH: 182
 typealias RunConfigurationBaseAny = RunConfigurationBase<*>
 
 // Generalized in 183
-// BUNCH: 183
+// BUNCH: 182
 typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*, *>
 
 // Generalized in 183
-// BUNCH: 183
+// BUNCH: 182
 typealias LocatableConfigurationBaseAny = LocatableConfigurationBase<Any>
 
 // Generalized in 183
-// BUNCH: 183
+// BUNCH: 182
 typealias ModuleBasedConfigurationElement<T> = ModuleBasedConfiguration<T, Element>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt b/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt
index 63fee4b663d..4f143689b52 100644
--- a/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt
+++ b/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt
@@ -7,5 +7,6 @@ package org.jetbrains.kotlin.test
 
 import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture
 
+// BUNCH: 181
 @Suppress("IncompatibleAPI")
 class HierarchyViewTestFixture : HierarchyViewTestFixture()
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt.181 b/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt.181
index 28a6b11271f..613e6b9a8d2 100644
--- a/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt.181
+++ b/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt.181
@@ -5,5 +5,6 @@
 
 package org.jetbrains.kotlin.test
 
+// BUNCH: 181
 @Suppress("IncompatibleAPI")
 class HierarchyViewTestFixture : HierarchyViewTestFixtureCompat()
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixtureCompat.java b/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixtureCompat.java
index f5785fa1e26..d873b82e888 100644
--- a/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixtureCompat.java
+++ b/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixtureCompat.java
@@ -20,7 +20,7 @@ import java.util.*;
  *
  * Use org.jetbrains.kotlin.test.HierarchyViewTestFixture typealias instead.
  *
- * BUNCH: 182
+ * BUNCH: 181
  */
 @SuppressWarnings("ALL")
 public class HierarchyViewTestFixtureCompat {