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

Always add last version of idea for which change is needed to BUNCH

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt
+1 -1
View File
@@ -12,7 +12,7 @@ import com.intellij.util.AstLoadingFilter
/** /**
* Absent in 181. Methods were renamed in 183. * Absent in 181. Methods were renamed in 183.
* *
* BUNCH: 183 * BUNCH: 182
*/ */
@Suppress("IncompatibleAPI") @Suppress("IncompatibleAPI")
object AstLoadingFilter { object AstLoadingFilter {
compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.181
+1 -1
View File
@@ -11,7 +11,7 @@ import com.intellij.psi.PsiFile
/** /**
* Absent in 181. Methods were renamed in 183. * Absent in 181. Methods were renamed in 183.
* *
* BUNCH: 183 * BUNCH: 182
*/ */
@Suppress("IncompatibleAPI") @Suppress("IncompatibleAPI")
object AstLoadingFilter { object AstLoadingFilter {
compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.182
+1 -1
View File
@@ -12,7 +12,7 @@ import com.intellij.util.AstLoadingFilter
/** /**
* Absent in 181. Methods were renamed in 183. * Absent in 181. Methods were renamed in 183.
* *
* BUNCH: 183 * BUNCH: 182
*/ */
@Suppress("IncompatibleAPI") @Suppress("IncompatibleAPI")
object AstLoadingFilter { object AstLoadingFilter {
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KtCodeStyleSettings.kt
+1 -1
View File
@@ -31,7 +31,7 @@ fun KtCodeStyleSettings.restore() {
} }
fun ktCodeStyleSettings(project: Project): KtCodeStyleSettings? { 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 settings = CodeStyleSettingsManager.getSettings(project)
val ktCommonSettings = settings.getCommonSettings(KotlinLanguage.INSTANCE) as KotlinCommonCodeStyleSettings val ktCommonSettings = settings.getCommonSettings(KotlinLanguage.INSTANCE) as KotlinCommonCodeStyleSettings
idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt
+1 -1
View File
@@ -9,6 +9,6 @@ import com.intellij.util.Processor
/** /**
* Processor<T> till IDEA 181 and Processor<in T> since 182. * Processor<T> till IDEA 181 and Processor<in T> since 182.
* BUNCH: 182 * BUNCH: 181
*/ */
typealias ExecutorProcessor<T> = Processor<in T> typealias ExecutorProcessor<T> = Processor<in T>
idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt.181
+1 -1
View File
@@ -9,6 +9,6 @@ import com.intellij.util.Processor
/** /**
* Processor<T> till IDEA 181 and Processor<in T> since 182. * Processor<T> till IDEA 181 and Processor<in T> since 182.
* BUNCH: 182 * BUNCH: 181
*/ */
typealias ExecutorProcessor<T> = Processor<T> typealias ExecutorProcessor<T> = Processor<T>
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelWatcher.kt
+3 -3
View File
@@ -93,12 +93,12 @@ class LookupCancelWatcher(val project: Project) : ProjectComponent {
} }
override fun itemSelected(event: LookupEvent) { override fun itemSelected(event: LookupEvent) {
// BUNCH: 183 // BUNCH: 182
// Has default implementation since 183 // Has default implementation since 183
} }
override fun currentItemChanged(event: LookupEvent) { override fun currentItemChanged(event: LookupEvent) {
// BUNCH: 183 // BUNCH: 182
// Has default implementation since 183 // Has default implementation since 183
} }
} }
@@ -113,7 +113,7 @@ class LookupCancelWatcher(val project: Project) : ProjectComponent {
} }
override fun editorCreated(event: EditorFactoryEvent) { override fun editorCreated(event: EditorFactoryEvent) {
// BUNCH: 183 Has default implementation since 183 // BUNCH: 182 Has default implementation since 183
// Do nothing // Do nothing
} }
}, },
idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/NewCodeStyleNotification.kt
+1 -1
View File
@@ -22,7 +22,7 @@ private const val KOTLIN_UPDATE_CODE_STYLE_PROPERTY_NAME = "update.kotlin.code.s
fun notifyKotlinStyleUpdateIfNeeded(project: Project) { fun notifyKotlinStyleUpdateIfNeeded(project: Project) {
if (!isDefaultOfficialCodeStyle) return 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 isProjectSettings = CodeStyleSettingsManager.getInstance(project).USE_PER_PROJECT_SETTINGS
val settingsComponent: PropertiesComponent = if (isProjectSettings) { val settingsComponent: PropertiesComponent = if (isProjectSettings) {
PropertiesComponent.getInstance(project) PropertiesComponent.getInstance(project)
idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt
+1 -1
View File
@@ -10,7 +10,7 @@ import java.io.File
/** /**
* `addSpace` method is deprecated in 182. `addSource` and `addLibrary` were introduced instead. * `addSpace` method is deprecated in 182. `addSource` and `addLibrary` were introduced instead.
* BUNCH: 182 * BUNCH: 181
*/ */
@Suppress("IncompatibleAPI") @Suppress("IncompatibleAPI")
fun BaseDecompiler.addSpaceEx(file: File, isOwn: Boolean) { fun BaseDecompiler.addSpaceEx(file: File, isOwn: Boolean) {
idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt.181
+1 -1
View File
@@ -10,7 +10,7 @@ import java.io.File
/** /**
* `addSpace` method is deprecated in 182. `addSource` and `addLibrary` were introduced instead. * `addSpace` method is deprecated in 182. `addSource` and `addLibrary` were introduced instead.
* BUNCH: 182 * BUNCH: 181
*/ */
@Suppress("IncompatibleAPI") @Suppress("IncompatibleAPI")
fun BaseDecompiler.addSpaceEx(file: File, isOwn: Boolean) { fun BaseDecompiler.addSpaceEx(file: File, isOwn: Boolean) {
idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JavaRunConfigurationExtensionManagerUtil.java
+1 -1
View File
@@ -10,7 +10,7 @@ import com.intellij.execution.JavaRunConfigurationExtensionManager;
// Introduced for compatibility reasons only. // Introduced for compatibility reasons only.
// Method JavaRunConfigurationExtensionManager.getInstance() was rewritten to Kotlin in 191 and // Method JavaRunConfigurationExtensionManager.getInstance() was rewritten to Kotlin in 191 and
// can't be called from Kotlin anymore. // can't be called from Kotlin anymore.
// BUNCH: 191 // BUNCH: 183
public class JavaRunConfigurationExtensionManagerUtil { public class JavaRunConfigurationExtensionManagerUtil {
public static JavaRunConfigurationExtensionManager getInstance() { public static JavaRunConfigurationExtensionManager getInstance() {
//noinspection IncompatibleAPI //noinspection IncompatibleAPI
idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.182
+4 -4
View File
@@ -13,17 +13,17 @@ import com.intellij.execution.configurations.RunConfigurationBase
import org.jdom.Element import org.jdom.Element
// Generalized in 183 // Generalized in 183
// BUNCH: 183 // BUNCH: 182
typealias RunConfigurationBaseAny = RunConfigurationBase typealias RunConfigurationBaseAny = RunConfigurationBase
// Generalized in 183 // Generalized in 183
// BUNCH: 183 // BUNCH: 182
typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*> typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*>
// Generalized in 183 // Generalized in 183
// BUNCH: 183 // BUNCH: 182
typealias LocatableConfigurationBaseAny = LocatableConfigurationBase typealias LocatableConfigurationBaseAny = LocatableConfigurationBase
// Generalized in 183 // Generalized in 183
// BUNCH: 183 // BUNCH: 182
typealias ModuleBasedConfigurationElement<T> = ModuleBasedConfiguration<T> typealias ModuleBasedConfigurationElement<T> = ModuleBasedConfiguration<T>
idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34
+4 -4
View File
@@ -13,17 +13,17 @@ import com.intellij.execution.configurations.RunConfigurationBase
import org.jdom.Element import org.jdom.Element
// Generalized in 183 // Generalized in 183
// BUNCH: 183 // BUNCH: 182
typealias RunConfigurationBaseAny = RunConfigurationBase<*> typealias RunConfigurationBaseAny = RunConfigurationBase<*>
// Generalized in 183 // Generalized in 183
// BUNCH: 183 // BUNCH: 182
typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*, *> typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*, *>
// Generalized in 183 // Generalized in 183
// BUNCH: 183 // BUNCH: 182
typealias LocatableConfigurationBaseAny = LocatableConfigurationBase<Any> typealias LocatableConfigurationBaseAny = LocatableConfigurationBase<Any>
// Generalized in 183 // Generalized in 183
// BUNCH: 183 // BUNCH: 182
typealias ModuleBasedConfigurationElement<T> = ModuleBasedConfiguration<T, Element> typealias ModuleBasedConfigurationElement<T> = ModuleBasedConfiguration<T, Element>
idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt
+1
View File
@@ -7,5 +7,6 @@ package org.jetbrains.kotlin.test
import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture
// BUNCH: 181
@Suppress("IncompatibleAPI") @Suppress("IncompatibleAPI")
class HierarchyViewTestFixture : HierarchyViewTestFixture() class HierarchyViewTestFixture : HierarchyViewTestFixture()
idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt.181
+1
View File
@@ -5,5 +5,6 @@
package org.jetbrains.kotlin.test package org.jetbrains.kotlin.test
// BUNCH: 181
@Suppress("IncompatibleAPI") @Suppress("IncompatibleAPI")
class HierarchyViewTestFixture : HierarchyViewTestFixtureCompat() class HierarchyViewTestFixture : HierarchyViewTestFixtureCompat()
idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixtureCompat.java
+1 -1
View File
@@ -20,7 +20,7 @@ import java.util.*;
* *
* Use org.jetbrains.kotlin.test.HierarchyViewTestFixture typealias instead. * Use org.jetbrains.kotlin.test.HierarchyViewTestFixture typealias instead.
* *
* BUNCH: 182 * BUNCH: 181
*/ */
@SuppressWarnings("ALL") @SuppressWarnings("ALL")
public class HierarchyViewTestFixtureCompat { public class HierarchyViewTestFixtureCompat {