From 9d5299c0aabaae83b28e778546e90446a245c2f0 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Fri, 16 Feb 2024 14:25:47 +0100 Subject: [PATCH] [platform] API: mark for removal deprecated API without usages (IJPL-275) GitOrigin-RevId: 1675b300f41a37b7b3ea0e2b7a1758a1aae296eb --- .../com/intellij/openapi/fileEditor/FileEditorManagerEvent.kt | 1 + .../daemon/impl/analysis/ErrorQuickFixProvider.java | 2 +- .../src/org/jetbrains/intellij/build/ProductModulesLayout.kt | 2 ++ .../com/intellij/psi/impl/source/codeStyle/IndentHelper.java | 2 ++ platform/core-api/src/com/intellij/util/PlatformUtils.java | 1 + .../src/com/intellij/execution/ui/ObservableConsoleView.java | 2 +- .../openapi/externalSystem/importing/ImportSpecBuilder.java | 2 +- .../externalSystem/autoimport/ProjectNotificationAware.kt | 2 ++ .../execution/ExternalSystemRunConfigurationExtension.java | 2 +- .../project/trusted/ExternalSystemTrustedProjectDialog.kt | 2 ++ .../src/com/intellij/diagnostic/PerformanceWatcher.kt | 2 ++ .../src/com/intellij/psi/search/FilenameIndex.java | 2 +- .../src/com/intellij/codeInspection/IntentionWrapper.java | 2 +- .../com/intellij/execution/actions/ConfigurationContext.java | 2 +- .../com/intellij/execution/actions/PreferredProducerFind.java | 2 +- .../execution/junit/RuntimeConfigurationProducer.java | 2 +- .../daemon/impl/tooltips/TooltipActionProvider.java | 2 +- .../codeInsight/hints/settings/InlayHintsConfigurable.kt | 1 + .../intention/impl/config/IntentionDescriptionPanel.java | 2 +- .../intellij/refactoring/rename/inplace/TemplateInlayUtil.kt | 1 + .../com/intellij/openapi/wm/WelcomeScreenCustomization.java | 2 +- .../platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.kt | 3 +++ .../platform-api/src/com/intellij/util/OpenSourceUtil.java | 4 ++-- .../platform-api/src/com/intellij/util/config/Storage.java | 2 +- .../src/com/intellij/ide/actions/QuickChangeLookAndFeel.java | 2 +- .../platform-impl/src/com/intellij/ide/actions/Switcher.kt | 2 ++ .../platform-impl/src/com/intellij/ide/wizard/UIWizardUtil.kt | 3 +++ .../com/intellij/openapi/fileChooser/ex/LocalFsFinder.java | 2 +- .../platform-impl/src/com/intellij/openapi/ui/FrameWrapper.kt | 2 ++ .../src/com/intellij/ui/TableSpeedSearchBase.java | 2 +- .../src/com/intellij/ui/tree/AsyncTreeModel.java | 2 +- .../src/com/intellij/openapi/roots/ProjectFileIndex.java | 2 +- .../find/findUsages/PsiElement2UsageTargetAdapter.java | 2 +- .../src/com/intellij/testFramework/LightPlatformTestCase.java | 2 +- .../src/com/intellij/testFramework/PsiTestData.java | 2 +- .../fixtures/LightPlatformCodeInsightFixtureTestCase.java | 2 +- .../src/com/intellij/testFramework/junit5/dynamicTests.kt | 2 ++ platform/util-ex/src/com/intellij/util/containers/Queue.java | 2 +- .../util/base/src/com/intellij/reference/SoftReference.java | 2 ++ .../src/com/intellij/openapi/util/io/UniqueNameBuilder.java | 3 +++ .../util/src/com/intellij/util/containers/ContainerUtil.java | 3 +++ .../util/ui/src/com/intellij/ui/BooleanTableCellEditor.java | 2 +- platform/util/ui/src/com/intellij/util/ui/UIUtil.java | 2 +- .../src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java | 4 ++-- .../src/com/intellij/openapi/vcs/VcsConfiguration.java | 4 ++-- .../com/intellij/openapi/vcs/changes/LocalCommitExecutor.java | 2 +- .../src/com/intellij/openapi/vcs/changes/VcsDirtyScope.java | 4 ++-- .../com/intellij/openapi/vcs/changes/patch/PatchWriter.java | 2 +- .../openapi/vcs/changes/ui/CommitChangeListDialog.java | 2 +- .../intellij/openapi/vcs/ex/PartialLocalLineStatusTracker.kt | 3 +++ .../src/com/intellij/warmup/ProjectBuildWarmupSupport.kt | 1 + 51 files changed, 74 insertions(+), 36 deletions(-) diff --git a/platform/analysis-api/src/com/intellij/openapi/fileEditor/FileEditorManagerEvent.kt b/platform/analysis-api/src/com/intellij/openapi/fileEditor/FileEditorManagerEvent.kt index 79bcc75d8e08..b97c4114258c 100644 --- a/platform/analysis-api/src/com/intellij/openapi/fileEditor/FileEditorManagerEvent.kt +++ b/platform/analysis-api/src/com/intellij/openapi/fileEditor/FileEditorManagerEvent.kt @@ -27,6 +27,7 @@ class FileEditorManagerEvent @ApiStatus.ScheduledForRemoval @Deprecated("Use con newProvider = newEditorWithProvider?.provider) @Deprecated("Use constructor accepting {@link FileEditorWithProvider}") + @ApiStatus.ScheduledForRemoval constructor(manager: FileEditorManager, oldFile: VirtualFile?, oldEditor: FileEditor?, diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ErrorQuickFixProvider.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ErrorQuickFixProvider.java index 04a5268f78cf..5085c81e6578 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ErrorQuickFixProvider.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ErrorQuickFixProvider.java @@ -13,7 +13,7 @@ public interface ErrorQuickFixProvider extends PossiblyDumbAware { /** * @deprecated implement {@link #registerErrorQuickFix(PsiErrorElement, HighlightInfo.Builder)} instead */ - @Deprecated + @Deprecated(forRemoval = true) default void registerErrorQuickFix(@NotNull PsiErrorElement errorElement, @NotNull HighlightInfo highlightInfo) { } diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/ProductModulesLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/ProductModulesLayout.kt index ef4d810625d8..c619f5a862d9 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/ProductModulesLayout.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/ProductModulesLayout.kt @@ -9,6 +9,7 @@ import kotlinx.collections.immutable.PersistentList import kotlinx.collections.immutable.PersistentSet import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentSetOf +import org.jetbrains.annotations.ApiStatus import org.jetbrains.intellij.build.impl.PlatformLayout import org.jetbrains.intellij.build.impl.PluginLayout import java.util.function.BiConsumer @@ -82,6 +83,7 @@ class ProductModulesLayout { internal var platformLayoutSpec = persistentListOf<(PlatformLayout, BuildContext) -> Unit>() @Deprecated("PlatformLayout should be immutable", replaceWith = ReplaceWith("addPlatformSpec")) + @ApiStatus.ScheduledForRemoval fun addPlatformCustomizer(customizer: BiConsumer) { platformLayoutSpec = platformLayoutSpec.add { layout, context -> customizer.accept(layout, context) diff --git a/platform/core-api/src/com/intellij/psi/impl/source/codeStyle/IndentHelper.java b/platform/core-api/src/com/intellij/psi/impl/source/codeStyle/IndentHelper.java index f7fad53c6c41..c50d86f81503 100644 --- a/platform/core-api/src/com/intellij/psi/impl/source/codeStyle/IndentHelper.java +++ b/platform/core-api/src/com/intellij/psi/impl/source/codeStyle/IndentHelper.java @@ -6,6 +6,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; public abstract class IndentHelper { @@ -17,6 +18,7 @@ public abstract class IndentHelper { * @deprecated Use {@link #getIndent(PsiFile, ASTNode, boolean)} */ @Deprecated + @ApiStatus.ScheduledForRemoval public final int getIndent(Project project, FileType fileType, ASTNode element, boolean includeNonSpace) { return getIndent(getFile(element), element, includeNonSpace); } diff --git a/platform/core-api/src/com/intellij/util/PlatformUtils.java b/platform/core-api/src/com/intellij/util/PlatformUtils.java index 551bff230ac9..b20a18beff21 100644 --- a/platform/core-api/src/com/intellij/util/PlatformUtils.java +++ b/platform/core-api/src/com/intellij/util/PlatformUtils.java @@ -55,6 +55,7 @@ public final class PlatformUtils { * @deprecated Code With Me Guest is an old name for JetBrains Client */ @Deprecated + @ApiStatus.ScheduledForRemoval public static final String CWM_GUEST_PREFIX = "CodeWithMeGuest"; public static final String JETBRAINS_CLIENT_PREFIX = "JetBrainsClient"; public static final String GATEWAY_PREFIX = "Gateway"; diff --git a/platform/execution/src/com/intellij/execution/ui/ObservableConsoleView.java b/platform/execution/src/com/intellij/execution/ui/ObservableConsoleView.java index b28fd32c0ce1..a4e763b917c8 100644 --- a/platform/execution/src/com/intellij/execution/ui/ObservableConsoleView.java +++ b/platform/execution/src/com/intellij/execution/ui/ObservableConsoleView.java @@ -29,7 +29,7 @@ public interface ObservableConsoleView { /** * @deprecated Use {@link #textAdded(String, ConsoleViewContentType)} instead */ - @Deprecated + @Deprecated(forRemoval = true) default void contentAdded(@NotNull Collection types) {} default void textAdded(@NotNull String text, @NotNull ConsoleViewContentType type) {} } diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/importing/ImportSpecBuilder.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/importing/ImportSpecBuilder.java index a9c59b93d8cf..3bbeff5b16e8 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/importing/ImportSpecBuilder.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/importing/ImportSpecBuilder.java @@ -50,7 +50,7 @@ public class ImportSpecBuilder { /** * @deprecated see {@link ImportSpecBuilder#forceWhenUptodate(boolean)} */ - @Deprecated + @Deprecated(forRemoval = true) public ImportSpecBuilder forceWhenUptodate() { return forceWhenUptodate(true); } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/ProjectNotificationAware.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/ProjectNotificationAware.kt index 1720d810f0c0..bb3dc1175e41 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/ProjectNotificationAware.kt +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/ProjectNotificationAware.kt @@ -5,10 +5,12 @@ import com.intellij.openapi.Disposable import com.intellij.openapi.components.Service import com.intellij.openapi.externalSystem.model.ProjectSystemId import com.intellij.openapi.project.Project +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.TestOnly @Suppress("TestOnlyProblems") @Deprecated("This API was replaced", ReplaceWith("ExternalSystemProjectNotificationAware", "com.intellij.openapi.externalSystem.autoimport.ExternalSystemProjectNotificationAware")) +@ApiStatus.ScheduledForRemoval @Service(Service.Level.PROJECT) final class ProjectNotificationAware(private val project: Project) : ExternalSystemProjectNotificationAware, Disposable { override fun notificationNotify(projectAware: ExternalSystemProjectAware) { diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfigurationExtension.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfigurationExtension.java index 2966a5a4617a..387951cf83a0 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfigurationExtension.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfigurationExtension.java @@ -14,7 +14,7 @@ import org.jetbrains.annotations.Nullable; * @deprecated Use {@link com.intellij.openapi.externalSystem.service.execution.configuration.ExternalSystemRunConfigurationExtension} * and {@code com.intellij.externalSystem.runConfigurationEx} extension point name. */ -@Deprecated +@Deprecated(forRemoval = true) public interface ExternalSystemRunConfigurationExtension { void readExternal(@NotNull ExternalSystemRunConfiguration configuration, @NotNull Element element); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/trusted/ExternalSystemTrustedProjectDialog.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/trusted/ExternalSystemTrustedProjectDialog.kt index 2b1bdb9b24da..f8ffdf6eb03b 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/trusted/ExternalSystemTrustedProjectDialog.kt +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/trusted/ExternalSystemTrustedProjectDialog.kt @@ -7,6 +7,7 @@ import com.intellij.openapi.application.ApplicationInfo import com.intellij.openapi.externalSystem.model.ProjectSystemId import com.intellij.openapi.externalSystem.util.ExternalSystemUtil import com.intellij.openapi.project.Project +import org.jetbrains.annotations.ApiStatus import java.nio.file.Path object ExternalSystemTrustedProjectDialog { @@ -47,6 +48,7 @@ object ExternalSystemTrustedProjectDialog { @JvmStatic @Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith") @Deprecated("Use async method instead") + @ApiStatus.ScheduledForRemoval fun confirmLinkingUntrustedProject( project: Project, systemId: ProjectSystemId, diff --git a/platform/ide-core-impl/src/com/intellij/diagnostic/PerformanceWatcher.kt b/platform/ide-core-impl/src/com/intellij/diagnostic/PerformanceWatcher.kt index 557a6318c3ce..116a4a2f19b7 100644 --- a/platform/ide-core-impl/src/com/intellij/diagnostic/PerformanceWatcher.kt +++ b/platform/ide-core-impl/src/com/intellij/diagnostic/PerformanceWatcher.kt @@ -3,6 +3,7 @@ package com.intellij.diagnostic import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.components.service +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.annotations.NonNls import java.nio.file.Path @@ -84,6 +85,7 @@ abstract class PerformanceWatcher { @Deprecated("use {@link #dumpThreads(String, boolean, boolean)} instead", ReplaceWith("dumpThreads(pathPrefix = pathPrefix, appendMillisecondsToFileName = appendMillisecondsToFileName, stripDump = false)")) + @ApiStatus.ScheduledForRemoval fun dumpThreads(pathPrefix: String, appendMillisecondsToFileName: Boolean): Path? { return dumpThreads(pathPrefix = pathPrefix, appendMillisecondsToFileName = appendMillisecondsToFileName, stripDump = false) } diff --git a/platform/indexing-api/src/com/intellij/psi/search/FilenameIndex.java b/platform/indexing-api/src/com/intellij/psi/search/FilenameIndex.java index 751e6656d1a1..d38fcefa73a1 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/FilenameIndex.java +++ b/platform/indexing-api/src/com/intellij/psi/search/FilenameIndex.java @@ -102,7 +102,7 @@ public final class FilenameIndex { } /** @deprecated Use {@link #processFilesByName(String, boolean, GlobalSearchScope, Processor)} **/ - @Deprecated + @Deprecated(forRemoval = true) public static boolean processFilesByName(@NotNull String name, boolean directories, boolean caseSensitively, diff --git a/platform/lang-api/src/com/intellij/codeInspection/IntentionWrapper.java b/platform/lang-api/src/com/intellij/codeInspection/IntentionWrapper.java index d746465d17e2..74be89eccf27 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/IntentionWrapper.java +++ b/platform/lang-api/src/com/intellij/codeInspection/IntentionWrapper.java @@ -30,7 +30,7 @@ public class IntentionWrapper implements LocalQuickFix, IntentionAction, ActionC * @param file PsiFile to apply the action to (unused) * @deprecated use {@link IntentionWrapper#IntentionWrapper(IntentionAction)} */ - @Deprecated + @Deprecated(forRemoval = true) public IntentionWrapper(@NotNull IntentionAction action, @NotNull PsiFile file) { myAction = action; } diff --git a/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java b/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java index 6bd950cca686..4f4fe6e97ed7 100644 --- a/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java +++ b/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java @@ -402,7 +402,7 @@ public class ConfigurationContext { return myRuntimeConfiguration == null || myRuntimeConfiguration.getType() == type; } - @Deprecated + @Deprecated(forRemoval = true) public @Nullable List findPreferredProducers() { if (myPreferredProducers == null) { myPreferredProducers = PreferredProducerFind.findPreferredProducers(myLocation, this, true); diff --git a/platform/lang-api/src/com/intellij/execution/actions/PreferredProducerFind.java b/platform/lang-api/src/com/intellij/execution/actions/PreferredProducerFind.java index 0630738cc4e2..8ab2b375f01c 100644 --- a/platform/lang-api/src/com/intellij/execution/actions/PreferredProducerFind.java +++ b/platform/lang-api/src/com/intellij/execution/actions/PreferredProducerFind.java @@ -34,7 +34,7 @@ final class PreferredProducerFind { return fromContext != null ? fromContext.getConfigurationSettings() : null; } - @Deprecated + @Deprecated(forRemoval = true) public static @Nullable List findPreferredProducers(final Location location, final ConfigurationContext context, final boolean strict) { if (location == null) { return null; diff --git a/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java index ef1029afaf2f..58af7879c757 100644 --- a/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java +++ b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java @@ -170,7 +170,7 @@ public abstract class RuntimeConfigurationProducer implements Comparable, Clonea /** * @deprecated feel free to pass your configuration to SMTRunnerConsoleProperties directly instead of wrapping in DelegatingRuntimeConfiguration */ - @Deprecated + @Deprecated(forRemoval = true) public static class DelegatingRuntimeConfiguration extends LocatableConfigurationBase implements ModuleRunConfiguration { private final T myConfig; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/tooltips/TooltipActionProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/tooltips/TooltipActionProvider.java index 1ea68ef90e75..2dcc9f5325f7 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/tooltips/TooltipActionProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/tooltips/TooltipActionProvider.java @@ -41,7 +41,7 @@ public interface TooltipActionProvider { /** * @deprecated use {@link #calcTooltipAction(HighlightInfo, Project, Editor)} */ - @Deprecated + @Deprecated(forRemoval = true) static TooltipAction calcTooltipAction(@NotNull HighlightInfo info, @NotNull Editor editor) { return calcTooltipAction(info, editor.getProject(), editor); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/InlayHintsConfigurable.kt b/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/InlayHintsConfigurable.kt index 5bbffe83a3d1..a52ef6ef7856 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/InlayHintsConfigurable.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/InlayHintsConfigurable.kt @@ -64,6 +64,7 @@ class InlayHintsConfigurable(private val project: Project) : Configurable, Confi @JvmStatic @Deprecated("Use com.intellij.codeInsight.hints.settings.InlaySettingsConfigurableKt.showInlaySettings", ReplaceWith("showInlaySettings(project, language, selector)")) + @ApiStatus.ScheduledForRemoval fun showSettingsDialogForLanguage(project: Project, language: Language, selector: Predicate?) { if (showInlaySettings(project, language, selector)) { return diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java index a322d78e7816..9eff386bdebc 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java @@ -238,7 +238,7 @@ public final class IntentionDescriptionPanel { /** * @deprecated Used in an older version of intention configuration UI. */ - @Deprecated + @Deprecated(forRemoval = true) public void init(int preferredWidth) { } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/TemplateInlayUtil.kt b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/TemplateInlayUtil.kt index 8990c3075bc9..0382b9bfd061 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/TemplateInlayUtil.kt +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/TemplateInlayUtil.kt @@ -102,6 +102,7 @@ object TemplateInlayUtil { @Deprecated("Use overload with JPanel", ReplaceWith("createNavigatableButtonWithPopup(templateState, inEditorOffset, presentation, panel as JPanel, templateElement, logStatisticsOnHide)")) + @ApiStatus.ScheduledForRemoval @JvmStatic fun createNavigatableButtonWithPopup(templateState: TemplateState, inEditorOffset: Int, diff --git a/platform/platform-api/src/com/intellij/openapi/wm/WelcomeScreenCustomization.java b/platform/platform-api/src/com/intellij/openapi/wm/WelcomeScreenCustomization.java index 8e9e0c8ef252..ca1f09bd6bcd 100644 --- a/platform/platform-api/src/com/intellij/openapi/wm/WelcomeScreenCustomization.java +++ b/platform/platform-api/src/com/intellij/openapi/wm/WelcomeScreenCustomization.java @@ -26,7 +26,7 @@ public interface WelcomeScreenCustomization { /** * @deprecated Use {@link #createQuickAccessActions(Disposable)} instead */ - @Deprecated + @Deprecated(forRemoval = true) default @Nullable Component createQuickAccessComponent(@NotNull Disposable parentDisposable) { return null; } diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.kt b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.kt index d0a53819e399..529b817b5610 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.kt +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.kt @@ -58,6 +58,7 @@ import com.intellij.util.concurrency.annotations.RequiresEdt import com.intellij.util.containers.ContainerUtil import com.intellij.util.ui.* import com.intellij.util.ui.update.lazyUiDisposable +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.annotations.Nls import org.jetbrains.annotations.NonNls @@ -511,6 +512,7 @@ open class JBTabsImpl(private var project: Project?, protected open fun createSingleRowLayout(): SingleRowLayout = ScrollableSingleRowLayout(this) @Deprecated("override {@link JBTabsImpl#createMultiRowLayout()} instead", ReplaceWith("createMultiRowLayout()")) + @ApiStatus.ScheduledForRemoval protected open fun createTableLayout(): MultiRowLayout = createMultiRowLayout() override fun setNavigationActionBinding(prevActionId: String, nextActionId: String) { @@ -3122,6 +3124,7 @@ open class JBTabsImpl(private var project: Project?, } @Deprecated("Not used.") + @ApiStatus.ScheduledForRemoval fun dispose() { } } diff --git a/platform/platform-api/src/com/intellij/util/OpenSourceUtil.java b/platform/platform-api/src/com/intellij/util/OpenSourceUtil.java index 0458e058da48..1f2c01a39b04 100644 --- a/platform/platform-api/src/com/intellij/util/OpenSourceUtil.java +++ b/platform/platform-api/src/com/intellij/util/OpenSourceUtil.java @@ -28,7 +28,7 @@ public final class OpenSourceUtil { * @return {@code true} if the specified {@code object} is {@link Navigatable} and supports navigation * @deprecated check instanceof/null on the caller side */ - @Deprecated + @Deprecated(forRemoval = true) public static boolean canNavigate(@Nullable Object object) { return object instanceof Navigatable && ((Navigatable)object).canNavigate(); } @@ -37,7 +37,7 @@ public final class OpenSourceUtil { * @return {@code true} if the specified {@code object} is {@link Navigatable} and supports navigation to source * @deprecated check instanceof/null on the caller side */ - @Deprecated + @Deprecated(forRemoval = true) public static boolean canNavigateToSource(@Nullable Object object) { return object instanceof Navigatable && ((Navigatable)object).canNavigateToSource(); } diff --git a/platform/platform-api/src/com/intellij/util/config/Storage.java b/platform/platform-api/src/com/intellij/util/config/Storage.java index 47619dcb3695..c872fae6326a 100644 --- a/platform/platform-api/src/com/intellij/util/config/Storage.java +++ b/platform/platform-api/src/com/intellij/util/config/Storage.java @@ -14,7 +14,7 @@ import java.util.Map; * @deprecated Use {@link PropertiesComponent} directly. * @see com.intellij.ui.JBSplitter */ -@Deprecated +@Deprecated(forRemoval = true) public interface Storage { void put(String key, String value); String get(String key); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeLookAndFeel.java b/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeLookAndFeel.java index 2608c5395779..a036cbf17bfa 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeLookAndFeel.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeLookAndFeel.java @@ -108,7 +108,7 @@ public final class QuickChangeLookAndFeel extends QuickSwitchSchemeAction implem /** * @deprecated use {@link #switchLafAndUpdateUI(LafManager, UIManager.LookAndFeelInfo, boolean)} instead */ - @Deprecated + @Deprecated(forRemoval = true) public static void switchLafAndUpdateUI(final @NotNull LafManager lafMan, @NotNull UIManager.LookAndFeelInfo lf, boolean async, diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt index a20d24d2e9fe..601c6c76c388 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt +++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt @@ -66,6 +66,7 @@ import com.intellij.util.ui.JBDimension import com.intellij.util.ui.JBUI import com.intellij.util.ui.SwingTextTrimmer import com.intellij.util.ui.components.BorderLayoutPanel +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.Nls import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.TestOnly @@ -90,6 +91,7 @@ object Switcher : BaseSwitcherAction(null) { val SWITCHER_KEY: Key = Key.create("SWITCHER_KEY") @Deprecated("Please use {@link Switcher#createAndShowSwitcher(AnActionEvent, String, boolean, boolean)}") + @ApiStatus.ScheduledForRemoval @JvmStatic fun createAndShowSwitcher(e: AnActionEvent, title: @Nls String, pinned: Boolean, vFiles: Array?): SwitcherPanel? { val project = e.project ?: return null diff --git a/platform/platform-impl/src/com/intellij/ide/wizard/UIWizardUtil.kt b/platform/platform-impl/src/com/intellij/ide/wizard/UIWizardUtil.kt index cd9caba33481..0aac915797ff 100644 --- a/platform/platform-impl/src/com/intellij/ide/wizard/UIWizardUtil.kt +++ b/platform/platform-impl/src/com/intellij/ide/wizard/UIWizardUtil.kt @@ -39,6 +39,7 @@ val WizardContext.projectOrDefault: Project get() = project ?: ProjectManager.ge "com.intellij.ide.wizard.NewProjectWizardChainStep.Companion.nextStep" ) ) +@ApiStatus.ScheduledForRemoval fun T1.chain(f1: (T1) -> T2): NewProjectWizardStep where T1 : NewProjectWizardStep, T2 : NewProjectWizardStep { return nextStep(f1) @@ -78,6 +79,7 @@ fun T1.chain(f1: (T1) -> T2, f2: (T2) -> T3, f3: (T3) -> T4): N "com.intellij.ide.wizard.NewProjectWizardChainStep.Companion.nextStep" ) ) +@ApiStatus.ScheduledForRemoval fun T1.chain(f1: (T1) -> T2, f2: (T2) -> T3, f3: (T3) -> T4, f4: (T4) -> T5): NewProjectWizardStep where T1 : NewProjectWizardStep, T2 : NewProjectWizardStep, T3 : NewProjectWizardStep, T4 : NewProjectWizardStep, T5 : NewProjectWizardStep { return nextStep(f1) @@ -87,6 +89,7 @@ fun T1.chain(f1: (T1) -> T2, f2: (T2) -> T3, f3: (T3) -> T4 } @Deprecated("Use NewProjectWizardChainStep.nextStep instead") +@ApiStatus.ScheduledForRemoval fun stepSequence(first: NewProjectWizardStep, vararg rest: NewProjectWizardStep): NewProjectWizardStep { val steps = listOf(first) + rest return object : AbstractNewProjectWizardStep(first) { diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/LocalFsFinder.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/LocalFsFinder.java index aabe2d7eb5ae..99b9b55ab10f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/LocalFsFinder.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/LocalFsFinder.java @@ -263,7 +263,7 @@ public final class LocalFsFinder implements Finder { private final Path myFile; /** @deprecated please use {@link #IoFile(Path)} instead */ - @Deprecated + @Deprecated(forRemoval = true) public IoFile(@NotNull File file) { this(file.toPath()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.kt b/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.kt index 3b9f03150515..e4d7a15ac5a3 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.kt +++ b/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.kt @@ -37,6 +37,7 @@ import com.intellij.ui.mac.touchbar.TouchbarSupport import com.intellij.util.ui.ImageUtil import com.intellij.util.ui.UIUtil import kotlinx.coroutines.* +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.ApiStatus.Obsolete import org.jetbrains.annotations.NonNls import java.awt.* @@ -91,6 +92,7 @@ open class FrameWrapper @JvmOverloads constructor(private val project: Project?, protected fun getStatusBar(): StatusBar? = statusBar @Deprecated("Pass project to constructor") + @ApiStatus.ScheduledForRemoval fun setProject(@Suppress("UNUSED_PARAMETER") project: Project) { } diff --git a/platform/platform-impl/src/com/intellij/ui/TableSpeedSearchBase.java b/platform/platform-impl/src/com/intellij/ui/TableSpeedSearchBase.java index 760593f3e585..bd7357fb9e4f 100644 --- a/platform/platform-impl/src/com/intellij/ui/TableSpeedSearchBase.java +++ b/platform/platform-impl/src/com/intellij/ui/TableSpeedSearchBase.java @@ -33,7 +33,7 @@ public abstract class TableSpeedSearchBase extends SpeedSea * Also, note that non-deprecated constructor is side effect free, and you should call for {@link SpeedSearchBase#setupListeners()} * method to enable speed search */ - @Deprecated + @Deprecated(forRemoval = true) public TableSpeedSearchBase(Comp component) { super(component); } diff --git a/platform/platform-impl/src/com/intellij/ui/tree/AsyncTreeModel.java b/platform/platform-impl/src/com/intellij/ui/tree/AsyncTreeModel.java index 9cdecc49f6a9..894e82378651 100644 --- a/platform/platform-impl/src/com/intellij/ui/tree/AsyncTreeModel.java +++ b/platform/platform-impl/src/com/intellij/ui/tree/AsyncTreeModel.java @@ -1033,7 +1033,7 @@ public final class AsyncTreeModel extends AbstractTreeModel implements Searchabl /** * @deprecated do not use */ - @Deprecated + @Deprecated(forRemoval = true) public void setRootImmediately(@NotNull Object object) { Node node = new Node(object, LeafState.NEVER); node.insertPath(new CachingTreePath(object)); diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectFileIndex.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectFileIndex.java index 5186b031d256..763c2e359103 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectFileIndex.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectFileIndex.java @@ -203,7 +203,7 @@ public interface ProjectFileIndex extends FileIndex { * @deprecated use other methods from this class to obtain the information you need to get from {@link SourceFolder} instance, e.g. * {@link #getContainingSourceRootType} or {@link #isInGeneratedSources}. */ - @Deprecated + @Deprecated(forRemoval = true) @RequiresReadLock default @Nullable SourceFolder getSourceFolder(@NotNull VirtualFile fileOrDir) { return null; diff --git a/platform/refactoring/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java b/platform/refactoring/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java index d43f5241cff8..d8b3a9b789d6 100644 --- a/platform/refactoring/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java +++ b/platform/refactoring/src/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java @@ -164,7 +164,7 @@ public class PsiElement2UsageTargetAdapter /** * @deprecated use {@link #convert(PsiElement[], boolean)} instead */ - @Deprecated + @Deprecated(forRemoval = true) public static PsiElement2UsageTargetAdapter @NotNull [] convert(PsiElement @NotNull [] psiElements) { return convert(psiElements, true); } diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java index 0e4388c34415..c30fe4f12fca 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java @@ -461,7 +461,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da /** * @deprecated moved to {@link TestApplicationKt#clearEncodingManagerDocumentQueue(Application)} */ - @Deprecated + @Deprecated(forRemoval = true) public static void clearEncodingManagerDocumentQueue() { TestApplicationKt.clearEncodingManagerDocumentQueue(ApplicationManager.getApplication()); } diff --git a/platform/testFramework/src/com/intellij/testFramework/PsiTestData.java b/platform/testFramework/src/com/intellij/testFramework/PsiTestData.java index eb8a63213231..cb373ff73493 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PsiTestData.java +++ b/platform/testFramework/src/com/intellij/testFramework/PsiTestData.java @@ -15,7 +15,7 @@ import java.io.IOException; /** * @deprecated use other to configure test data files */ -@Deprecated +@Deprecated(forRemoval = true) public class PsiTestData implements JDOMExternalizable { public String TEXT_FILE = ""; private String myText; diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/LightPlatformCodeInsightFixtureTestCase.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/LightPlatformCodeInsightFixtureTestCase.java index 3ca251facfe7..986f9e09b6f9 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/LightPlatformCodeInsightFixtureTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/LightPlatformCodeInsightFixtureTestCase.java @@ -4,6 +4,6 @@ package com.intellij.testFramework.fixtures; /** * @deprecated Please use {@link BasePlatformTestCase} */ -@Deprecated +@Deprecated(forRemoval = true) public abstract class LightPlatformCodeInsightFixtureTestCase extends BasePlatformTestCase { } diff --git a/platform/testFramework/src/com/intellij/testFramework/junit5/dynamicTests.kt b/platform/testFramework/src/com/intellij/testFramework/junit5/dynamicTests.kt index c8cca502cd19..2acee60bc043 100644 --- a/platform/testFramework/src/com/intellij/testFramework/junit5/dynamicTests.kt +++ b/platform/testFramework/src/com/intellij/testFramework/junit5/dynamicTests.kt @@ -2,6 +2,7 @@ @file:JvmName("DynamicTests") package com.intellij.testFramework.junit5 +import org.jetbrains.annotations.ApiStatus import org.junit.AssumptionViolatedException import org.junit.jupiter.api.DynamicTest import org.junit.jupiter.api.assertAll @@ -33,6 +34,7 @@ fun List.asDynamicTests(problemMessage: String, threshold: Int = 5 } @Deprecated("Use a simplified version 'asDynamicTests(String, Int)' instead") +@ApiStatus.ScheduledForRemoval @JvmOverloads fun List.asDynamicTests(testNameForSuccess: String, testNameForManyFailures: String, threshold: Int = 50): List { if (isEmpty()) { diff --git a/platform/util-ex/src/com/intellij/util/containers/Queue.java b/platform/util-ex/src/com/intellij/util/containers/Queue.java index d11f7c32884b..ed803e8b2a98 100644 --- a/platform/util-ex/src/com/intellij/util/containers/Queue.java +++ b/platform/util-ex/src/com/intellij/util/containers/Queue.java @@ -10,7 +10,7 @@ import java.util.Arrays; /** * @deprecated use {@link java.util.ArrayDeque} instead */ -@Deprecated +@Deprecated(forRemoval = true) public final class Queue { private Object[] myArray; private int myFirst; diff --git a/platform/util/base/src/com/intellij/reference/SoftReference.java b/platform/util/base/src/com/intellij/reference/SoftReference.java index 0b7e7f92a7dd..a90d43842ea1 100644 --- a/platform/util/base/src/com/intellij/reference/SoftReference.java +++ b/platform/util/base/src/com/intellij/reference/SoftReference.java @@ -1,6 +1,7 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.reference; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.lang.ref.Reference; @@ -29,6 +30,7 @@ public class SoftReference extends java.lang.ref.SoftReference implements * @deprecated use {@link java.lang.ref.SoftReference#SoftReference(Object, ReferenceQueue)} */ @Deprecated + @ApiStatus.ScheduledForRemoval public SoftReference(final T referent, final ReferenceQueue q) { super(referent, q); //myReferent = referent; diff --git a/platform/util/src/com/intellij/openapi/util/io/UniqueNameBuilder.java b/platform/util/src/com/intellij/openapi/util/io/UniqueNameBuilder.java index 0bb7308ad3d4..33812b2bc3f1 100644 --- a/platform/util/src/com/intellij/openapi/util/io/UniqueNameBuilder.java +++ b/platform/util/src/com/intellij/openapi/util/io/UniqueNameBuilder.java @@ -1,10 +1,13 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.util.io; +import org.jetbrains.annotations.ApiStatus; + /** * @deprecated use {@link com.intellij.filename.UniqueNameBuilder} instead */ @Deprecated +@ApiStatus.ScheduledForRemoval public final class UniqueNameBuilder { private final com.intellij.filename.UniqueNameBuilder myDelegate; diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index 2cf762d651b3..16e1a3d02633 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -472,6 +472,7 @@ public final class ContainerUtil { */ @Contract(pure = true) @Deprecated + @ApiStatus.ScheduledForRemoval public static @Unmodifiable @NotNull ImmutableList immutableSingletonList(E element) { return ImmutableList.singleton(element); } @@ -2142,6 +2143,7 @@ public final class ContainerUtil { * The former method is here to highlight incorrect usages of the latter. */ @Deprecated + @ApiStatus.ScheduledForRemoval @Contract(pure = true) public static @Unmodifiable @NotNull Set set(T t) { return Collections.singleton(t); @@ -2223,6 +2225,7 @@ public final class ContainerUtil { * @deprecated use {@link Map#getOrDefault(Object, Object)} */ @Deprecated + @ApiStatus.ScheduledForRemoval @Contract(pure = true) public static @NotNull V getOrElse(@NotNull Map map, T key, @NotNull V defValue) { return map.getOrDefault(key, defValue); diff --git a/platform/util/ui/src/com/intellij/ui/BooleanTableCellEditor.java b/platform/util/ui/src/com/intellij/ui/BooleanTableCellEditor.java index 52dde598457c..a772a779ecf1 100644 --- a/platform/util/ui/src/com/intellij/ui/BooleanTableCellEditor.java +++ b/platform/util/ui/src/com/intellij/ui/BooleanTableCellEditor.java @@ -11,7 +11,7 @@ public class BooleanTableCellEditor extends DefaultCellEditor { * @deprecated there seems to be no need to change default options, use {@link #BooleanTableCellEditor()} instead. */ @SuppressWarnings("DeprecatedIsStillUsed") - @Deprecated + @Deprecated(forRemoval = true) public BooleanTableCellEditor(boolean isStringEditor) { super(new JCheckBox()); myStringEditor = isStringEditor; diff --git a/platform/util/ui/src/com/intellij/util/ui/UIUtil.java b/platform/util/ui/src/com/intellij/util/ui/UIUtil.java index 5ddafe405e77..c2af63724d44 100644 --- a/platform/util/ui/src/com/intellij/util/ui/UIUtil.java +++ b/platform/util/ui/src/com/intellij/util/ui/UIUtil.java @@ -2869,7 +2869,7 @@ public final class UIUtil { /** * @deprecated use {@link #getListSelectionBackground(boolean)} */ - @Deprecated + @Deprecated(forRemoval = true) public static @NotNull Color getListUnfocusedSelectionBackground() { return getListSelectionBackground(false); } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java b/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java index 791030c23898..d407e1bca2d8 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java @@ -243,7 +243,7 @@ public abstract class ProjectLevelVcsManager { * @deprecated Use {@link com.intellij.vcs.console.VcsConsoleTabService} */ @RequiresEdt - @Deprecated + @Deprecated(forRemoval = true) public abstract void showConsole(); /** @@ -264,7 +264,7 @@ public abstract class ProjectLevelVcsManager { * @deprecated Use {@link com.intellij.vcs.console.VcsConsoleTabService} */ @RequiresEdt - @Deprecated + @Deprecated(forRemoval = true) public abstract boolean isConsoleVisible(); /** diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java index 3b719ec1e751..ae04bf5a26e4 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java @@ -225,7 +225,7 @@ public final class VcsConfiguration implements PersistentStateComponent LOCAL_COMMIT_EXECUTOR = CommitExecutor.LOCAL_COMMIT_EXECUTOR; } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScope.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScope.java index 04c2a26065a9..c9b8700a21b4 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScope.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScope.java @@ -73,13 +73,13 @@ public abstract class VcsDirtyScope { /** * @deprecated Prefer not walking the VFS, or using {@link com.intellij.openapi.vcs.impl.VcsRootIterator} directly if necessary. */ - @Deprecated + @Deprecated(forRemoval = true) public abstract void iterate(Processor iterator); /** * @deprecated Prefer not walking the VFS, or using {@link com.intellij.openapi.vcs.impl.VcsRootIterator} directly if necessary. */ - @Deprecated + @Deprecated(forRemoval = true) public abstract void iterateExistingInsideScope(Processor vf); public abstract boolean isEmpty(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchWriter.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchWriter.java index b7823f1976cd..610e60ef6501 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchWriter.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchWriter.java @@ -122,7 +122,7 @@ public final class PatchWriter { /** * @deprecated Use overload without {@code includeBinaries} parameter. */ - @Deprecated + @Deprecated(forRemoval = true) public static void writePatches(@NotNull Project project, @NotNull Path file, @Nullable Path basePath, diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java index 0519b5fdebfa..55955da3f2d9 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java @@ -143,7 +143,7 @@ public abstract class CommitChangeListDialog extends DialogWrapper implements Si /** * @deprecated Prefer using {@link #commitWithExecutor} or {@link #commitVcsChanges}. */ - @Deprecated + @Deprecated(forRemoval = true) public static boolean commitChanges(@NotNull Project project, @SuppressWarnings("unused") @Nullable Collection ignored_parameter, @NotNull Collection included, diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/PartialLocalLineStatusTracker.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/PartialLocalLineStatusTracker.kt index dc51878d9f2e..2cf4d733cd2c 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/PartialLocalLineStatusTracker.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/PartialLocalLineStatusTracker.kt @@ -47,6 +47,7 @@ import com.intellij.util.containers.ContainerUtil import com.intellij.util.containers.WeakList import com.intellij.util.ui.JBUI import com.intellij.vcsUtil.VcsUtil +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.CalledInAny import java.awt.Graphics import java.awt.Point @@ -125,6 +126,8 @@ class LocalRange internal constructor(line1: Int, line2: Int, vcsLine1: Int, vcs } @Deprecated("Use [exclusionState] instead", ReplaceWith("exclusionState == RangeExclusionState.Excluded")) + @get:Deprecated("Use [exclusionState] instead", ReplaceWith("exclusionState == RangeExclusionState.Excluded")) + @get:ApiStatus.ScheduledForRemoval val isExcludedFromCommit: Boolean get() = exclusionState == RangeExclusionState.Excluded } diff --git a/platform/warmup/src/com/intellij/warmup/ProjectBuildWarmupSupport.kt b/platform/warmup/src/com/intellij/warmup/ProjectBuildWarmupSupport.kt index 47fd8e772cab..4d215653e882 100644 --- a/platform/warmup/src/com/intellij/warmup/ProjectBuildWarmupSupport.kt +++ b/platform/warmup/src/com/intellij/warmup/ProjectBuildWarmupSupport.kt @@ -31,6 +31,7 @@ interface ProjectBuildWarmupSupport { * @return build status message */ @Deprecated("Return type is not descriptive enough") + @ApiStatus.ScheduledForRemoval suspend fun buildProject(rebuild: Boolean = false): String /**