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.
This commit is contained in:
Nikolay Krasko
2019-01-17 16:12:08 +03:00
parent 36b2640ab7
commit 046a0e059c
16 changed files with 24 additions and 22 deletions
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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
@@ -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>
@@ -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>
@@ -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
}
},
@@ -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)
@@ -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) {
@@ -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) {
@@ -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
@@ -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>
@@ -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>
@@ -7,5 +7,6 @@ package org.jetbrains.kotlin.test
import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture
// BUNCH: 181
@Suppress("IncompatibleAPI")
class HierarchyViewTestFixture : HierarchyViewTestFixture()
@@ -5,5 +5,6 @@
package org.jetbrains.kotlin.test
// BUNCH: 181
@Suppress("IncompatibleAPI")
class HierarchyViewTestFixture : HierarchyViewTestFixtureCompat()
@@ -20,7 +20,7 @@ import java.util.*;
*
* Use org.jetbrains.kotlin.test.HierarchyViewTestFixture typealias instead.
*
* BUNCH: 182
* BUNCH: 181
*/
@SuppressWarnings("ALL")
public class HierarchyViewTestFixtureCompat {