[platform API] replace ApiStatus.ScheduledForRemoval annotation by 'forRemoval' attribute (IDEA-288466)

Since we don't want to specify planned removal date anymore, there is no need to use a separate annotation. GitOrigin-RevId: f9a3ca30ab3bfb3934ec7730901eb17be3a10363
2026-09-27 10:03:11 +07:00 · 2022-02-11 15:12:12 +00:00
parent 9b1ce79956
commit 101cd9d47d
434 changed files with 743 additions and 1780 deletions
@@ -2,15 +2,13 @@
 package com.intellij.analysis;

 import com.intellij.core.CoreDeprecatedMessagesBundle;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;

 /**
 * @deprecated use other bundles ({@link AnalysisBundle}, {@link com.intellij.codeInsight.CodeInsightBundle}) instead
 */
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@Deprecated(forRemoval = true)
 public final class AnalysisScopeBundle {
  private AnalysisScopeBundle() {
  }
@@ -16,7 +16,6 @@ import com.intellij.util.ObjectUtils;
 import com.intellij.util.ui.ColorIcon;
 import com.intellij.util.ui.ColorizeProxyIcon;
 import com.intellij.util.ui.EmptyIcon;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -49,8 +48,7 @@ public class HighlightDisplayLevel {
  /**
   * @deprecated use {@link #WEAK_WARNING} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static final HighlightDisplayLevel INFO = new HighlightDisplayLevel(HighlightSeverity.INFO, createIconByKey(DO_NOT_SHOW_KEY));

  public static final HighlightDisplayLevel WEAK_WARNING =
@@ -20,7 +20,6 @@ import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.util.Consumer;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.containers.MultiMap;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -182,8 +181,7 @@ public abstract class CompletionContributor {
   * @deprecated use {@link CompletionResultSet#addLookupAdvertisement(String)}
   * @return text to be shown at the bottom of the lookup list
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @Nullable
  @Nls(capitalization = Nls.Capitalization.Sentence)
  public String advertise(@NotNull CompletionParameters parameters) {
@@ -13,8 +13,7 @@ public class CompletionContributorEP extends LanguageExtensionPoint<CompletionCo
  /**
   * @deprecated {@link #CompletionContributorEP(String, String, PluginDescriptor)} must be used to ensure that plugin descriptor is set.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public CompletionContributorEP() {
  }

@@ -40,8 +40,7 @@ public abstract class CompletionService {
   * @param text
   * @deprecated use {@link CompletionResultSet#addLookupAdvertisement(String)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract void setAdvertisementText(@Nullable @NlsContexts.PopupAdvertisement String text);

  /**
@@ -15,8 +15,6 @@
 */
 package com.intellij.codeInsight.daemon;

-import org.jetbrains.annotations.ApiStatus;
-
 /**
 * @deprecated specify groupBundle="messages.InspectionsBundle" and corresponding groupKey attribute in localInspection tag instead of
 * using constant from this class
@@ -24,43 +22,43 @@ import org.jetbrains.annotations.ApiStatus;
@Deprecated
 public interface GroupNames {
  /** @deprecated use groupKey="group.names.probable.bugs" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String BUGS_GROUP_NAME = "Probable bugs";
  /** @deprecated use groupKey="group.names.compiler.issues" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String COMPILER_ISSUES = "Compiler issues";
  /** @deprecated use groupKey="group.names.potentially.confusing.code.constructs" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String CONFUSING_GROUP_NAME = "Potentially confusing code constructs";
  /** @deprecated use groupKey="group.names.encapsulation.issues" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String ENCAPSULATION_GROUP_NAME = "Encapsulation";
  /** @deprecated use groupKey="group.names.imports" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String IMPORTS_GROUP_NAME = "Imports";
  /** @deprecated use groupKey="group.names.initialization.issues" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String INITIALIZATION_GROUP_NAME = "Initialization";
  /** @deprecated use groupKey="group.names.internationalization.issues" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String INTERNATIONALIZATION_GROUP_NAME = "Internationalization";
    /** @deprecated use groupKey="group.names.logging.issues" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String LOGGING_GROUP_NAME = "Logging";
  /** @deprecated use groupKey="group.names.naming.conventions" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String NAMING_CONVENTIONS_GROUP_NAME = "Naming conventions";
  /** @deprecated use groupKey="group.names.code.style.issues" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String STYLE_GROUP_NAME = "Code style issues";

  /** @deprecated use groupKey="group.names.declaration.redundancy" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String DECLARATION_REDUNDANCY = "Declaration redundancy";
  /** @deprecated use groupKey="group.names.modularization.issues" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String MODULARIZATION_GROUP_NAME = "Modularization issues";
  /** @deprecated use groupKey="group.names.properties.files" instead */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  String PROPERTIES_GROUP_NAME = "Properties files";
 }
@@ -4,7 +4,6 @@ package com.intellij.codeInsight.daemon;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.TextRange;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -30,7 +29,6 @@ public interface QuickFixActionRegistrar {
   * it should be fixed to provide its own EP, so it's possible to plug into the fix directly
   * instead of filtering it with this method
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default void unregister(@NotNull Condition<? super IntentionAction> condition) {}
 }
@@ -11,7 +11,6 @@ import com.intellij.openapi.util.Iconable;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.ObjectUtils;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 /**
@@ -106,8 +105,7 @@ public interface IntentionAction extends FileModifier {
   * @return true if the action was applied successfully to the non-physical file.
   * @deprecated do not call or override this method: this API will be changed.
   */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
-  @Deprecated
+  @Deprecated(forRemoval = true)
  default boolean invokeForPreview(@NotNull Project project, Editor editor, PsiFile file) {
    if (!startInWriteAction()) return false;
    var copy = ObjectUtils.tryCast(getFileModifierForPreview(file), IntentionAction.class);
@@ -9,7 +9,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.psi.PsiElement;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -30,8 +29,7 @@ public abstract class IntentionManager  {
  /**
   * @deprecated Use {@link #getInstance()} instead.
   */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.2")
-  @Deprecated
+  @Deprecated(forRemoval = true)
  public static IntentionManager getInstance(Project project) {
    return getInstance();
  }
@@ -10,7 +10,6 @@ import com.intellij.psi.PsiNamedElement;
 import com.intellij.psi.SmartPointerManager;
 import com.intellij.psi.SmartPsiElementPointer;
 import com.intellij.psi.util.PsiUtilCore;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -109,8 +108,7 @@ public final class LookupElementBuilder extends LookupElement {
  /**
   * @deprecated use {@link #withInsertHandler(InsertHandler)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @Contract(pure=true)
  public @NotNull LookupElementBuilder setInsertHandler(@Nullable InsertHandler<LookupElement> insertHandler) {
    return withInsertHandler(insertHandler);
@@ -228,8 +226,7 @@ public final class LookupElementBuilder extends LookupElement {
  /**
   * @deprecated use {@link #withTypeText(String)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @Contract(pure=true)
  public @NotNull LookupElementBuilder setTypeText(@Nullable String typeText) {
    return withTypeText(typeText);
@@ -263,8 +260,7 @@ public final class LookupElementBuilder extends LookupElement {
  /**
   * @deprecated use {@link #withPresentableText(String)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @Contract(pure=true)
  public @NotNull LookupElementBuilder setPresentableText(@NotNull String presentableText) {
    return withPresentableText(presentableText);
@@ -306,8 +302,7 @@ public final class LookupElementBuilder extends LookupElement {
  /**
   * @deprecated use {@link #withTailText(String)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @Contract(pure=true)
  public @NotNull LookupElementBuilder setTailText(@Nullable String tailText) {
    return withTailText(tailText);
@@ -9,7 +9,6 @@ import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -111,8 +110,7 @@ public abstract class InspectionManager {
  /**
   * @deprecated use {@link #createProblemDescriptor(PsiElement, String, boolean, LocalQuickFix[], ProblemHighlightType)} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @NotNull
  @Contract(pure = true)
  public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement,
@@ -123,8 +121,7 @@ public abstract class InspectionManager {
  /**
   * @deprecated use {@link #createProblemDescriptor(PsiElement, String, LocalQuickFix[], ProblemHighlightType, boolean, boolean)} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @NotNull
  @Contract(pure = true)
  public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement,
@@ -149,8 +146,7 @@ public abstract class InspectionManager {
  /**
   * @deprecated use {@link #createProblemDescriptor(PsiElement, TextRange, String, ProblemHighlightType, boolean, LocalQuickFix...)} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @NotNull
  @Contract(pure = true)
  public abstract ProblemDescriptor createProblemDescriptor(@NotNull final PsiElement psiElement,
@@ -162,8 +158,7 @@ public abstract class InspectionManager {
  /**
   * @deprecated use {@link #createNewGlobalContext()} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @NotNull
  @Contract(pure = true)
  public abstract GlobalInspectionContext createNewGlobalContext(boolean reuse);
@@ -428,8 +428,7 @@ public abstract class InspectionProfileEntry implements BatchSuppressableTool {
   * @return serialization filter.
   */
  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  protected @Nullable SerializationFilter getSerializationFilter() {
    return XmlSerializer.getJdomSerializer().getDefaultSerializationFilter();
  }
@@ -7,7 +7,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.ObjectUtils;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 /**
@@ -57,8 +56,7 @@ public interface LocalQuickFix extends QuickFix<ProblemDescriptor>, FileModifier
   * @return true if the fix was successfully applied to the copy; false otherwise
   * @deprecated do not call or override this method: this API will be changed.
   */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
-  @Deprecated
+  @Deprecated(forRemoval = true)
  default boolean applyFixForPreview(@NotNull Project project, @NotNull ProblemDescriptor previewDescriptor) {
    if (!startInWriteAction()) return false;
    PsiElement element = previewDescriptor.getStartElement();
@@ -1,8 +1,6 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.codeInspection;

-import org.jetbrains.annotations.ApiStatus;
-
 /**
 * Defines type used to determine highlighting of {@link ProblemDescriptor}.
 * Please use {@link #GENERIC_ERROR_OR_WARNING} if you are not sure which one to pick, otherwise user's settings would be ignored.
@@ -45,8 +43,7 @@ public enum ProblemHighlightType {
   *
   * @deprecated use {@link #WEAK_WARNING} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  INFO,

  /**
@@ -6,7 +6,6 @@ import com.intellij.codeInspection.reference.RefManager;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -31,8 +30,7 @@ public abstract class InspectionExtensionsFactory {
  /**
   * @deprecated use {@link #isProjectConfiguredToRunInspections(Project, boolean, Runnable)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean isProjectConfiguredToRunInspections(@NotNull Project project, boolean online) {
    return true;
  }
@@ -3,7 +3,6 @@ package com.intellij.codeInspection.reference;

 import com.intellij.psi.PsiElement;
 import com.intellij.psi.SmartPsiElementPointer;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -35,8 +34,7 @@ public interface RefElement extends RefEntity {
  /**
   * @deprecated use {@link #getPsiElement()}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default PsiElement getElement() {
    return getPsiElement();
  }
@@ -195,6 +195,5 @@ public interface AnnotationBuilder {

  /** @deprecated Use {@link #create()} instead */
  @Deprecated(forRemoval = true)
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
  Annotation createAnnotation();
 }
@@ -64,8 +64,7 @@ public abstract class FileEditorManager {
  /**
   * @deprecated use {@link #openTextEditor(OpenFileDescriptor, boolean)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public void navigateToTextEditor(@NotNull OpenFileDescriptor descriptor, boolean focusEditor) {
    openTextEditor(descriptor, focusEditor);
  }
@@ -7,7 +7,6 @@ import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.messages.Topic;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.util.EventListener;
@@ -79,8 +78,7 @@ public interface FileEditorManagerListener extends EventListener {
    /**
     * @deprecated use {@link Before} directly
     */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+    @Deprecated(forRemoval = true)
    class Adapter implements Before {
      @Override
      public void beforeFileOpened(@NotNull FileEditorManager source, @NotNull VirtualFile file) { }
@@ -8,7 +8,6 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vfs.VirtualFile;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.util.Collection;
@@ -56,8 +55,7 @@ public abstract class WolfTheProblemSolver {
  /**
   * @deprecated use {@link com.intellij.problems.ProblemListener} directly
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract static class ProblemListener implements com.intellij.problems.ProblemListener {
    @Override
    public void problemsAppeared(@NotNull VirtualFile file) {}
@@ -69,8 +67,7 @@ public abstract class WolfTheProblemSolver {
  /**
   * @deprecated Use message bus {@link ProblemListener#TOPIC} instead.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract void addProblemListener(@NotNull ProblemListener listener, @NotNull Disposable parentDisposable);

  public abstract void queue(@NotNull VirtualFile suspiciousFile);
@@ -8,15 +8,13 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.problems.WolfTheProblemSolver;
 import com.intellij.psi.search.scope.packageSet.FilteredPackageSet;
 import com.intellij.psi.search.scope.packageSet.NamedScope;
-import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval;
 import org.jetbrains.annotations.NotNull;

 /**
 * @see com.intellij.codeInsight.problems.WolfTheProblemSolverImpl#processProblemFiles
 * @deprecated this scope is obsolete and will be removed soon
 */
-@ScheduledForRemoval(inVersion = "2022.2")
-@Deprecated
+@Deprecated(forRemoval = true)
 public final class ProblemsScope extends NamedScope {
  public static final ProblemsScope INSTANCE = new ProblemsScope();

@@ -6,14 +6,12 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 public abstract class PackageSetBase implements PackageSet {
  /** @deprecated use {@link PackageSetBase#contains(VirtualFile, Project, NamedScopesHolder)} instead */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean contains(@NotNull VirtualFile file, NamedScopesHolder holder) {
    return false;
  }
@@ -19,7 +19,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.containers.ContainerUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -35,8 +34,7 @@ public class UnionPackageSet extends CompoundPackageSet {
  /**
   * @deprecated use {@link #create(PackageSet...)} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public UnionPackageSet(@NotNull PackageSet set1, @NotNull PackageSet set2) {
    super(set1, set2);
  }
@@ -22,7 +22,6 @@ import com.intellij.util.xmlb.annotations.Transient;
 import com.intellij.util.xmlb.annotations.XCollection;
 import org.intellij.lang.annotations.MagicConstant;
 import org.jdom.Element;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -89,7 +88,7 @@ public class CodeInsightSettings implements PersistentStateComponent<Element>, C
  /**
   * @deprecated use accessors instead
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS;

  public boolean isSelectAutopopupSuggestionsByChars() {
@@ -20,7 +20,6 @@ import com.intellij.psi.impl.source.resolve.reference.impl.PsiMultiReference;
 import com.intellij.psi.meta.PsiMetaData;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.util.containers.ContainerUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -31,8 +30,7 @@ import static com.intellij.patterns.StandardPatterns.not;
 /**
 * @deprecated see {@link CompletionContributor}
 */
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
-@Deprecated
+@Deprecated(forRemoval = true)
 public class CompletionData {
  private static final Logger LOG = Logger.getInstance(CompletionData.class);
  public static final ObjectPattern.Capture<Character> NOT_JAVA_ID = not(CharPattern.javaIdentifierPartCharacter());
@@ -53,8 +51,7 @@ public class CompletionData {
  /**
   * @deprecated see {@link CompletionContributor}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  protected void registerVariant(CompletionVariant variant){
    myCompletionVariants.add(variant);
  }
@@ -164,8 +161,7 @@ public class CompletionData {
  /**
   * @deprecated Use {@link CompletionUtil} methods instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static String findPrefixDefault(final PsiElement insertedElement, final int offset, @NotNull final ElementPattern trimStart) {
    String substr = insertedElement.getText().substring(0, offset - insertedElement.getTextRange().getStartOffset());
    if (substr.length() == 0 || Character.isWhitespace(substr.charAt(substr.length() - 1))) return "";
@@ -10,7 +10,6 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.filters.ElementFilter;
 import com.intellij.util.ReflectionUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;

 import java.util.*;
@@ -18,8 +17,7 @@ import java.util.*;
 /**
 * @deprecated use CompletionContributor
 */
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+@Deprecated(forRemoval = true)
 public class CompletionVariant {
  protected static final TailType DEFAULT_TAIL_TYPE = TailType.SPACE;

@@ -6,7 +6,6 @@ import com.intellij.codeInsight.daemon.HighlightDisplayKey;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.openapi.util.TextRange;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -28,8 +27,7 @@ public final class QuickFixAction {
  }

  /** @deprecated This is used by TeamCity plugin */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static void registerQuickFixAction(@Nullable HighlightInfo info,
                                            @Nullable IntentionAction action,
                                            @Nullable List<IntentionAction> options,
@@ -23,7 +23,6 @@ import com.intellij.psi.meta.PsiMetaData;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.ui.SizedIcon;
 import com.intellij.util.PlatformIcons;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;

 import javax.swing.*;
@@ -48,8 +47,7 @@ public class DefaultLookupItemRenderer extends LookupElementRenderer<LookupItem<
   * @deprecated use {@link #getRawIcon(LookupElement)}
   */
  @Nullable
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static Icon getRawIcon(final LookupElement item, boolean real) {
    return getRawIcon(item);
  }
@@ -5,7 +5,6 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageEditorUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -59,13 +58,11 @@ public abstract class LookupManager {
  public abstract void addPropertyChangeListener(@NotNull PropertyChangeListener listener);

  /** @deprecated Use {@link LookupManagerListener#TOPIC} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract void addPropertyChangeListener(@NotNull PropertyChangeListener listener, @NotNull Disposable disposable);

  /** @deprecated Use {@link LookupManagerListener#TOPIC} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract void removePropertyChangeListener(@NotNull PropertyChangeListener listener);

  public abstract @NotNull Lookup createLookup(@NotNull Editor editor, LookupElement @NotNull [] items, final @NotNull String prefix, @NotNull LookupArranger arranger);
@@ -8,7 +8,6 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.RangeMarker;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;

@@ -62,8 +61,7 @@ public interface TemplateOptionalProcessor {
  /**
   * @deprecated Please override {@link #isVisible(Template, TemplateContext)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default boolean isVisible(final Template template) {
    return true;
  }
@@ -1,14 +1,11 @@
 // 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.codeInspection;

-import org.jetbrains.annotations.ApiStatus;
-
 import java.util.HashMap;

 /**
 * @deprecated Use {@link HashMap}
 */
-@ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
-@Deprecated
+@Deprecated(forRemoval = true)
 public class SmartHashMap<K, V> extends HashMap<K, V> {
 }
@@ -4,7 +4,6 @@ package com.intellij.find;

 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.util.NlsSafe;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -69,15 +68,13 @@ public abstract class FindSettings {
  /**
   * @deprecated use {@link FindInProjectSettings#getRecentFindStrings()}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract String @NotNull [] getRecentFindStrings();

  /**
   * @deprecated use {@link FindInProjectSettings#getRecentReplaceStrings()}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract String @NotNull [] getRecentReplaceStrings();

  /**
@@ -6,7 +6,6 @@ import com.intellij.codeInspection.ex.InspectionProfileImpl;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.search.scope.packageSet.NamedScopesHolder;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -49,8 +48,7 @@ public interface InspectionProfileManager {
  /**
   * @deprecated use {@link #getSeverityRegistrar()}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default @NotNull SeverityRegistrar getOwnSeverityRegistrar() {
    return getSeverityRegistrar();
  }
@@ -20,7 +20,6 @@ import com.intellij.psi.*;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.indexing.FileBasedIndex;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -116,8 +115,7 @@ public class FileReferenceSet {
   * This should be removed.
   * @deprecated use {@link FileReference#getContexts()} instead.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  protected Collection<PsiFileSystemItem> getExtraContexts() {
    return emptyList();
  }
@@ -14,7 +14,6 @@ import com.intellij.psi.*;
 import com.intellij.psi.impl.FreeThreadedFileViewProvider;
 import com.intellij.psi.impl.PsiManagerEx;
 import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.util.List;
@@ -22,8 +21,7 @@ import java.util.List;
 /**
 * @deprecated Use methods from {@link InjectedLanguageManager} instead
 */
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@Deprecated(forRemoval = true)
 public interface InjectedFileViewProvider extends FileViewProvider, FreeThreadedFileViewProvider {
  default void rootChangedImpl(@NotNull PsiFile psiFile) {
    if (!isPhysical()) return; // injected PSI change happened inside reparse; ignore
@@ -27,7 +27,6 @@ import com.intellij.reference.SoftReference;
 import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.util.containers.ConcurrentList;
 import com.intellij.util.containers.ContainerUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -39,8 +38,7 @@ import java.util.function.Supplier;
 /**
 * @deprecated Use {@link InjectedLanguageManager} instead
 */
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@Deprecated(forRemoval = true)
 public class InjectedLanguageUtilBase {
  public static final Key<IElementType> INJECTED_FRAGMENT_TYPE = Key.create("INJECTED_FRAGMENT_TYPE");

@@ -431,8 +429,7 @@ public class InjectedLanguageUtilBase {
   * @deprecated use {@link InjectedLanguageManager#getCachedInjectedDocumentsInRange(PsiFile, TextRange)} instead
   */
  @NotNull
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static ConcurrentList<DocumentWindow> getCachedInjectedDocuments(@NotNull PsiFile hostPsiFile) {
    // modification of cachedInjectedDocuments must be under InjectedLanguageManagerImpl.ourInjectionPsiLock only
    List<DocumentWindow> injected = hostPsiFile.getUserData(INJECTED_DOCS_KEY);
@@ -536,8 +533,7 @@ public class InjectedLanguageUtilBase {
  /**
   * @deprecated Use {@link InjectedLanguageManager#getInjectedPsiFiles(PsiElement)} != null instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static boolean hasInjections(@NotNull PsiLanguageInjectionHost host) {
    if (!host.isPhysical()) return false;
    final Ref<Boolean> result = Ref.create(false);
@@ -243,8 +243,7 @@ public class TemplateDataElementType extends IFileElementType implements ITempla
  /**
   * @deprecated Use {@link #isInsertionToken(IElementType, CharSequence)} instead.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  protected @NotNull TokenSet getTemplateDataInsertionTokens() {
    return TokenSet.EMPTY;
  }
@@ -273,8 +272,7 @@ public class TemplateDataElementType extends IFileElementType implements ITempla
   * </ul>
   * @deprecated this method is going to be removed and com.intellij.lang.ASTFactory#leaf(com.intellij.psi.tree.IElementType, java.lang.CharSequence) going to be used instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  protected OuterLanguageElementImpl createOuterLanguageElement(@NotNull CharSequence internedTokenText,
                                                                @NotNull IElementType outerElementType) {
    var factoryCreatedElement = ASTFactory.leaf(outerElementType, internedTokenText);
@@ -173,8 +173,7 @@ public final class StartupActionScriptManager {
    }

    /** @deprecated Use {@link #CopyCommand(Path, Path)} */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+    @Deprecated(forRemoval = true)
    public CopyCommand(@NotNull File source, @NotNull File destination) {
      mySource = source.getAbsolutePath();
      myDestination = destination.getAbsolutePath();
@@ -9,15 +9,13 @@ import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.CodeStyleSettingsFacade;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 /**
 * @deprecated See deprecations for specific methods, use methods of {@link com.intellij.application.options.CodeStyle} instead.
 */
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@Deprecated(forRemoval = true)
 public abstract class CodeStyleFacade {
  public static CodeStyleFacade getInstance() {
    return ApplicationManager.getApplication().getService(CodeStyleFacade.class);
@@ -38,8 +36,7 @@ public abstract class CodeStyleFacade {
  /**
   * @deprecated Use {@link com.intellij.application.options.CodeStyle#getLineIndent(Editor, Language, int, boolean)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @Nullable
  public String getLineIndent(@NotNull Editor editor, @Nullable Language language, int offset, boolean allowDocCommit) {
    return getLineIndent(editor.getDocument(), offset);
@@ -48,31 +45,27 @@ public abstract class CodeStyleFacade {
  /**
   * @deprecated Use {@link com.intellij.application.options.CodeStyle#getIndentSize(PsiFile)} instead.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract int getIndentSize(FileType fileType);

  /**
   * @deprecated Use {@link com.intellij.application.options.CodeStyle#getFacade} and
   * {@link CodeStyleSettingsFacade#getTabSize()}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract int getTabSize(final FileType fileType);

  /**
   * @deprecated Use {@code CodeStyle.getIndentOptions(PsiFile).USE_TAB_CHARACTER}. See {@code CodeStyle for more information}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract boolean useTabCharacter(final FileType fileType);

  /**
   * @deprecated Use {@code getLineSeparator()} method of {@code CodeStyle.getSettings(PsiFile)} or
   *             {@code CodeStyle.getSettings(Project)} if there is no {@code PsiFile}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract String getLineSeparator();

 }
@@ -6,7 +6,6 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -54,8 +53,7 @@ public interface FormattingModelBuilder {
  /**
   * @deprecated use {@link #createModel(FormattingContext)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  default @NotNull FormattingModel createModel(final @NotNull PsiElement element,
                                               final @NotNull TextRange range,
                                               final @NotNull CodeStyleSettings settings,
@@ -66,8 +64,7 @@ public interface FormattingModelBuilder {
  /**
   * @deprecated use {@link #createModel(FormattingContext)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  default @NotNull FormattingModel createModel(final @NotNull PsiElement element,
                                               final @NotNull CodeStyleSettings settings,
                                               @NotNull FormattingMode mode) {
@@ -77,8 +74,7 @@ public interface FormattingModelBuilder {
  /**
   * @deprecated use {@link #createModel(FormattingContext)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  default @NotNull FormattingModel createModel(final PsiElement element, final CodeStyleSettings settings) {
    return createModel(FormattingContext.create(element, settings));
  }
@@ -83,8 +83,7 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea
  /**
   * @deprecated See {@link #CodeStyleSettings()}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public CodeStyleSettings(boolean loadExtensions) {
    this(loadExtensions, true);
  }
@@ -206,28 +205,23 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea
  @Deprecated
  public String FIELD_NAME_PREFIX = "";
  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#STATIC_FIELD_NAME_PREFIX} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public String STATIC_FIELD_NAME_PREFIX = "";
  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#PARAMETER_NAME_PREFIX} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public String PARAMETER_NAME_PREFIX = "";
  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#LOCAL_VARIABLE_NAME_PREFIX} */
  @Deprecated
  public String LOCAL_VARIABLE_NAME_PREFIX = "";

  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#FIELD_NAME_SUFFIX} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public String FIELD_NAME_SUFFIX = "";
  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#STATIC_FIELD_NAME_SUFFIX} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public String STATIC_FIELD_NAME_SUFFIX = "";
  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#PARAMETER_NAME_SUFFIX} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public String PARAMETER_NAME_SUFFIX = "";
  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#LOCAL_VARIABLE_NAME_SUFFIX} */
  @Deprecated
@@ -239,12 +233,10 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea

 //----------------- 'final' modifier settings -------
  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#GENERATE_FINAL_LOCALS} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean GENERATE_FINAL_LOCALS;
  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#GENERATE_FINAL_PARAMETERS} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean GENERATE_FINAL_PARAMETERS;

 //----------------- visibility -----------------------------
@@ -254,24 +246,20 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea

 //----------------- generate parentheses around method arguments ----------
  /** @deprecated Use RubyCodeStyleSettings.PARENTHESES_AROUND_METHOD_ARGUMENTS */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean PARENTHESES_AROUND_METHOD_ARGUMENTS = true;

 //----------------- annotations ----------------
  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#USE_EXTERNAL_ANNOTATIONS} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean USE_EXTERNAL_ANNOTATIONS;
  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#INSERT_OVERRIDE_ANNOTATION} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean INSERT_OVERRIDE_ANNOTATION = true;

 //----------------- override -------------------
  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#REPEAT_SYNCHRONIZED} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean REPEAT_SYNCHRONIZED = true;

  private final List<String> myRepeatAnnotations = new ArrayList<>();
@@ -293,50 +281,41 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea

  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#LAYOUT_STATIC_IMPORTS_SEPARATELY} */
  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean LAYOUT_STATIC_IMPORTS_SEPARATELY = true;

  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#USE_FQ_CLASS_NAMES} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean USE_FQ_CLASS_NAMES;

  /** @deprecated use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#CLASS_NAMES_IN_JAVADOC} instead */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean USE_FQ_CLASS_NAMES_IN_JAVADOC = true;

  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#USE_SINGLE_CLASS_IMPORTS */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean USE_SINGLE_CLASS_IMPORTS = true;

  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#INSERT_INNER_CLASS_IMPORTS */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean INSERT_INNER_CLASS_IMPORTS;

  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public int CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND = 5;

  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public int NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND = 3;

  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#PACKAGES_TO_USE_IMPORT_ON_DEMAND */
  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public final PackageEntryTable PACKAGES_TO_USE_IMPORT_ON_DEMAND = new PackageEntryTable();

  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#IMPORT_LAYOUT_TABLE */
  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public final PackageEntryTable IMPORT_LAYOUT_TABLE = new PackageEntryTable();

  /** @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#isLayoutStaticImportsSeparately()} */
@@ -441,13 +420,13 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea

 // region ORDER OF MEMBERS

-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int STATIC_FIELDS_ORDER_WEIGHT = 1;
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int FIELDS_ORDER_WEIGHT = 2;
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int CONSTRUCTORS_ORDER_WEIGHT = 3;
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int STATIC_METHODS_ORDER_WEIGHT = 4;
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int METHODS_ORDER_WEIGHT = 5;
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int STATIC_INNER_CLASSES_ORDER_WEIGHT = 6;
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3") public int INNER_CLASSES_ORDER_WEIGHT = 7;
+  @Deprecated(forRemoval = true) public int STATIC_FIELDS_ORDER_WEIGHT = 1;
+  @Deprecated(forRemoval = true) public int FIELDS_ORDER_WEIGHT = 2;
+  @Deprecated(forRemoval = true) public int CONSTRUCTORS_ORDER_WEIGHT = 3;
+  @Deprecated(forRemoval = true) public int STATIC_METHODS_ORDER_WEIGHT = 4;
+  @Deprecated(forRemoval = true) public int METHODS_ORDER_WEIGHT = 5;
+  @Deprecated(forRemoval = true) public int STATIC_INNER_CLASSES_ORDER_WEIGHT = 6;
+  @Deprecated(forRemoval = true) public int INNER_CLASSES_ORDER_WEIGHT = 7;

 // endregion

@@ -483,16 +462,14 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea
  /**
   * @deprecated Use {@link com.intellij.psi.codeStyle.JavaCodeStyleSettings#JD_LEADING_ASTERISKS_ARE_ENABLED}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean JD_LEADING_ASTERISKS_ARE_ENABLED = true;


 // endregion

  /** @deprecated Use {@link com.intellij.application.options.JspCodeStyleSettings#JSP_PREFER_COMMA_SEPARATED_IMPORT_LIST} */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean JSP_PREFER_COMMA_SEPARATED_IMPORT_LIST;

  //----------------------------------------------------------------------------------------
@@ -34,8 +34,7 @@ public class CodeStyleSettingsManager implements PersistentStateComponentWithMod
  /**
   * @deprecated Use {@link #setMainProjectCodeStyle(CodeStyleSettings)} or {@link #getMainProjectCodeStyle()} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @Nullable
  public volatile CodeStyleSettings PER_PROJECT_SETTINGS;

@@ -23,7 +23,6 @@ import com.intellij.util.xmlb.SerializationFilter;
 import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters;
 import org.intellij.lang.annotations.MagicConstant;
 import org.jdom.Element;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -1196,8 +1195,7 @@ public class CommonCodeStyleSettings {
  /**
   * @deprecated Use {@link CodeStyle#getLocalLanguageSettings(Editor, int)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static CommonCodeStyleSettings getLocalCodeStyleSettings(Editor editor, int tailOffset) {
    return CodeStyle.getLocalLanguageSettings(editor, tailOffset);
  }
@@ -15,7 +15,6 @@ package com.intellij.psi.codeStyle;

 import com.intellij.lang.Language;
 import com.intellij.psi.PsiFile;
-import org.jetbrains.annotations.ApiStatus;

 /**
 * Contains fields which are left for compatibility with earlier versions. These fields shouldn't be used anymore. Every language must have
@@ -29,27 +28,27 @@ public class LegacyCodeStyleSettings extends CommonCodeStyleSettings {
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean KEEP_LINE_BREAKS = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public int KEEP_BLANK_LINES_IN_DECLARATIONS = 2;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public int KEEP_BLANK_LINES_IN_CODE = 2;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public int BLANK_LINES_AROUND_CLASS = 1;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean INDENT_CASE_FROM_SWITCH = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
@@ -59,152 +58,152 @@ public class LegacyCodeStyleSettings extends CommonCodeStyleSettings {
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_AROUND_LOGICAL_OPERATORS = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_AROUND_EQUALITY_OPERATORS = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_AROUND_RELATIONAL_OPERATORS = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_AROUND_BITWISE_OPERATORS = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_AROUND_ADDITIVE_OPERATORS = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_AROUND_MULTIPLICATIVE_OPERATORS = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_AROUND_SHIFT_OPERATORS = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_AFTER_COMMA = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_BEFORE_COMMA = false;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_AFTER_SEMICOLON = true; // in for-statement
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_BEFORE_SEMICOLON = false; // in for-statement
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_WITHIN_PARENTHESES = false;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_WITHIN_METHOD_CALL_PARENTHESES = false;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_WITHIN_METHOD_PARENTHESES = false;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_WITHIN_IF_PARENTHESES = false;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_WITHIN_WHILE_PARENTHESES = false;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_WITHIN_BRACKETS = false;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_AFTER_TYPE_CAST = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_BEFORE_METHOD_CALL_PARENTHESES = false;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_BEFORE_METHOD_PARENTHESES = false;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_BEFORE_IF_PARENTHESES = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_BEFORE_WHILE_PARENTHESES = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_BEFORE_CLASS_LBRACE = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_BEFORE_METHOD_LBRACE = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_BEFORE_IF_LBRACE = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_BEFORE_WHILE_LBRACE = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_BEFORE_QUEST = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_AFTER_QUEST = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_BEFORE_COLON = true;
  /**
   * @deprecated See {@link LegacyCodeStyleSettings}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean SPACE_AFTER_COLON = true;

  public LegacyCodeStyleSettings() {
@@ -15,7 +15,6 @@ import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.util.CharTable;
 import com.intellij.util.containers.ContainerUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -29,8 +28,7 @@ public final class FormatterUtil {
  /**
   * @deprecated Use {@link #getReformatBeforeCommitCommandName()} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static final String REFORMAT_BEFORE_COMMIT_COMMAND_NAME = "Reformat Code Before Commit";

  public static final Collection<String> FORMATTER_ACTION_NAMES = Collections.unmodifiableCollection(ContainerUtil.newHashSet(
@@ -3,7 +3,6 @@ package com.intellij.ui;

 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.util.containers.Convertor;
-import org.jetbrains.annotations.ApiStatus;

 import javax.swing.*;
 import javax.swing.tree.TreePath;
@@ -16,8 +15,7 @@ public abstract class TreeUIHelper {
  /**
   * @deprecated use JBTree class instead, it will automatically configure tool tips
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract void installToolTipHandler(JTree tree);

  public abstract void installEditSourceOnDoubleClick(JTree tree);
@@ -308,8 +308,7 @@ public final class IconUtil {
  /**
   * @deprecated This icon is not used by platform anymore.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static @NotNull Icon getAnalyzeIcon() {
    return IconLoader.getIcon(getToolbarDecoratorIconsFolder() + "analyze.png", IconUtil.class.getClassLoader());
  }
@@ -810,8 +809,7 @@ public final class IconUtil {
  /**
   * @deprecated Use {@link #createImageIcon(Image)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static @NotNull JBImageIcon createImageIcon(final @NotNull BufferedImage img) {
    return createImageIcon((Image)img);
  }
@@ -5,7 +5,6 @@ import com.intellij.diff.DiffDialogHints;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.util.concurrency.annotations.RequiresEdt;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.util.List;
@@ -33,8 +32,7 @@ public interface DiffRequestChain extends UserDataHolder {
   * @see com.intellij.diff.impl.CacheDiffRequestChainProcessor#setCurrentRequest
   * @deprecated This method will not change selected position if chain was already shown.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @RequiresEdt
  void setIndex(int index);
 }
@@ -22,7 +22,6 @@ import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.pom.Navigatable;
 import com.intellij.util.ObjectUtils;
 import com.intellij.util.concurrency.annotations.RequiresEdt;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;

 /**
@@ -51,8 +50,7 @@ public interface DiffContent extends UserDataHolder {
   * @deprecated isn't called by the platform anymore
   */
  @Nullable
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default OpenFileDescriptor getOpenFileDescriptor() {
    return ObjectUtils.tryCast(getNavigatable(), OpenFileDescriptor.class);
  }
@@ -22,7 +22,6 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.pom.Navigatable;
 import com.intellij.util.LineSeparator;
 import com.intellij.util.ObjectUtils;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -70,8 +69,7 @@ public interface DocumentContent extends DiffContent {
   * @deprecated isn't called by the platform anymore
   */
  @Nullable
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default OpenFileDescriptor getOpenFileDescriptor(int offset) {
    LineCol position = LineCol.fromOffset(getDocument(), offset);
    return ObjectUtils.tryCast(getNavigatable(position), OpenFileDescriptor.class);
@@ -6,7 +6,6 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.DataProvider;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
-import org.jetbrains.annotations.ApiStatus;

 import javax.swing.*;
 import java.util.List;
@@ -106,8 +105,7 @@ public interface DiffUserDataKeys {
  /**
   * @deprecated Use {@link DiffUtil#addNotification}
   */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
-  @Deprecated
+  @Deprecated(forRemoval = true)
  Key<List<JComponent>> NOTIFICATIONS = Key.create("Diff.Notifications");

  /**
@@ -26,8 +26,7 @@ import java.lang.annotation.Target;
 * Used to indicate that a method should be called in background thread
 * @deprecated Use {@link RequiresBackgroundThread}.
 */
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@Deprecated(forRemoval = true)
@Retention(RetentionPolicy.CLASS)
@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.PARAMETER})
 public @interface CalledInBackground {
@@ -17,7 +17,6 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.NlsActions;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -102,8 +101,7 @@ public interface DiffUserDataKeysEx extends DiffUserDataKeys {
   *
   * @deprecated use {@link DiffEditorTabFilesManager#isEditorDiffAvailable} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  Key<Boolean> DIFF_IN_EDITOR = Key.create("Diff.DiffInEditor");

  /**
@@ -35,7 +35,6 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.EditorTextField;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -52,8 +51,7 @@ public abstract class LineStatusMarkerPopupRenderer extends LineStatusMarkerRend
  /**
   * @deprecated Use {@link LineStatusMarkerPopupRenderer#LineStatusMarkerPopupRenderer(LineStatusTrackerI)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public LineStatusMarkerPopupRenderer(@NotNull LineStatusTrackerBase<?> tracker) {
    this((LineStatusTrackerI<?>)tracker);
  }
@@ -5,7 +5,6 @@ package com.intellij.dvcs.hosting;

 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.util.concurrency.annotations.RequiresBackgroundThread;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -36,8 +35,7 @@ public interface RepositoryListLoader {
  /**
   * @deprecated parent component is required for dialogs to not fall through on welcome screen
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default boolean enable() { return false; }

  /**
@@ -61,8 +61,7 @@ import static com.intellij.util.ui.UI.PanelFactory;
 * @deprecated Migrate to {@link com.intellij.openapi.vcs.ui.cloneDialog.VcsCloneDialogExtension}
 * or {@link com.intellij.openapi.vcs.ui.VcsCloneComponent}
 */
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@Deprecated(forRemoval = true)
 public abstract class CloneDvcsDialog extends DialogWrapper {

  private ComboBox<String> myRepositoryUrlCombobox;
@@ -392,8 +391,7 @@ public abstract class CloneDvcsDialog extends DialogWrapper {
  /**
   * @deprecated use {@link #getRepositoryHostingServices()}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public void prependToHistory(@NotNull final String item) {
    myRepositoryUrlComboboxModel.add(item);
  }
@@ -16,7 +16,6 @@ import com.intellij.util.FontUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.update.ComparableObject;
 import com.intellij.util.ui.update.ComparableObjectCheck;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -138,8 +137,7 @@ public class PresentationData implements ColoredItemPresentation, ComparableObje
   *             Sets the icon shown for the node when it is collapsed in a tree, or when it is displayed
   *             in a non-tree view.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public void setClosedIcon(Icon closedIcon) {
    setIcon(closedIcon);
  }
@@ -150,8 +148,7 @@ public class PresentationData implements ColoredItemPresentation, ComparableObje
   * @deprecated Different icons for open/closed no longer supported. This function is no op.
   *             Sets the icon shown for the node when it is expanded in the tree.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public void setOpenIcon(Icon openIcon) {
  }

@@ -263,8 +263,7 @@ public abstract class AbstractTreeNode<T> extends PresentableNodeDescriptor<Abst
  /**
   * @deprecated use {@link #getPresentation()} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  protected String getToolTip() {
    return getPresentation().getTooltip();
  }
@@ -107,8 +107,7 @@ public abstract class ActionGroup extends AnAction {
  }

  /** @deprecated Use {@link Presentation#setPopupGroup(boolean)} instead. */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @Deprecated(forRemoval = true)
  public boolean isPopup(@NotNull String place) {
    return isPopup();
  }
@@ -6,7 +6,6 @@ import com.intellij.openapi.actionSystem.ex.AnActionListener;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.util.ActionCallback;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -145,8 +144,7 @@ public abstract class ActionManager {
   *   {@link #createActionToolbar(String, ActionGroup, boolean)}, or
   *   {@link com.intellij.ui.ToolbarDecorator} instead.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @NotNull
  public abstract JComponent createButtonToolbar(@NotNull String actionPlace, @NotNull ActionGroup messageActionGroup);

@@ -175,15 +173,13 @@ public abstract class ActionManager {
  /**
   * @deprecated Use {@link AnActionListener#TOPIC}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract void addAnActionListener(AnActionListener listener);

  /**
   * @deprecated Use {@link AnActionListener#TOPIC}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public void addAnActionListener(AnActionListener listener, Disposable parentDisposable) {
    ApplicationManager.getApplication().getMessageBus().connect(parentDisposable).subscribe(AnActionListener.TOPIC, listener);
  }
@@ -191,8 +187,7 @@ public abstract class ActionManager {
  /**
   * @deprecated Use {@link AnActionListener#TOPIC}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public abstract void removeAnActionListener(AnActionListener listener);

  @Nullable
@@ -364,8 +364,7 @@ public abstract class AnAction implements PossiblyDumbAware {
  }

  /** @deprecated not used anymore */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean isTransparentUpdate() {
    return this instanceof TransparentUpdate;
  }
@@ -432,8 +431,7 @@ public abstract class AnAction implements PossiblyDumbAware {
  }

  /** @deprecated not used anymore */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public interface TransparentUpdate {
  }

@@ -85,8 +85,7 @@ public class AnActionEvent implements PlaceProvider {
  /**
   * @deprecated use {@link #createFromInputEvent(InputEvent, String, Presentation, DataContext, boolean, boolean)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @NotNull
  public static AnActionEvent createFromInputEvent(@NotNull AnAction action, @Nullable InputEvent event, @NotNull String place) {
    DataContext context = event == null ? DataManager.getInstance().getDataContext() : DataManager.getInstance().getDataContext(event.getComponent());
@@ -225,8 +224,7 @@ public class AnActionEvent implements PlaceProvider {
   * @deprecated This method returns {@code true} for both main menu and context menu invocations. Use {@link ActionPlaces#isPopupPlace(String)}
   * instead to get results only from context menus.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean isFromContextMenu() {
    return myIsContextMenuAction;
  }
@@ -3,7 +3,6 @@ package com.intellij.openapi.actionSystem.ex;

 import com.intellij.openapi.actionSystem.*;
 import com.intellij.util.messages.Topic;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.util.List;
@@ -34,20 +33,17 @@ public interface AnActionListener {
  }

  /** @deprecated implement {@link #beforeActionPerformed(AnAction, AnActionEvent)} instead */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default void beforeActionPerformed(@NotNull AnAction action, @NotNull DataContext dataContext, @NotNull AnActionEvent event) {
  }

  /** @deprecated implement {@link #afterActionPerformed(AnAction, AnActionEvent, AnActionResult)} instead */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default void afterActionPerformed(@NotNull AnAction action, @NotNull DataContext dataContext, @NotNull AnActionEvent event) {
  }

  /** @deprecated Use {@link AnActionListener} directly. */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  abstract class Adapter implements AnActionListener {
  }
 }
@@ -8,7 +8,6 @@ import com.intellij.openapi.editor.event.EditorFactoryListener;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -163,8 +162,7 @@ public abstract class EditorFactory {
   * and released.
   * @deprecated use the {@link #addEditorFactoryListener(EditorFactoryListener, Disposable)} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @Deprecated(forRemoval = true)
  public abstract void addEditorFactoryListener(@NotNull EditorFactoryListener listener);

  /**
@@ -178,8 +176,7 @@ public abstract class EditorFactory {
   * and released.
   * @deprecated you should have used the {@link #addEditorFactoryListener(EditorFactoryListener, Disposable)} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @Deprecated(forRemoval = true)
  public abstract void removeEditorFactoryListener(@NotNull EditorFactoryListener listener);

  /**
@@ -100,8 +100,7 @@ public interface FoldingModel {
   * @deprecated Passing {@code false} for {@code moveCaretFromCollapsedRegion} might leave caret in an inconsistent state
   * after the operation. Use {@link #runBatchFoldingOperation(Runnable)} instead.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  void runBatchFoldingOperation(@NotNull Runnable operation, boolean moveCaretFromCollapsedRegion);

  default void runBatchFoldingOperationDoNotCollapseCaret(@NotNull Runnable operation) {
@@ -4,7 +4,6 @@ package com.intellij.openapi.editor;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.editor.markup.GutterIconRenderer;
 import com.intellij.openapi.util.UserDataHolderEx;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -93,8 +92,7 @@ public interface Inlay<T extends EditorCustomElementRenderer> extends Disposable
  /**
   * @deprecated Use {@link #update()} instead.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default void updateSize() {
    update();
  }
@@ -7,7 +7,6 @@ import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.ui.JBColor;
 import com.intellij.util.containers.Stack;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -34,8 +33,7 @@ public interface EditorColors {
  /**
   * @deprecated use {@code ScrollBarPainter.THUMB_OPAQUE_BACKGROUND} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @Deprecated(forRemoval = true)
  ColorKey SCROLLBAR_THUMB_COLOR = ColorKey.createColorKey(SystemInfo.isMac ? "ScrollBar.Mac.thumbColor" : "ScrollBar.thumbColor");

  TextAttributesKey TAB_SELECTED = TextAttributesKey.createTextAttributesKey("TAB_SELECTED");
@@ -66,7 +64,7 @@ public interface EditorColors {
  /**
   * @deprecated use {@link #GUTTER_BACKGROUND}
   */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  ColorKey LEFT_GUTTER_BACKGROUND = GUTTER_BACKGROUND;
  ColorKey NOTIFICATION_BACKGROUND = ColorKey.createColorKey("NOTIFICATION_BACKGROUND");

@@ -4,7 +4,6 @@ package com.intellij.openapi.editor.colors;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.ui.ColorUtil;
 import com.intellij.util.messages.Topic;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

@@ -38,7 +37,6 @@ public abstract class EditorColorsManager {
   */
  @SuppressWarnings("MethodMayBeStatic")
  @Deprecated(forRemoval = true)
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
  public final void addEditorColorsListener(@NotNull EditorColorsListener listener) {
    ApplicationManager.getApplication().getMessageBus().connect().subscribe(TOPIC, listener);
  }
@@ -7,7 +7,6 @@ import com.intellij.openapi.options.Scheme;
 import com.intellij.openapi.options.SchemeMetaInfo;
 import com.intellij.openapi.util.NlsSafe;
 import org.jdom.Element;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -66,16 +65,14 @@ public interface EditorColorsScheme extends Cloneable, TextAttributesScheme, Sch
   * @deprecated Quick documentation component's font size is stored in application level property, and can be obtained
   * using {@link com.intellij.codeInsight.documentation.DocumentationComponent#getQuickDocFontSize()}.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default FontSize getQuickDocFontSize() { return FontSize.SMALL; }

  /**
   * @deprecated Quick documentation component's font size is stored in application level property, and can be set
   * using {@link com.intellij.codeInsight.documentation.DocumentationComponent#setQuickDocFontSize(FontSize)}.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default void setQuickDocFontSize(@NotNull FontSize fontSize) {}

  @NotNull
@@ -85,8 +82,7 @@ public interface EditorColorsScheme extends Cloneable, TextAttributesScheme, Sch
   * @deprecated Use {@link #getFontPreferences()} and {@link ModifiableFontPreferences}
   * to change fonts.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  void setFont(EditorFontType key, Font font);

  float getLineSpacing();
@@ -2,7 +2,6 @@
 package com.intellij.openapi.editor.event;

 import com.intellij.openapi.Disposable;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 /**
@@ -55,8 +54,7 @@ public interface EditorEventMulticaster {
  /**
   * @deprecated Use {@link #addSelectionListener(SelectionListener, Disposable)} instead to avoid leaking listeners
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  void addSelectionListener(@NotNull SelectionListener listener);

  void addSelectionListener(@NotNull SelectionListener listener, @NotNull Disposable parentDisposable);
@@ -13,7 +13,6 @@ import com.intellij.openapi.editor.highlighter.HighlighterClient;
 import com.intellij.openapi.editor.highlighter.HighlighterIterator;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.psi.tree.IElementType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -42,8 +41,7 @@ public class EmptyEditorHighlighter implements EditorHighlighter, PrioritizedDoc
  /**
   * @deprecated Avoid specifying text attributes. Use {@link TextAttributesKey} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @Deprecated(forRemoval = true)
  public void setAttributes(TextAttributes attributes) {
    myCachedAttributes = attributes;
  }
@@ -5,7 +5,6 @@ import com.intellij.openapi.editor.RangeMarker;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.util.NlsContexts.Tooltip;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -124,8 +123,7 @@ public interface RangeHighlighter extends RangeMarker {
  /**
   * @deprecated Use the overload with {@link EditorColorsScheme}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @Nullable
  default Color getErrorStripeMarkColor() {
    return getErrorStripeMarkColor(null);
@@ -20,7 +20,6 @@ import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.extensions.KeyedFactoryEPBean;
 import com.intellij.psi.tree.IElementType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 /**
@@ -40,8 +39,7 @@ public interface SyntaxHighlighter {
   * {@link SyntaxHighlighterFactory#getSyntaxHighlighter(com.intellij.lang.Language, com.intellij.openapi.project.Project, com.intellij.openapi.vfs.VirtualFile)}
   */
  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  SyntaxHighlighterProvider PROVIDER = new FileTypeExtensionFactory<>(SyntaxHighlighterProvider.class, EP_NAME).get();

  /**
@@ -25,22 +25,22 @@ import java.awt.*;
@SuppressWarnings("UseJBColor")
 public interface FileStatus {
  /** @deprecated use {@link FileStatus#getColor} */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  Color COLOR_MERGE = new Color(117, 3, 220);
  /** @deprecated use {@link FileStatus#getColor} */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  Color COLOR_MODIFIED = new Color(0, 50, 160);
  /** @deprecated use {@link FileStatus#getColor} */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  Color COLOR_MISSING = Gray._97;
  /** @deprecated use {@link FileStatus#getColor} */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  Color COLOR_OUT_OF_DATE = Color.yellow.darker().darker();
  /** @deprecated use {@link FileStatus#getColor} */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  Color COLOR_SWITCHED = new Color(8, 151, 143);
  /** @deprecated use {@link FileStatus#getColor} */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  Color COLOR_UNKNOWN = new Color(153, 51, 0);

  FileStatus NOT_CHANGED = FileStatusFactory.getInstance().createFileStatus("NOT_CHANGED", PlatformEditorBundle
@@ -4,7 +4,6 @@ package com.intellij.execution;
 import com.intellij.execution.ui.ConsoleView;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -59,8 +58,7 @@ public abstract class ConsoleFolding {
   * @return {@code true} if line should be folded, {@code false} if not
   * @deprecated since 2018.1. Use {@link #shouldFoldLine(Project, String)} instead.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean shouldFoldLine(@SuppressWarnings("unused") @NotNull String line) { return false; }

  /**
@@ -68,8 +66,7 @@ public abstract class ConsoleFolding {
   * @return placeholder for lines
   * @deprecated since 2018.1. Use {@link #getPlaceholderText(Project, List)} instead.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  @Nullable
  public String getPlaceholderText(@SuppressWarnings("unused") @NotNull List<String> lines) { return null; }
 }
@@ -4,7 +4,6 @@ package com.intellij.execution;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -22,8 +21,7 @@ public abstract class RunManagerEx extends RunManager {
  /**
   * @deprecated Use {@link #setSelectedConfiguration(RunnerAndConfigurationSettings)} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public final void setActiveConfiguration(@Nullable RunnerAndConfigurationSettings configuration) {
    setSelectedConfiguration(configuration);
  }
@@ -31,8 +29,7 @@ public abstract class RunManagerEx extends RunManager {
  /**
   * @deprecated Use {@link #addConfiguration(RunnerAndConfigurationSettings)}.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public final void addConfiguration(RunnerAndConfigurationSettings settings,
                                     boolean storeInDotIdeaFolder,
                                     List<BeforeRunTask> tasks,
@@ -77,8 +74,7 @@ public abstract class RunManagerEx extends RunManager {
   * @deprecated Use {@link #getAllSettings()}
   */
  @NotNull
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public final Collection<RunnerAndConfigurationSettings> getSortedConfigurations() {
    return getAllSettings();
  }
@@ -86,8 +82,7 @@ public abstract class RunManagerEx extends RunManager {
  /**
   * @deprecated Use {@link RunManagerListener#TOPIC} instead.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public void addRunManagerListener(@NotNull RunManagerListener listener) {
  }

@@ -23,7 +23,6 @@ import com.intellij.ui.components.fields.ExtendableTextField;
 import com.intellij.util.PathUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -116,8 +115,7 @@ public class CommonProgramParametersPanel extends JPanel implements PanelWithAnc
  /**
   * @deprecated use {@link MacroComboBoxWithBrowseButton}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  protected JComponent createComponentWithMacroBrowse(@NotNull final TextFieldWithBrowseButton textAccessor) {
    final FixedSizeButton button = new FixedSizeButton(textAccessor);
    button.setIcon(AllIcons.Actions.ListFiles);
@@ -4,14 +4,12 @@ package com.intellij.testIntegration;
 import com.intellij.execution.Location;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.util.List;

 /** @deprecated override SMTRunnerConsoleProperties.getTestLocator() instead */
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+@Deprecated(forRemoval = true)
 public interface TestLocationProvider {
  ExtensionPointName<TestLocationProvider> EP_NAME = ExtensionPointName.create("com.intellij.testSrcLocator");

@@ -8,7 +8,6 @@ import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.extensions.ProjectExtensionPointName;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -30,8 +29,7 @@ public abstract class BeforeRunTaskProvider<T extends BeforeRunTask<?>> {
  /**
   * @deprecated Use {@link #EP_NAME}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static final ExtensionPointName<BeforeRunTaskProvider<BeforeRunTask<?>>> EXTENSION_POINT_NAME =
    new ExtensionPointName<>("com.intellij.stepsBeforeRunProvider");

@@ -5,7 +5,6 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.NlsContexts.DialogMessage;
 import com.intellij.openapi.util.text.StringUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -29,8 +28,7 @@ public class CantRunException extends ExecutionException {
  }

  /** @deprecated please use {@link #jdkMisconfigured(Sdk)} instead */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static CantRunException jdkMisconfigured(@NotNull Sdk jdk, @NotNull Module module) {
    return jdkMisconfigured(jdk);
  }
@@ -18,7 +18,6 @@ package com.intellij.execution;
 import com.intellij.execution.process.ProcessHandler;
 import com.intellij.execution.ui.ExecutionConsole;
 import com.intellij.openapi.actionSystem.AnAction;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -74,8 +73,7 @@ public class DefaultExecutionResult implements ExecutionResult {
  /**
   * @deprecated unused
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public AnAction @NotNull [] getAdditionalStopActions() {
    return AnAction.EMPTY_ARRAY;
  }
@@ -41,8 +41,7 @@ public abstract class ExecutionTarget {
  /**
   * @deprecated implement {@link #canRun(RunConfiguration)} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean canRun(@NotNull RunnerAndConfigurationSettings configuration) {
    return canRun(configuration.getConfiguration());
  }
@@ -6,7 +6,6 @@ import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.messages.Topic;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -44,8 +43,7 @@ public abstract class ExecutionTargetManager {
  /**
   * @deprecated use {@link #canRun(RunConfiguration, ExecutionTarget)} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public static boolean canRun(@Nullable RunnerAndConfigurationSettings settings, @Nullable ExecutionTarget target) {
    return canRun(settings != null ? settings.getConfiguration() : null, target);
  }
@@ -82,8 +80,7 @@ public abstract class ExecutionTargetManager {
   * @deprecated Use {@link #getTargetsFor(RunConfiguration)}
   */
  @NotNull
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public List<ExecutionTarget> getTargetsFor(@Nullable RunnerAndConfigurationSettings settings) {
    return getTargetsFor(settings == null ? null : settings.getConfiguration());
  }
@@ -22,8 +22,7 @@ public abstract class RunProfileStarter {
   */
  @SuppressWarnings("unused")
  @Nullable
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public RunContentDescriptor execute(@NotNull RunProfileState state, @NotNull ExecutionEnvironment environment) throws ExecutionException {
    throw new AbstractMethodError();
  }
@@ -5,7 +5,6 @@ import com.intellij.execution.configurations.*;
 import com.intellij.execution.runners.ProgramRunner;
 import com.intellij.openapi.util.Factory;
 import com.intellij.openapi.util.NlsSafe;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -65,8 +64,7 @@ public interface RunnerAndConfigurationSettings {
   * @deprecated There are different ways of storing run configuration in a file,
   * use {@link #storeInLocalWorkspace()}, {@link #storeInDotIdeaFolder()} or {@link #storeInArbitraryFileInProject(String)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default void setShared(boolean value) {
    if (value) {
      storeInDotIdeaFolder();
@@ -252,8 +250,7 @@ public interface RunnerAndConfigurationSettings {
  /**
   * @deprecated Use {@link RunConfiguration#isAllowRunningInParallel()}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  default boolean isSingleton() {
    return !getConfiguration().isAllowRunningInParallel();
  }
@@ -350,8 +350,7 @@ public abstract class RunConfigurationBase<T> extends UserDataHolderBase impleme
  /**
   * @deprecated Not used anymore.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  protected boolean isNewSerializationUsed() {
    return false;
  }
@@ -15,7 +15,6 @@ import com.intellij.util.xmlb.annotations.Attribute;
 import com.intellij.util.xmlb.annotations.Tag;
 import com.intellij.util.xmlb.annotations.Transient;
 import org.jdom.Element;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -66,8 +65,7 @@ public class RunConfigurationModule implements JDOMExternalizable {
  /**
   * @deprecated It is not init. It sets module to any first module if no module yet configured. Use {@link #setModuleToAnyFirstIfNotSpecified} if need.
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public void init() {
    setModuleToAnyFirstIfNotSpecified();
  }
@@ -2,7 +2,6 @@
 package com.intellij.execution.configurations;

 import com.intellij.util.EnvironmentUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.io.File;
@@ -53,8 +52,7 @@ public class SimpleProgramParameters {
  }

  /** @deprecated Use {@link #setEnv(Map)} and {@link #setPassParentEnvs(boolean)} instead with already preprocessed variables */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public void setupEnvs(Map<String, String> envs, boolean passDefault) {
    if (!envs.isEmpty()) {
      envs = new HashMap<>(envs);
@@ -22,7 +22,6 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ExceptionUtil;
 import com.intellij.util.ObjectUtils;
 import com.intellij.util.concurrency.AppExecutorUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -142,8 +141,7 @@ public abstract class RemoteProcessSupport<Target, EntryPoint, Parameters> {
   @deprecated
    * use acquire(Target, Parameters, ProgressIndicator)
   */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
-  @Deprecated
+  @Deprecated(forRemoval = true)
  public EntryPoint acquire(@NotNull Target target, @NotNull Parameters configuration) throws Exception {
    return acquire(target, configuration, null);
  }
@@ -6,7 +6,6 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.util.Pair;
 import com.intellij.ui.content.Content;
 import com.intellij.util.Producer;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -23,8 +22,7 @@ public interface LayoutViewOptions {
   * @deprecated use {@link #setTopLeftToolbar(ActionGroup, String)}
   */
  @NotNull
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  LayoutViewOptions setTopToolbar(@NotNull ActionGroup actions, @NotNull String place);

  @NotNull
@@ -19,7 +19,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.Function;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -107,8 +106,7 @@ public interface ExternalSystemManager<
   * for your {@link com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration} instead
   */
  @Nullable
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
+  @Deprecated(forRemoval = true)
  default Object createTestConsoleProperties(@NotNull Project project,
                                             @NotNull Executor executor,
                                             @NotNull RunConfiguration runConfiguration) {
@@ -7,7 +7,6 @@ import com.intellij.openapi.util.NlsSafe;
 import com.intellij.serialization.Property;
 import com.intellij.serialization.PropertyMapping;
 import com.intellij.util.ArrayUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -216,8 +215,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf
   * @deprecated use {@link JavaModuleData#getLanguageLevel} instead
   */
  @Nullable
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  public String getSourceCompatibility() {
    return sourceCompatibility;
  }
@@ -225,8 +223,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf
  /**
   * @deprecated use {@link JavaModuleData#setLanguageLevel} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  public void setSourceCompatibility(@Nullable String sourceCompatibility) {
    this.isSetSourceCompatibility = true;
    this.sourceCompatibility = sourceCompatibility;
@@ -236,8 +233,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf
   * @deprecated use {@link JavaModuleData#getTargetBytecodeVersion} instead
   */
  @Nullable
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  public String getTargetCompatibility() {
    return targetCompatibility;
  }
@@ -245,8 +241,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf
  /**
   * @deprecated use {@link JavaModuleData#setTargetBytecodeVersion} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  public void setTargetCompatibility(@Nullable String targetCompatibility) {
    this.isSetTargetCompatibility = true;
    this.targetCompatibility = targetCompatibility;
@@ -256,8 +251,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf
   * @deprecated use {@link ModuleSdkData#getSdkName} instead
   */
  @Nullable
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  public String getSdkName() {
    return sdkName;
  }
@@ -265,8 +259,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf
  /**
   * @deprecated use {@link ModuleSdkData#setSdkName} instead
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  public void setSdkName(@Nullable String sdkName) {
    this.isSetSdkName = true;
    this.sdkName = sdkName;
@@ -274,43 +267,37 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf

  // Remove it in version 2021.1
  //<editor-fold desc="Backward compatibility preserving methods">
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  @SuppressWarnings({"MissingDeprecatedAnnotation", "DeprecatedIsStillUsed"})
  public void internalSetSourceCompatibility(@Nullable String sourceCompatibility) {
    this.sourceCompatibility = sourceCompatibility;
  }

-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  @SuppressWarnings({"MissingDeprecatedAnnotation", "DeprecatedIsStillUsed"})
  public void internalSetTargetCompatibility(@Nullable String targetCompatibility) {
    this.targetCompatibility = targetCompatibility;
  }

-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  @SuppressWarnings({"MissingDeprecatedAnnotation", "DeprecatedIsStillUsed"})
  public void internalSetSdkName(@Nullable String sdkName) {
    this.sdkName = sdkName;
  }

-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  @SuppressWarnings("MissingDeprecatedAnnotation")
  public boolean isSetSourceCompatibility() {
    return isSetSourceCompatibility;
  }

-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  @SuppressWarnings("MissingDeprecatedAnnotation")
  public boolean isSetTargetCompatibility() {
    return isSetTargetCompatibility;
  }

-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  @SuppressWarnings({"MissingDeprecatedAnnotation", "DeprecatedIsStillUsed"})
  public boolean isSetSdkName() {
    return isSetSdkName;
@@ -1,7 +1,6 @@
 package com.intellij.openapi.externalSystem.model.task;

 import com.intellij.openapi.extensions.ExtensionPointName;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.util.EventListener;
@@ -29,8 +28,7 @@ public interface ExternalSystemTaskNotificationListener extends EventListener {
  /**
   * @deprecated use {@link #onStart(ExternalSystemTaskId, String)}
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
+  @Deprecated(forRemoval = true)
  void onStart(@NotNull ExternalSystemTaskId id);

  /**
@@ -1,7 +1,6 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.openapi.externalSystem.model.task;

-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -37,8 +36,7 @@ public abstract class ExternalSystemTaskNotificationListenerAdapter implements E
   * @deprecated use {@link #onStart(ExternalSystemTaskId, String)}
   */
  @Override
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
+  @Deprecated(forRemoval = true)
  public void onStart(@NotNull ExternalSystemTaskId id) {
    if (myDelegate != null) {
      myDelegate.onStart(id);
@@ -13,7 +13,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.util.SmartList;
 import com.intellij.util.containers.CollectionFactory;
 import com.intellij.util.containers.ContainerUtil;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -166,8 +165,7 @@ public abstract class AbstractExternalSystemLocalSettings<S extends AbstractExte
    state.projectBuildClasspath = value;
  }

-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public void fillState(@NotNull State otherState) {
    otherState.recentTasks.clear();
    otherState.availableProjects = state.availableProjects;
@@ -4,7 +4,6 @@ package com.intellij.openapi.externalSystem.settings;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.util.xmlb.annotations.Transient;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -60,8 +59,7 @@ public abstract class ExternalProjectSettings implements Comparable<ExternalProj
   * @see com.intellij.openapi.externalSystem.autoimport.ExternalSystemProjectTracker for details
   */
  @Transient
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated(forRemoval = true)
  public void setUseAutoImport(@SuppressWarnings("unused") boolean useAutoImport) {
    LOG.warn(new Throwable("Auto-import cannot be disabled"));
  }
@@ -69,8 +67,7 @@ public abstract class ExternalProjectSettings implements Comparable<ExternalProj
  /**
   * @deprecated left for settings backward-compatibility
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public boolean isCreateEmptyContentRootDirectories() {
    return myCreateEmptyContentRootDirectories;
  }
@@ -78,8 +75,7 @@ public abstract class ExternalProjectSettings implements Comparable<ExternalProj
  /**
   * @deprecated left for settings backward-compatibility
   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
  public void setCreateEmptyContentRootDirectories(boolean createEmptyContentRootDirectories) {
    myCreateEmptyContentRootDirectories = createEmptyContentRootDirectories;
  }
@@ -7,7 +7,6 @@ import com.intellij.execution.configurations.RunnerSettings;
 import com.intellij.execution.configurations.SimpleJavaParameters;
 import com.intellij.openapi.options.SettingsEditorGroup;
 import org.jdom.Element;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -15,8 +14,7 @@ import org.jetbrains.annotations.Nullable;
 * @deprecated Use [com.intellij.openapi.externalSystem.service.execution.configuration.ExternalSystemRunConfigurationExtension] instead
 * And [com.intellij.externalSystem.runConfigurationEx] extension point
 */
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+@Deprecated(forRemoval = true)
@SuppressWarnings("DeprecatedIsStillUsed")
 public interface ExternalSystemRunConfigurationExtension {
  void readExternal(@NotNull ExternalSystemRunConfiguration configuration, @NotNull Element element);
@@ -46,7 +46,6 @@ import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.accessibility.ScreenReader;
 import com.intellij.util.ui.update.MergingUpdateQueue;
 import com.intellij.util.ui.update.Update;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -239,8 +238,7 @@ public final class ExternalSystemNotificationManager implements Disposable {
    });
  }

-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
+  @Deprecated(forRemoval = true)
  public void clearNotifications(final @Nullable String groupName,
                                 final @NotNull NotificationSource notificationSource,
                                 final @NotNull ProjectSystemId externalSystemId) {
@@ -370,8 +368,7 @@ public final class ExternalSystemNotificationManager implements Disposable {
    }
  }

-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
+  @Deprecated(forRemoval = true)
  public @NotNull NewErrorTreeViewPanel prepareMessagesView(final @NotNull ProjectSystemId externalSystemId,
                                                            final @NotNull NotificationSource notificationSource,
                                                            boolean activateView) {
@@ -418,8 +415,7 @@ public final class ExternalSystemNotificationManager implements Disposable {
    return targetContent;
  }

-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
+  @Deprecated(forRemoval = true)
  public static @NotNull @Nls String getContentDisplayName(
    final @NotNull NotificationSource notificationSource,
    final @NotNull ProjectSystemId externalSystemId
@@ -11,7 +11,6 @@ import com.intellij.openapi.externalSystem.settings.ExternalProjectSettings;
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.util.ArrayList;
@@ -26,8 +25,7 @@ import java.util.List;
 * @deprecated use {@link ExternalSystemProjectTracker} instead
 */
@SuppressWarnings("DeprecatedIsStillUsed")
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+@Deprecated(forRemoval = true)
 public class ExternalSystemProjectsWatcherImpl implements ExternalSystemProjectsWatcher {

  @NotNull
@@ -103,8 +101,7 @@ public class ExternalSystemProjectsWatcherImpl implements ExternalSystemProjects
   * @deprecated see {@link ExternalSystemProjectsWatcherImpl}
   */
  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @Deprecated(forRemoval = true)
  public interface Contributor {

    void markDirtyAllExternalProjects(@NotNull Project project);
@@ -4,14 +4,12 @@ package com.intellij.openapi.externalSystem.service.project.manage;
 import com.intellij.openapi.externalSystem.model.project.ModuleData;
 import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider;
 import com.intellij.openapi.module.Module;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 /**
 * @deprecated useless
 */
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+@Deprecated(forRemoval = true)
 public interface ModuleDataServiceExtension {
  void importModule(@NotNull IdeModifiableModelsProvider modelsProvider, @NotNull Module module, @NotNull ModuleData data);
 }
--- a/Show More
+++ b/Show More