diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt index f7df51da834..8327a2b97a9 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt +++ b/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) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt.201 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt.201 index 1c2bda70c36..92159dbf2a1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt.201 +++ b/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") diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index 03ac659ff42..5958737f5ef 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/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)) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt index 081be027285..1b2cf1f7396 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt +++ b/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 typealias PsiMethodProcessor = Processor diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.201 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.201 index 43b67859cdb..a265dd04b7d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.201 +++ b/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 typealias PsiMethodProcessor = Processor diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt index f135e8565e3..c4d42a70ec5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt +++ b/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 diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt.201 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt.201 index 1b977f893a0..6a49adbc373 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt.201 +++ b/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 { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt index c80dbfc3846..bf2429cd740 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt @@ -37,7 +37,7 @@ val KOTLIN_CONSOLE_KEY = Key.create("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 diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt index b44a384d3cb..22d8b4bd791 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt +++ b/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 \ No newline at end of file diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt.191 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt.191 index 3272915ebda..13efa013fc7 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt.191 +++ b/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 \ No newline at end of file diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/AbstractKotlinInspection.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/AbstractKotlinInspection.kt index 0e6010c1e27..d386c8c2ebc 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/AbstractKotlinInspection.kt +++ b/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 -> diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt index a66f5a1da88..ffd149674bd 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt +++ b/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 { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt.192 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt.192 index 0945e02b35a..9fb565c27cc 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt.192 +++ b/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 { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCacheCompat.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCacheCompat.kt index 1c03fd10369..6527f3e30fe 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCacheCompat.kt +++ b/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) diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt index 3189682bf1d..fdd15cc431c 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt +++ b/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 } \ No newline at end of file diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt.201 b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt.201 index c9aea01d765..b40f0149539 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt.201 +++ b/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 } \ No newline at end of file diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinFileTypeFactory.java b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinFileTypeFactory.java index 770cee8ee44..8e8d6cbd7c7 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinFileTypeFactory.java +++ b/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 }; diff --git a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeABICompatibilityChecker.kt b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeABICompatibilityChecker.kt index d7939d7c723..296c38a3dca 100644 --- a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeABICompatibilityChecker.kt +++ b/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) { diff --git a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeABICompatibilityChecker.kt.192 b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeABICompatibilityChecker.kt.192 index 83a3cb99ccf..b7c5daeabff 100644 --- a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeABICompatibilityChecker.kt.192 +++ b/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 { diff --git a/idea/idea-gradle-tooling-api/build.gradle.kts b/idea/idea-gradle-tooling-api/build.gradle.kts index f2d52bd5105..5be9ff03cf5 100644 --- a/idea/idea-gradle-tooling-api/build.gradle.kts +++ b/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")) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt index f6f8ea9afab..ec55659d9e8 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt +++ b/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): DataNode { return super.createModule(gradleModule, projectDataNode).also { diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt.201 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt.201 index f87239cfc98..dff12e159aa 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt.201 +++ b/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): DataNode? { return super.createModule(gradleModule, projectDataNode)?.also { diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt index bd522387a0a..6e368343f7e 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt +++ b/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 -> diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunnerUtil.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunnerUtil.kt index c2a76ab0329..a2da161c9b3 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunnerUtil.kt +++ b/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)) { diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemTestCaseBunch.java b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemTestCaseBunch.java index e03926734a4..58feb2fa574 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemTestCaseBunch.java +++ b/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) { diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.kt index 37858315ae0..fa125849959 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.kt +++ b/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()) { diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.kt.192 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.kt.192 index 1a8b85fb694..e05d5b57b3e 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.kt.192 +++ b/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 diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.kt index 869e92463e7..78e79799f0d 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.kt +++ b/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) : diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.kt.192 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.kt.192 index ef6c77c5506..a6cfe00dcf0 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.kt.192 +++ b/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) : diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchFileModuleInfoProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchFileModuleInfoProvider.kt index 540a0a8eeaf..9370f6007eb 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchFileModuleInfoProvider.kt +++ b/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) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchFileModuleInfoProvider.kt.192 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchFileModuleInfoProvider.kt.192 index 300dfef3038..c646ed03791 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchFileModuleInfoProvider.kt.192 +++ b/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) diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java index 3f36b680d56..ee5a24012ca 100644 --- a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java +++ b/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() { diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt index be64290252b..1f4d2a86180 100644 --- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt +++ b/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) } \ No newline at end of file diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt.201 b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt.201 index 20bde361ca3..d7f1fa72b74 100644 --- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt.201 +++ b/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) } \ No newline at end of file diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinImporterComponentCompat.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinImporterComponentCompat.kt index a6756fc52b4..e4914345e2a 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinImporterComponentCompat.kt +++ b/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() diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinImporterComponentCompat.kt.192 b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinImporterComponentCompat.kt.192 index 8190b04ee77..f917c597b1b 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinImporterComponentCompat.kt.192 +++ b/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") diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenImportListener.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenImportListener.kt index 8e8f5dc1711..512742d5680 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenImportListener.kt +++ b/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) { diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenImportListener.kt.192 b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenImportListener.kt.192 index 95b57c7e924..31c78b66427 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenImportListener.kt.192 +++ b/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( diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeFileTypeFactory.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeFileTypeFactory.kt index 47c066807b8..8a60bae66b5 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeFileTypeFactory.kt +++ b/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) diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.191 b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.191 index 6c88c973647..5b339378000 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.191 +++ b/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 = diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.192 b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.192 index 9ab38c1ab00..606797d657f 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.192 +++ b/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 = diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.201 b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.201 index 7b681dec1ec..73cf9b5bf34 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaGradleWizardService.kt.201 +++ b/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 = diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightTestCase.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightTestCase.kt index 22dc91b2bdd..23d5c3c8dd4 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightTestCase.kt +++ b/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 diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightTestCase.kt.191 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightTestCase.kt.191 index 33a9961070a..a5c87290e2c 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightTestCase.kt.191 +++ b/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() diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt index 8b48b93cb6a..9e8fc23e4b9 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt +++ b/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() } \ No newline at end of file diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.192 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.192 index ed2bd266a0d..4360cf4ee64 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.192 +++ b/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() } \ No newline at end of file diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.201 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.201 index 1aeded4356a..dccbbd0ff5d 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.201 +++ b/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() } \ No newline at end of file diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt index 045e0bd2160..ace044f24ce 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt +++ b/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 -// BUNCH: 191 +// FIX ME WHEN BUNCH as36 REMOVED +// 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 -// BUNCH: 191 +// FIX ME WHEN BUNCH as36 REMOVED +// FIX ME WHEN BUNCH 191 REMOVED abstract class KotlinLightIdeaTestCase : LightIdeaTestCase() { protected inline val project_: Project get() = project protected inline val module_: Module get() = module diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt.191 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt.191 index 7d954411a7c..7fd8122ad49 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt.191 +++ b/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 -// BUNCH: 191 +// FIX ME WHEN BUNCH as36 REMOVED +// 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 -// BUNCH: 191 +// FIX ME WHEN BUNCH as36 REMOVED +// 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() diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt.as40 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt.as40 index 045e0bd2160..ace044f24ce 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compatTestWrappers.kt.as40 +++ b/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 -// BUNCH: 191 +// FIX ME WHEN BUNCH as36 REMOVED +// 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 -// BUNCH: 191 +// FIX ME WHEN BUNCH as36 REMOVED +// FIX ME WHEN BUNCH 191 REMOVED abstract class KotlinLightIdeaTestCase : LightIdeaTestCase() { protected inline val project_: Project get() = project protected inline val module_: Module get() = module diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt index 4a9651c7262..e9542b8cb9d 100644 --- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt +++ b/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 diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt.201 b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt.201 index e95b0761400..b2c9e7ed0ff 100644 --- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt.201 +++ b/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 \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinBuiltInFileTypeFactory.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinBuiltInFileTypeFactory.kt index 5bd67b16d2e..47b1f77160d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinBuiltInFileTypeFactory.kt +++ b/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) diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt index b58591088d2..e1c7159a232 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt +++ b/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() \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt.201 b/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt.201 index 68c454a7228..91c6bd97c3b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt.201 +++ b/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) { diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinJavaScriptMetaFileTypeFactory.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinJavaScriptMetaFileTypeFactory.kt index d8eec61abad..939e59bcc2d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinJavaScriptMetaFileTypeFactory.kt +++ b/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) diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinModuleFileFactory.java b/idea/src/org/jetbrains/kotlin/idea/KotlinModuleFileFactory.java index ca26d2b37ab..4e4267b8e35 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinModuleFileFactory.java +++ b/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) { diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/BreadcrumbsProviderCompatBase.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/BreadcrumbsProviderCompatBase.kt index 96a5ecf271a..ed8af9ec992 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/BreadcrumbsProviderCompatBase.kt +++ b/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 \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/BreadcrumbsProviderCompatBase.kt.201 b/idea/src/org/jetbrains/kotlin/idea/codeInsight/BreadcrumbsProviderCompatBase.kt.201 index d331cff93c2..feae10da8d9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/BreadcrumbsProviderCompatBase.kt.201 +++ b/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 diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinBreadcrumbsInfoProvider.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinBreadcrumbsInfoProvider.kt index e6bda2dd7d1..dd55099238c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinBreadcrumbsInfoProvider.kt +++ b/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(val type: KClass) { abstract fun elementInfo(element: TElement): String diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt index 2a21875f94a..27bac9b3777 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt +++ b/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 = emptyList() diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt.192 b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt.192 index d4346096e74..8749cfca711 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt.192 +++ b/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 = emptyList() diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMigrationProjectService.kt.192 b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMigrationProjectService.kt.192 index 3b1ba4fe7f0..19de5d23de4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMigrationProjectService.kt.192 +++ b/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 \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt index fe7b6835a6d..7fbb5130f69 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt +++ b/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 typealias SliceUsageProcessor = Processor \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt.201 b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt.201 index e7fba094016..a8d8434f434 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt.201 +++ b/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 typealias SliceUsageProcessor = Processor \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt index 5099f69ebc8..0b7f86715d6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt +++ b/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) } diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt.201 b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt.201 index b5b7c0f65ce..f107283542f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt.201 +++ b/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) } 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 61a4808b40a..7ab522333af 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt +++ b/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 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 83249ab0a94..41740d2e1f6 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 @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.idea.KotlinIcons import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension import javax.swing.Icon -// BUNCH: as35 -// BUNCH: 191 +// FIX ME WHEN BUNCH as35 REMOVED +// 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 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 fda2d9471e4..81a8246bf13 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 @@ -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 } \ 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 fda2d9471e4..81a8246bf13 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 @@ -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 } \ 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 fda2d9471e4..81a8246bf13 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 @@ -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 } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41 index fda2d9471e4..81a8246bf13 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as41 +++ b/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 } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt b/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt index 9f04f317866..814897acfda 100644 --- a/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt +++ b/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? diff --git a/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt.201 b/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt.201 index ce6da0a6334..5d854f84732 100644 --- a/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt.201 +++ b/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? diff --git a/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/KotlinNavBarModelExtension.kt b/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/KotlinNavBarModelExtension.kt index e26d4c84a02..721bdcd72ee 100644 --- a/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/KotlinNavBarModelExtension.kt +++ b/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) } diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt b/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt index d8037be2158..e05f305edd5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt +++ b/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 \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt.201 b/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt.201 index 323879b2b88..eab090985d7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt.201 +++ b/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<*> \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/BunchedDeprecation.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/BunchedDeprecation.java index 6907d4bee45..b62633af738 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/BunchedDeprecation.java +++ b/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, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/BunchedDeprecation.java.201 b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/BunchedDeprecation.java.201 index 3c624166b2b..4c0d1a7b3ab 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/BunchedDeprecation.java.201 +++ b/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, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt index 4cefdac0746..f39465db594 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt +++ b/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( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193 index 7eb46555ce0..5f3323b8b60 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193 +++ b/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( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt index d79a0cd3f41..354889a78ad 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt +++ b/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 \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt.191 b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt.191 index dfc26cd613f..2c780418520 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt.191 +++ b/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, 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, targetContainer: PsiElement?): Boolean = canMove(elements, targetContainer, null) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/BunchedDeprecation.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/BunchedDeprecation.java index ad4c8a13196..a7542175dec 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/BunchedDeprecation.java +++ b/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, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/BunchedDeprecation.java.201 b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/BunchedDeprecation.java.201 index e39d704475c..04e417a5d18 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/BunchedDeprecation.java.201 +++ b/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, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessor.kt index a16e0dfb342..6783ed5fcb2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessor.kt +++ b/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( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessor.kt.191 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessor.kt.191 index e72bf9c6d5f..67ce5553cf0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessor.kt.191 +++ b/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 { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessorCompat.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessorCompat.kt index 04a09f72ce2..4c31c7a2930 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessorCompat.kt +++ b/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 diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt index 16ba879b1ff..04b22d24030 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt +++ b/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( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt.191 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt.191 index f9c65610ca7..33a8c591ca7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt.191 +++ b/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 { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessorCompat.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessorCompat.kt index 31c661b132c..12cf1991c6d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessorCompat.kt +++ b/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() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt index 875faa911f9..cc4f26ce708 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt +++ b/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( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt.191 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt.191 index c0e8bfaaaa4..48bad4b6239 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt.191 +++ b/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 { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessorCompat.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessorCompat.kt index 3f562f53c9a..f45aeacf509 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessorCompat.kt +++ b/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 diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt index 640a542a64a..cc5a82768b5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt +++ b/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( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.191 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.191 index d74c46d0eca..ee86c364261 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.191 +++ b/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 { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessorCompat.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessorCompat.kt index 64591847e3b..60fd703e789 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessorCompat.kt +++ b/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, diff --git a/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt b/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt index f780bb4dfc9..ba5a504a5b8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt +++ b/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 } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt.201 b/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt.201 index 9106854faa1..391616ac93a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/startupCompat.kt.201 +++ b/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 { diff --git a/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt b/idea/src/org/jetbrains/kotlin/idea/testResourceBundle.kt index 181a7bff37c..65c833b1409 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: as35 +// FIX ME WHEN BUNCH as35 REMOVED fun registerAdditionalResourceBundleInTests() { } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt index 70a94e9f2ca..592e255c2e4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt @@ -32,7 +32,7 @@ import java.io.File * Component forces update for built-in libraries in plugin directory. They are ignored because of * com.intellij.util.indexing.FileBasedIndex.isUnderConfigOrSystem() */ -// BUNCH: 192 +// FIX ME WHEN BUNCH 192 REMOVED class KotlinUpdatePluginStartupActivity : StartupActivity { override fun runActivity(project: Project) { diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt.192 b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt.192 index 92308d328e6..a1a64d7a054 100644 --- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt.192 +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt.192 @@ -33,7 +33,7 @@ private val INSTALLED_KOTLIN_VERSION = "installed.kotlin.plugin.version" * Component forces update for built-in libraries in plugin directory. They are ignored because of * com.intellij.util.indexing.FileBasedIndex.isUnderConfigOrSystem() */ -// BUNCH: 192 +// FIX ME WHEN BUNCH 192 REMOVED class KotlinUpdatePluginComponent : BaseComponent { override fun initComponent() { if (ApplicationManager.getApplication()?.isUnitTestMode == true) { diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt b/idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt index 05056d4dccf..08d9f4b8f3c 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt +++ b/idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt @@ -7,5 +7,5 @@ package org.jetbrains.kotlin.findUsages import com.intellij.util.Processor -// BUNCH 193 +// FIX ME WHEN BUNCH 193 REMOVED typealias ProcessorInCompat = Processor \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt.201 b/idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt.201 index 8c02c468a9c..af83951f5ef 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt.201 +++ b/idea/tests/org/jetbrains/kotlin/findUsages/customUsageSearcher.kt.201 @@ -7,5 +7,5 @@ package org.jetbrains.kotlin.findUsages import com.intellij.util.Processor -// BUNCH 201 +// FIX ME WHEN BUNCH 201 REMOVED typealias ProcessorInCompat = Processor \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/compat.kt b/idea/tests/org/jetbrains/kotlin/idea/compat.kt index e4d67c2312f..7a26ad9faa7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/compat.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/compat.kt @@ -12,7 +12,7 @@ import com.intellij.openapi.util.Computable import com.intellij.testFramework.ExtensionTestUtil import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture -// BUNCH: 193 +// FIX ME WHEN BUNCH 193 REMOVED @Suppress("UNUSED_PARAMETER") fun doHierarchyTestCompat( hierarchyFixture: HierarchyViewTestFixture, diff --git a/idea/tests/org/jetbrains/kotlin/idea/compat.kt.192 b/idea/tests/org/jetbrains/kotlin/idea/compat.kt.192 index 3cf24901394..b26b5abe2c3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/compat.kt.192 +++ b/idea/tests/org/jetbrains/kotlin/idea/compat.kt.192 @@ -12,7 +12,7 @@ import com.intellij.openapi.util.Computable import com.intellij.testFramework.PlatformTestUtil import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture -// BUNCH: 192 +// FIX ME WHEN BUNCH 192 REMOVED @Suppress("UNUSED_PARAMETER") fun doHierarchyTestCompat( hierarchyFixture: HierarchyViewTestFixture, diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/compat.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/compat.kt index 53feb33935b..4131e93814d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/compat.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/compat.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.project.ex.ProjectManagerEx import java.nio.file.Path -// BUNCH: 192 +// FIX ME WHEN BUNCH 192 REMOVED internal fun loadProjectCompat(projectFile: Path): Project { return (ProjectManagerEx.getInstanceEx()).loadProject(projectFile) } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/compat.kt.192 b/idea/tests/org/jetbrains/kotlin/idea/configuration/compat.kt.192 index 553efed8aea..1937528b34b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/compat.kt.192 +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/compat.kt.192 @@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.project.ex.ProjectManagerEx import java.nio.file.Path -// BUNCH: 192 +// FIX ME WHEN BUNCH 192 REMOVED internal fun loadProjectCompat(projectFile: Path): Project { return (ProjectManagerEx.getInstanceEx()).loadProject(projectFile.toFile().path)!! } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt index 491088bca9d..4b0b9bdc2a4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt @@ -10,7 +10,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiFile import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl -// BUNCH: 193 +// FIX ME WHEN BUNCH 193 REMOVED fun invokeIntentionCompat(action: IntentionAction, file: PsiFile, editor: Editor) { CodeInsightTestFixtureImpl.invokeIntention(action, file, editor, action.text) } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt.201 b/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt.201 index a655f32b640..63c5a48cb3f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt.201 +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt.201 @@ -10,7 +10,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiFile import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl -// BUNCH: 193 +// FIX ME WHEN BUNCH 193 REMOVED fun invokeIntentionCompat(action: IntentionAction, file: PsiFile, editor: Editor) { CodeInsightTestFixtureImpl.invokeIntention(action, file, editor) } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt index d6b580d72ab..8fe55471fea 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt @@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.refactoring.move.MoveHandlerDelegate -// BUNCH: 191 +// FIX ME WHEN BUNCH 191 REMOVED internal fun MoveHandlerDelegate.canMoveCompat( elements: Array, targetContainer: PsiElement?, diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt.191 b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt.191 index af52939024c..62b49b228f0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt.191 +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt.191 @@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.refactoring.move.MoveHandlerDelegate -// BUNCH: 191 +// FIX ME WHEN BUNCH 191 REMOVED internal fun MoveHandlerDelegate.canMoveCompat( elements: Array, targetContainer: PsiElement?, diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt index 606c57a59f2..c5bc270533c 100644 --- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.idea.search.or import org.jetbrains.kotlin.idea.search.projectScope import org.jetbrains.kotlin.psi.KtParameter -// BUNCH: 191 +// FIX ME WHEN BUNCH 191 REMOVED internal fun KtParameter.findReferences(renamer: RenamePsiElementProcessor): MutableCollection { val searchScope = this.project.projectScope() or this.useScope diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt.191 b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt.191 index a1b70c14816..a5785c9dbef 100644 --- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt.191 +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt.191 @@ -9,7 +9,7 @@ import com.intellij.psi.PsiReference import com.intellij.refactoring.rename.RenamePsiElementProcessor import org.jetbrains.kotlin.psi.KtParameter -// BUNCH: 191 +// FIX ME WHEN BUNCH 191 REMOVED internal fun KtParameter.findReferences(renamer: RenamePsiElementProcessor): MutableCollection { return renamer.findReferences(this, false)