diff --git a/platform/analysis-api/src/com/intellij/openapi/vfs/newvfs/FileAttribute.java b/platform/analysis-api/src/com/intellij/openapi/vfs/newvfs/FileAttribute.java index 29b84c4cd5bd..6e31ea03b404 100644 --- a/platform/analysis-api/src/com/intellij/openapi/vfs/newvfs/FileAttribute.java +++ b/platform/analysis-api/src/com/intellij/openapi/vfs/newvfs/FileAttribute.java @@ -51,7 +51,7 @@ public class FileAttribute { } /** @deprecated use {@link FileAttribute#FileAttribute(String, int, boolean)} -- shouldEnumerate is ignored (was never implemented) */ - @Deprecated + @Deprecated(forRemoval = true) public FileAttribute(@NonNls @NotNull String id, int version, boolean fixedSize, diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/modifier/TransientCodeStyleSettings.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/modifier/TransientCodeStyleSettings.java index a005a7770d6c..79e3f93c1729 100644 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/modifier/TransientCodeStyleSettings.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/modifier/TransientCodeStyleSettings.java @@ -36,7 +36,7 @@ public final class TransientCodeStyleSettings extends CodeStyleSettings { /** * @deprecated Use {@link #TransientCodeStyleSettings(VirtualFile,Project,CodeStyleSettings)} */ - @Deprecated + @Deprecated(forRemoval = true) public TransientCodeStyleSettings(@NotNull PsiFile psiFile, @NotNull CodeStyleSettings settings) { super(true, false); myFileRef = new WeakReference<>(psiFile.getVirtualFile()); diff --git a/platform/core-api/src/com/intellij/codeInsight/documentation/DocumentationManagerUtil.java b/platform/core-api/src/com/intellij/codeInsight/documentation/DocumentationManagerUtil.java index 2740527f0086..8fa2f32a63c6 100644 --- a/platform/core-api/src/com/intellij/codeInsight/documentation/DocumentationManagerUtil.java +++ b/platform/core-api/src/com/intellij/codeInsight/documentation/DocumentationManagerUtil.java @@ -2,6 +2,7 @@ package com.intellij.codeInsight.documentation; import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.ApiStatus; public final class DocumentationManagerUtil { @@ -45,6 +46,7 @@ public final class DocumentationManagerUtil { /** * @deprecated use {@link #createHyperlink(StringBuilder, String, String, boolean)} */ + @ApiStatus.ScheduledForRemoval @Deprecated public static void createHyperlink( StringBuilder buffer, diff --git a/platform/core-api/src/com/intellij/psi/tree/StubFileElementType.java b/platform/core-api/src/com/intellij/psi/tree/StubFileElementType.java index c4d49bcbb816..bf77c326686e 100644 --- a/platform/core-api/src/com/intellij/psi/tree/StubFileElementType.java +++ b/platform/core-api/src/com/intellij/psi/tree/StubFileElementType.java @@ -21,6 +21,7 @@ import org.jetbrains.annotations.Nullable; public abstract class StubFileElementType extends IFileElementType implements StubSerializer { /** @deprecated this constant is unused */ + @ApiStatus.ScheduledForRemoval @Deprecated public static final String DEFAULT_EXTERNAL_ID = "psi.file"; diff --git a/platform/external-process-auth-helper/src/externalProcessAuthHelper/ExternalProcessHandlerService.kt b/platform/external-process-auth-helper/src/externalProcessAuthHelper/ExternalProcessHandlerService.kt index 8a990168e694..15a9c4983eeb 100644 --- a/platform/external-process-auth-helper/src/externalProcessAuthHelper/ExternalProcessHandlerService.kt +++ b/platform/external-process-auth-helper/src/externalProcessAuthHelper/ExternalProcessHandlerService.kt @@ -59,6 +59,7 @@ abstract class ExternalProcessHandlerService @ApiStatus. private val coroutineScope: CoroutineScope? ) { + @ApiStatus.ScheduledForRemoval @Deprecated("Use constructor with scriptBody") constructor(scriptNamePrefix: String, scriptMainClass: Class) : this(scriptNamePrefix, scriptMainClass, null, emptyList(), null) diff --git a/platform/ide-core-impl/src/com/intellij/openapi/project/ex/PerProjectInstancePaths.kt b/platform/ide-core-impl/src/com/intellij/openapi/project/ex/PerProjectInstancePaths.kt index 0328b7ba3bc1..17d8048aa051 100644 --- a/platform/ide-core-impl/src/com/intellij/openapi/project/ex/PerProjectInstancePaths.kt +++ b/platform/ide-core-impl/src/com/intellij/openapi/project/ex/PerProjectInstancePaths.kt @@ -2,13 +2,14 @@ package com.intellij.openapi.project.ex import com.intellij.openapi.application.PathManager +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.VisibleForTesting import java.nio.file.Path import java.nio.file.Paths import kotlin.io.path.div import kotlin.io.path.name - +@ApiStatus.ScheduledForRemoval @Deprecated("Use P3PathsEx") class PerProjectInstancePaths(private val projectStoreBaseDir: Path) { diff --git a/platform/platform-api/src/com/intellij/openapi/observable/util/RevertOnDisposeUtil.kt b/platform/platform-api/src/com/intellij/openapi/observable/util/RevertOnDisposeUtil.kt index 49c587e6bff1..dc4290f9e3b6 100644 --- a/platform/platform-api/src/com/intellij/openapi/observable/util/RevertOnDisposeUtil.kt +++ b/platform/platform-api/src/com/intellij/openapi/observable/util/RevertOnDisposeUtil.kt @@ -8,6 +8,7 @@ import com.intellij.openapi.ui.ComponentWithBrowseButton import com.intellij.ui.EditorTextComponent import com.intellij.ui.hover.HoverListener import com.intellij.util.ui.TableViewModel +import org.jetbrains.annotations.ApiStatus import java.awt.Component import java.awt.Container import java.awt.ItemSelectable @@ -30,6 +31,7 @@ import javax.swing.text.Document import javax.swing.text.JTextComponent import javax.swing.tree.TreeModel +@ApiStatus.ScheduledForRemoval @Deprecated("Use setObservableProperty instead", ReplaceWith("setObservableProperty(this, value, parentDisposable)")) fun ObservableMutableProperty.set(value: T, parentDisposable: Disposable? = null) { val oldValue = get() diff --git a/platform/platform-api/src/com/intellij/openapi/progress/tasks.kt b/platform/platform-api/src/com/intellij/openapi/progress/tasks.kt index 1d0ff022da33..cfea8f3a3fc6 100644 --- a/platform/platform-api/src/com/intellij/openapi/progress/tasks.kt +++ b/platform/platform-api/src/com/intellij/openapi/progress/tasks.kt @@ -34,6 +34,7 @@ suspend fun withBackgroundProgress( return withBackgroundProgress(project, title, action) } +@ApiStatus.ScheduledForRemoval @Deprecated( "Moved to com.intellij.platform.ide.progress", ReplaceWith( @@ -51,6 +52,7 @@ suspend fun withBackgroundProgress( return withBackgroundProgress(project, title, cancellable, action) } +@ApiStatus.ScheduledForRemoval @Deprecated( "Moved to com.intellij.platform.ide.progress", ReplaceWith( @@ -68,6 +70,7 @@ suspend fun withBackgroundProgress( return withBackgroundProgress(project, title, cancellation, action) } +@ApiStatus.ScheduledForRemoval @Deprecated( "Moved to com.intellij.platform.ide.progress", ReplaceWith( @@ -86,6 +89,7 @@ fun runWithModalProgressBlocking( return runWithModalProgressBlocking(project, title, action) } +@ApiStatus.ScheduledForRemoval @Deprecated( "Moved to com.intellij.platform.ide.progress", ReplaceWith( diff --git a/platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java b/platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java index 7a7dc31af205..a9feffc0a21a 100644 --- a/platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java +++ b/platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java @@ -510,7 +510,7 @@ public final class EditorHyperlinkSupport { /** * @deprecated use {@link EditorHyperlinkSupport#getNextOccurrence(int, Consumer)} instead */ - @Deprecated + @Deprecated(forRemoval = true) public static @Nullable OccurenceNavigator.OccurenceInfo getNextOccurrence(@NotNull Editor editor, int delta, @NotNull com.intellij.util.Consumer action) { diff --git a/platform/projectModel-impl/src/com/intellij/openapi/options/SchemeManager.kt b/platform/projectModel-impl/src/com/intellij/openapi/options/SchemeManager.kt index 53b7181c4f44..4fbed00e3ad3 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/options/SchemeManager.kt +++ b/platform/projectModel-impl/src/com/intellij/openapi/options/SchemeManager.kt @@ -31,6 +31,7 @@ abstract class SchemeManager { abstract fun reload() + @ApiStatus.ScheduledForRemoval @Deprecated(message = "Use reload()", replaceWith = ReplaceWith("reload()")) open fun reload(retainFilter: ((scheme: T) -> Boolean)?) { reload() diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialogKeys.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialogKeys.java index 2e140ae767e7..8ebc5c6dd6a7 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialogKeys.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialogKeys.java @@ -12,6 +12,6 @@ public final class StructuralSearchDialogKeys { /** * @deprecated AI code generation for the structural search is not supported anymore. */ - @Deprecated + @Deprecated(forRemoval = true) public static final Key AI_SUPPORT_KEY = Key.create("ssr.ai.support"); } diff --git a/platform/testFramework/src/com/intellij/util/io/DirectoryContentSpec.kt b/platform/testFramework/src/com/intellij/util/io/DirectoryContentSpec.kt index e2cfb7b524a3..820daa80a7b0 100644 --- a/platform/testFramework/src/com/intellij/util/io/DirectoryContentSpec.kt +++ b/platform/testFramework/src/com/intellij/util/io/DirectoryContentSpec.kt @@ -14,6 +14,7 @@ import com.intellij.util.io.impl.JarSpec import com.intellij.util.io.impl.ZipSpec import com.intellij.util.io.impl.assertContentUnderFileMatches import com.intellij.util.io.impl.fillSpecFromDirectory +import org.jetbrains.annotations.ApiStatus import org.junit.rules.ErrorCollector import java.io.File import java.nio.file.Path @@ -105,6 +106,7 @@ interface DirectoryContentSpec { /** * Generates files, directories and archives accordingly to this specification in [target] directory */ + @ApiStatus.ScheduledForRemoval @Deprecated("Use generate(Path) instead") fun generate(target: File): Unit = generate(target.toPath()) diff --git a/platform/util/multiplatform/src/com/intellij/util/lang/JavaVersion.kt b/platform/util/multiplatform/src/com/intellij/util/lang/JavaVersion.kt index 615d003dceb5..adf36f9136da 100644 --- a/platform/util/multiplatform/src/com/intellij/util/lang/JavaVersion.kt +++ b/platform/util/multiplatform/src/com/intellij/util/lang/JavaVersion.kt @@ -2,6 +2,7 @@ package com.intellij.util.lang import com.intellij.util.currentJavaVersionPlatformSpecific +import org.jetbrains.annotations.ApiStatus import kotlin.jvm.JvmField import kotlin.jvm.JvmOverloads import kotlin.jvm.JvmStatic @@ -143,6 +144,7 @@ class JavaVersion private constructor( ReplaceWith("com.intellij.util.lang.CurrentJavaVersion.currentJavaVersion()"), level = DeprecationLevel.ERROR ) + @ApiStatus.ScheduledForRemoval @JvmStatic fun current(): JavaVersion = currentJavaVersionPlatformSpecific() diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index 79de54aa263c..b1c95adbcbe3 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -526,6 +526,7 @@ public final class ContainerUtil { * unlike the {@link Collections#unmodifiableList(List)} (Subject to change in subsequent JDKs). */ @Contract(pure = true) + @ApiStatus.ScheduledForRemoval @Deprecated public static @Unmodifiable @NotNull ImmutableList immutableList(@NotNull List list) { //noinspection unchecked diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/facet.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/facet.kt index 2b3b1e066e0e..e3dcee4edd06 100644 --- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/facet.kt +++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/facet.kt @@ -6,6 +6,7 @@ import com.intellij.platform.workspace.storage.EntityType import com.intellij.platform.workspace.storage.MutableEntityStorage import com.intellij.platform.workspace.storage.WorkspaceEntity import com.intellij.platform.workspace.storage.annotations.Parent +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.NonNls data class FacetEntityTypeId(val name: @NonNls String) @@ -61,6 +62,7 @@ interface FacetEntity : ModuleSettingsFacetBridgeEntity { ): Builder = FacetEntityType.compatibilityInvoke(moduleId, name, typeId, entitySource, init) //region compatibility generated code + @ApiStatus.ScheduledForRemoval @Deprecated( message = "This method is deprecated and will be removed in next major release", replaceWith = ReplaceWith("invoke(moduleId, name, typeId, entitySource, init)"), diff --git a/platform/workspace/storage/src/com/intellij/platform/workspace/storage/annotations/Child.kt b/platform/workspace/storage/src/com/intellij/platform/workspace/storage/annotations/Child.kt index d25d3fff22de..33a40c5fb0ef 100644 --- a/platform/workspace/storage/src/com/intellij/platform/workspace/storage/annotations/Child.kt +++ b/platform/workspace/storage/src/com/intellij/platform/workspace/storage/annotations/Child.kt @@ -1,6 +1,8 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.platform.workspace.storage.annotations +import org.jetbrains.annotations.ApiStatus + /** * Marks a property in an interface extending [WorkspaceEntity][com.intellij.platform.workspace.storage.WorkspaceEntity] as referring to * a child entity. @@ -18,6 +20,7 @@ package com.intellij.platform.workspace.storage.annotations * always added and removed together. So it's simpler to just put all properties from the child entity to the parent entity instead. If you * want to group several related properties, you may extract them to a separate data class instead of defining such a child entity. */ +@ApiStatus.ScheduledForRemoval @Deprecated("Use @Parent annotation in the child entity instead") @Target(AnnotationTarget.PROPERTY, AnnotationTarget.TYPE) public annotation class Child \ No newline at end of file