Add @ScheduledForRemoval for "to be removed in X" APIs.

GitOrigin-RevId: 81633778930c7db30c6ec638cd3f1e68d3fdc201
2026-09-27 10:03:11 +07:00 · 2019-07-02 06:52:16 +03:00
parent bed4386cda
commit 07adca2a57
62 changed files with 148 additions and 9 deletions
@@ -18,12 +18,14 @@ package com.intellij.execution.process;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.execution.configurations.JavaParameters;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.nio.charset.Charset;

 /** @deprecated use {@link OSProcessHandler} (to be removed in IDEA 17) */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2017")
 public class DefaultJavaProcessHandler extends OSProcessHandler {
  public DefaultJavaProcessHandler(@NotNull JavaParameters javaParameters) throws ExecutionException {
    super(javaParameters.toCommandLine());
@@ -3,12 +3,14 @@ package com.intellij.codeInspection;

 import com.intellij.codeInsight.daemon.HighlightDisplayKey;
 import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 /**
 * @deprecated superfluous, extend {@link AbstractBaseJavaLocalInspectionTool} / {@link CustomSuppressableInspectionTool} instead
 * (to be removed in IDEA 2019).
 */
+@ApiStatus.ScheduledForRemoval(inVersion = "2019")
@Deprecated
 public abstract class BaseJavaLocalInspectionTool extends AbstractBaseJavaLocalInspectionTool implements CustomSuppressableInspectionTool {
  @NotNull
@@ -28,6 +28,7 @@ import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.util.*;
 import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 /**
@@ -167,6 +168,7 @@ public class ClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass, Clas
   */
  @NotNull
  @Deprecated //todo to be removed in IDEA 17
+  @ApiStatus.ScheduledForRemoval(inVersion = "2017")
  public static Query<PsiClass> search(@NotNull final PsiClass aClass, @NotNull SearchScope scope, final boolean checkDeep, final boolean checkInheritance) {
    return search(aClass, scope, checkDeep, checkInheritance, true);
  }
@@ -12,6 +12,7 @@ import com.intellij.psi.util.PsiModificationTracker;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -149,6 +150,7 @@ public abstract class NullableNotNullManager {

  /** @deprecated use {@link #copyNotNullAnnotation(PsiModifierListOwner, PsiModifierListOwner)} (to be removed in IDEA 17) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2017")
  public PsiAnnotation copyNotNullAnnotation(@NotNull PsiModifierListOwner owner) {
    NullabilityAnnotationInfo info = findOwnNullabilityInfo(owner);
    if (info == null || info.getNullability() != Nullability.NOT_NULL) return null;
@@ -1,6 +1,7 @@
 // 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.lang.jvm;

+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import static com.intellij.util.containers.ContainerUtil.filter;
@@ -14,6 +15,7 @@ public interface JvmModifiersOwner extends JvmAnnotatedElement {
   * @deprecated To be removed in 2018.3
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018.3")
  @NotNull
  default JvmModifier[] getModifiers() {
    return filter(JvmModifier.values(), this::hasModifier).toArray(new JvmModifier[0]);
@@ -19,6 +19,7 @@ import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.javadoc.PsiDocComment;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -214,6 +215,7 @@ public interface JVMElementFactory {
  PsiClassType createType(@NotNull PsiClass resolve, @NotNull PsiSubstitutor substitutor, @NotNull LanguageLevel languageLevel);

  /** @deprecated use {@link PsiType#annotate(TypeAnnotationProvider)} (to be removed in IDEA 18) */
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018")
  @Deprecated
  PsiClassType createType(@NotNull PsiClass resolve,
                          @NotNull PsiSubstitutor substitutor,
@@ -15,6 +15,8 @@
 */
 package com.intellij.psi;

+import org.jetbrains.annotations.ApiStatus;
+
 import java.util.List;

 /**
@@ -27,5 +29,6 @@ public interface PsiResourceList extends PsiElement, Iterable<PsiResourceListEle

  /** @deprecated use {@link #iterator()} (to be removed in IDEA 17) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2017")
  List<PsiResourceVariable> getResourceVariables();
 }
@@ -7,6 +7,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.util.ArrayFactory;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -75,6 +76,7 @@ public abstract class PsiType implements PsiAnnotationOwner, Cloneable, JvmType
  /** @deprecated use {@link #annotate(TypeAnnotationProvider)} (to be removed in IDEA 18) */
  @Deprecated
  @NotNull
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018")
  public PsiArrayType createArrayType(@NotNull PsiAnnotation... annotations) {
    return new PsiArrayType(this, annotations);
  }
@@ -21,6 +21,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.search.GlobalSearchScope;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -80,6 +81,7 @@ public class PsiWildcardType extends PsiType.Stub implements JvmWildcardType {
   * @deprecated use {@link #annotate(TypeAnnotationProvider)} (to be removed in IDEA 18)
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018")
  public PsiWildcardType annotate(@NotNull final PsiAnnotation[] annotations) {
    return annotations.length == 0 ? this : new PsiWildcardType(this, TypeAnnotationProvider.Static.create(annotations));
  }
@@ -21,6 +21,7 @@ package com.intellij.psi.impl.java.stubs;

 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.PsiClass;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;

 public interface PsiClassStub<T extends PsiClass> extends PsiMemberStub<T> {
@@ -49,5 +50,6 @@ public interface PsiClassStub<T extends PsiClass> extends PsiMemberStub<T> {
   * @deprecated use {@link PsiJavaFileStub#getLanguageLevel()} (to be removed in IDEA 18)
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018")
  LanguageLevel getLanguageLevel();
 }
@@ -23,6 +23,7 @@ import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.PsiJavaFile;
 import com.intellij.psi.PsiJavaModule;
 import com.intellij.psi.stubs.PsiClassHolderFileStub;
+import org.jetbrains.annotations.ApiStatus;

 public interface PsiJavaFileStub extends PsiClassHolderFileStub<PsiJavaFile> {
  PsiJavaModule getModule();
@@ -35,5 +36,6 @@ public interface PsiJavaFileStub extends PsiClassHolderFileStub<PsiJavaFile> {

  /** @deprecated override {@link #getPsiFactory()} instead (to be removed in IDEA 18) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018")
  void setPsiFactory(StubPsiFactory factory);
 }
@@ -14,6 +14,7 @@ import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.util.LineSeparator;
 import com.intellij.util.text.CharArrayUtil;
 import org.intellij.lang.annotations.MagicConstant;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -708,6 +709,7 @@ public abstract class VirtualFile extends UserDataHolderBase implements Modifica

  /** @deprecated use {@link VirtualFileSystem#isValidName(String)} (to be removed in IDEA 18) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018")
  public static boolean isValidName(@NotNull String name) {
    return !name.isEmpty() && name.indexOf('\\') < 0 && name.indexOf('/') < 0;
  }
@@ -107,7 +107,7 @@ public abstract class PsiDocumentManagerBase extends PsiDocumentManager implemen
  }

  @Deprecated
-  @ApiStatus.ScheduledForRemoval
+  @ApiStatus.ScheduledForRemoval("2017")
  // todo remove when plugins come to their senses and stopped using it
  // todo to be removed in idea 17
  public static void cachePsi(@NotNull Document document, @Nullable PsiFile file) {
@@ -16,11 +16,14 @@

 package com.intellij.psi.impl.cache.impl.id;

+import org.jetbrains.annotations.ApiStatus;
+
 /**
 * @deprecated left for compatibility, use IdIndexer interface instead. To be removed in IntelliJ 2018.3
 *
 * @author Eugene Zhuravlev
 */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2018.3")
 public abstract class FileTypeIdIndexer implements IdIndexer {
 }
@@ -17,6 +17,7 @@ package com.intellij.execution.testframework;

 import com.intellij.icons.AllIcons;
 import com.intellij.ui.LayeredIcon;
+import org.jetbrains.annotations.ApiStatus;

 import javax.swing.*;

@@ -31,6 +32,7 @@ public interface PoolOfTestIcons {
   */
  @SuppressWarnings("unused")
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020")
  Icon LOADING_ICON = AllIcons.RunConfigurations.LoadingTree;
  Icon TERMINATED_ICON = AllIcons.RunConfigurations.TestTerminated;
  Icon IGNORED_ICON = AllIcons.RunConfigurations.TestIgnored;
@@ -13,6 +13,7 @@ import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.util.messages.Topic;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -33,6 +34,7 @@ public interface RunContentManager {

  /** @deprecated Use {@link LangDataKeys#RUN_CONTENT_DESCRIPTOR} instead (to be removed in IDEA 16) */
  @Deprecated @SuppressWarnings("UnusedDeclaration")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2016")
  DataKey<RunContentDescriptor> RUN_CONTENT_DESCRIPTOR = LangDataKeys.RUN_CONTENT_DESCRIPTOR;

  /**
@@ -17,6 +17,7 @@ import java.util.Collection;
 * @deprecated Use {@link TargetElementUtil} instead. To be removed in IntelliJ IDEA 16.
 */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2016")
 public abstract class TargetElementUtilBase {
  public static TargetElementUtilBase getInstance() {
    return TargetElementUtil.getInstance();
@@ -32,6 +32,7 @@ import com.intellij.usageView.UsageInfo;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -161,6 +162,7 @@ public abstract class FindUsagesHandler {
  /** @deprecated use/override {@link #isSearchForTextOccurrencesAvailable(PsiElement, boolean)} instead (to be removed in IDEA 18) */
  @Deprecated
  @SuppressWarnings("SpellCheckingInspection")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018")
  protected boolean isSearchForTextOccurencesAvailable(@NotNull PsiElement psiElement, boolean isSingleFile) {
    return false;
  }
@@ -9,6 +9,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.refactoring.rename.RenameProcessor;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.containers.MultiMap;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -82,6 +83,7 @@ public abstract class InvertBooleanDelegate {
   * To be removed in 2018.3
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018.3")
  protected static PsiElement getForeignElementToInvert(PsiElement namedElement,
                                                        PsiElement expression,
                                                        Language language) {
@@ -16,6 +16,7 @@
 package com.intellij.refactoring.ui;

 import com.intellij.util.EventDispatcher;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;

 import javax.swing.*;
@@ -28,6 +29,7 @@ public abstract class VisibilityPanelBase<V> extends JPanel {
   * @deprecated To be removed in 2018.2. Actually replaced by 'private'.
   * Use {@link #stateChanged(ChangeEvent)} instead. This field will become private.
   */
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018.2")
  @Deprecated protected final EventDispatcher<ChangeListener> myEventDispatcher = EventDispatcher.create(ChangeListener.class);

  @Nullable
@@ -18,12 +18,14 @@ 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 (to be removed in IDEA 17) */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2017")
 public interface TestLocationProvider {
  ExtensionPointName<TestLocationProvider> EP_NAME = ExtensionPointName.create("com.intellij.testSrcLocator");

@@ -18,6 +18,7 @@ package com.intellij.execution.process;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.openapi.util.Key;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 /**
@@ -33,6 +34,7 @@ public class CapturingAnsiEscapesAwareProcessHandler extends CapturingProcessHan
  /** @deprecated Use {@link #CapturingAnsiEscapesAwareProcessHandler(Process, String)} instead (to be removed in IDEA 17) */
  @SuppressWarnings({"unused"})
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2017")
  public CapturingAnsiEscapesAwareProcessHandler(Process process) {
    super(process);
  }
@@ -4,6 +4,7 @@ package com.intellij.execution.process;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.openapi.progress.ProgressIndicator;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -24,6 +25,7 @@ public class CapturingProcessHandler extends OSProcessHandler {

  /** @deprecated Use {@link #CapturingProcessHandler(Process, Charset, String)} instead (to be removed in IDEA 17) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2017")
  public CapturingProcessHandler(@NotNull Process process) {
    this(process, null, "");
  }
@@ -7,6 +7,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.ApiStatus;

 public class FileChooserDescriptorFactory {
  private FileChooserDescriptorFactory() { }
@@ -73,6 +74,7 @@ public class FileChooserDescriptorFactory {
   * @deprecated not very useful (to be removed in IDEA 15)
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2015")
  @SuppressWarnings("UnusedDeclaration")
  public static FileChooserDescriptor getDirectoryChooserDescriptor(String objectName) {
    return createSingleFolderDescriptor().withTitle("Select " + objectName);
@@ -15,10 +15,13 @@
 */
 package com.intellij.ui;

+import org.jetbrains.annotations.ApiStatus;
+
 /**
 * @deprecated use {@link ScrollingUtil} instead (to be removed in IDEA 17)
 * @see ScrollingUtil
 */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2017")
 public class ListScrollingUtil extends ScrollingUtil {
 }
@@ -15,11 +15,14 @@
 */
 package com.intellij.ui;

+import org.jetbrains.annotations.ApiStatus;
+
 /**
 * @author cdr
 * @deprecated use {@link ScrollingUtil} instead (to be removed in IDEA 17)
 * @see ScrollingUtil
 */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2017")
 public class TableScrollingUtil extends ScrollingUtil {
 }
@@ -16,6 +16,7 @@ import com.intellij.openapi.util.io.StreamUtil;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -77,6 +78,7 @@ public class CertificateManager implements PersistentStateComponent<CertificateM
   * @deprecated To be removed in IDEA 18. Use specific host name verifiers from httpclient-4.x instead.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018")
  public static final HostnameVerifier HOSTNAME_VERIFIER = new HostnameVerifier() {
    private volatile HostnameVerifier myHostnameVerifier; 
    @Override
@@ -20,6 +20,7 @@
 package com.intellij.util.ui;

 import com.intellij.ui.components.JBLabel;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -270,6 +271,7 @@ public class FormBuilder {
   * @deprecated use {@link #setHorizontalGap} or {@link #setFormLeftIndent}, to be removed in IDEA 16
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2016")
  public FormBuilder setIndent(int indent) {
    myIndent = indent;
    return this;
@@ -4,6 +4,7 @@ package com.intellij.diagnostic;
 import com.intellij.openapi.diagnostic.Attachment;
 import com.intellij.openapi.diagnostic.SubmittedReportInfo;
 import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -116,6 +117,7 @@ public abstract class AbstractMessage {

  /** @deprecated use {@link #getIncludedAttachments()} instead (to be removed in IDEA 2020) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020")
  public List<Attachment> getAttachments() {
    return getIncludedAttachments();
  }
@@ -3,6 +3,7 @@ package com.intellij.diagnostic;

 import com.intellij.openapi.diagnostic.Attachment;
 import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -10,6 +11,7 @@ import java.util.List;

 /** @deprecated induced exceptions are now grouped as attachments of the initial one - see {@link MessagePool} for details (to be removed in IDEA 2020) */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2020")
 public class GroupedLogMessage extends AbstractMessage {
  private final List<AbstractMessage> myMessages;

@@ -6,10 +6,12 @@ import com.intellij.openapi.diagnostic.ExceptionWithAttachments;
 import com.intellij.openapi.diagnostic.IdeaLoggingEvent;
 import com.intellij.openapi.diagnostic.RuntimeExceptionWithAttachments;
 import com.intellij.util.ArrayUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 /** @deprecated use {@link RuntimeExceptionWithAttachments#RuntimeExceptionWithAttachments(String, String, Attachment...)} (to be removed in IDEA 2020) */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2020")
@SuppressWarnings({"DeprecatedIsStillUsed", "unused"})
 public class LogEventException extends RuntimeException implements ExceptionWithAttachments {
  private final IdeaLoggingEvent myLogMessage;
@@ -5,6 +5,7 @@ import com.intellij.diagnostic.IdeaReportingEvent.TextBasedThrowable;
 import com.intellij.openapi.diagnostic.Attachment;
 import com.intellij.openapi.diagnostic.IdeaLoggingEvent;
 import com.intellij.openapi.diagnostic.Logger;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.util.Collection;
@@ -13,10 +14,12 @@ import java.util.List;

 /** @deprecated use {@link LogMessage} (to be removed in IDEA 2020) */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2020")
@SuppressWarnings({"DeprecatedIsStillUsed", "unused"})
 public class LogMessageEx extends LogMessage {
  /** @deprecated use {@link Logger#error(String, Throwable, Attachment...)} or {@link LogMessage} (to be removed in IDEA 2020) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020")
  public LogMessageEx(IdeaLoggingEvent event, String title, String notificationText) {
    super(event.getThrowable(), event.getMessage(), attachments(event));
  }
@@ -33,18 +36,21 @@ public class LogMessageEx extends LogMessage {

  /** @deprecated use {@link Logger#error(String, Throwable, Attachment...)} (to be removed in IDEA 2020) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020")
  public static IdeaLoggingEvent createEvent(String message, String details, Attachment... attachments) {
    return createEvent(new TextBasedThrowable(details), message, attachments);
  }

  /** @deprecated use {@link Logger#error(String, Throwable, Attachment...)} (to be removed in IDEA 2020) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020")
  public static IdeaLoggingEvent createEvent(String message, String details, String title, String notificationText, Attachment attachment) {
    return createEvent(new TextBasedThrowable(details), message, attachment);
  }

  /** @deprecated use {@link Logger#error(String, Throwable, Attachment...)} (to be removed in IDEA 2020) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020")
  public static IdeaLoggingEvent createEvent(String message, String details, String title, String notificationText, Collection<Attachment> attachments) {
    Attachment[] array = attachments != null ? attachments.toArray(Attachment.EMPTY_ARRAY) : Attachment.EMPTY_ARRAY;
    return createEvent(new TextBasedThrowable(details), message, array);
@@ -52,12 +58,14 @@ public class LogMessageEx extends LogMessage {

  /** @deprecated use {@link Logger#error(String, Throwable, Attachment...)} and {@link AttachmentFactory#createContext} (to be removed in IDEA 2020) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020")
  public static void error(@NotNull Logger logger, @NotNull String message, @NotNull String... attachmentText) {
    error(logger, message, new Throwable(), attachmentText);
  }

  /** @deprecated use {@link Logger#error(String, Throwable, Attachment...)} and {@link AttachmentFactory#createContext} (to be removed in IDEA 2020) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020")
  public static void error(Logger logger, String message, Throwable cause, String... attachmentText) {
    StringBuilder detailsBuffer = new StringBuilder();
    for (String detail : attachmentText) {
@@ -3,12 +3,14 @@ package com.intellij.errorreport.bean;

 import com.intellij.openapi.diagnostic.Attachment;
 import com.intellij.util.ExceptionUtil;
+import org.jetbrains.annotations.ApiStatus;

 import java.util.Collections;
 import java.util.List;

 /** @deprecated trivial and not particularly helpful, could be replaced with {@link java.util.Map} (to be removed in IDEA 2020) */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2020")
 public class ErrorBean {
  private final String stackTrace;
  private final String lastAction;
@@ -4,6 +4,7 @@ package com.intellij.execution.process;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.openapi.util.Key;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.nio.charset.Charset;
@@ -79,6 +80,7 @@ public class ColoredProcessHandler extends KillableProcessHandler implements Ans
   * To be removed in IDEA 14.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2014")
  protected void textAvailable(final String text, final Key attributes) {
    super.notifyTextAvailable(text, attributes);
  }
@@ -18,6 +18,7 @@ package com.intellij.execution.process;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.KillableProcess;
 import com.intellij.execution.configurations.GeneralCommandLine;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.nio.charset.Charset;
@@ -57,6 +58,7 @@ public class KillableColoredProcessHandler extends ColoredProcessHandler impleme

  /** @deprecated use {@link #KillableColoredProcessHandler(GeneralCommandLine, boolean)} (to be removed in IDEA 17) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2017")
  public static KillableColoredProcessHandler create(@NotNull GeneralCommandLine commandLine) throws ExecutionException {
    return new KillableColoredProcessHandler(commandLine, true);
  }
@@ -4,10 +4,12 @@ package com.intellij.execution.process;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.openapi.util.SystemInfo;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 /** @deprecated use {@link KillableColoredProcessHandler#KillableColoredProcessHandler(GeneralCommandLine, boolean)} (to be removed in IDEA 16) */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2016")
@SuppressWarnings({"unused"})
 public class RunnerWinProcess extends ProcessWrapper {

@@ -16,6 +16,7 @@
 package com.intellij.internal.statistic.beans;

 import com.intellij.openapi.util.text.StringUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import java.util.Map;
@@ -26,6 +27,7 @@ import java.util.Set;
 * This class is also used on jetbrains web site
 */
@Deprecated // to be removed in 2018.2
+@ApiStatus.ScheduledForRemoval(inVersion = "2018.2")
 public class ConvertUsagesUtil {
  static final char GROUP_SEPARATOR = ':';
  static final char GROUPS_SEPARATOR = ';';
@@ -15,7 +15,10 @@
 */
 package com.intellij.internal.statistic.beans;

+import org.jetbrains.annotations.ApiStatus;
+
@Deprecated // to be removed in 2018.2
+@ApiStatus.ScheduledForRemoval(inVersion = "2018.2")
 public class GroupDescriptor {
  public static final double DEFAULT_PRIORITY = 0.0;
  public static final double HIGHER_PRIORITY = 100.0;
@@ -6,6 +6,7 @@ import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.application.impl.ApplicationInfoImpl;
 import com.intellij.openapi.util.BuildNumber;
 import com.intellij.util.ArrayUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -22,6 +23,7 @@ import java.util.Set;
 * @deprecated to be removed in 2019.1
 */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2019.1")
 public class FUStatisticsSettingsService extends StatisticsConnectionService {
  private static final String APPROVED_GROUPS_SERVICE = "white-list-service";
  public  static FUStatisticsSettingsService getInstance() {return  new FUStatisticsSettingsService();}
@@ -26,6 +26,7 @@ import com.intellij.psi.tree.IElementType;
 import com.intellij.util.DocumentUtil;
 import com.intellij.util.EditorPopupHandler;
 import com.intellij.util.SystemProperties;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -980,6 +981,7 @@ public class EditorActionUtil {
   * {@link EditorEx#installPopupHandler(com.intellij.openapi.editor.ex.EditorPopupHandler)} instead. To be removed in version 2020.2.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020.2")
  public static EditorPopupHandler createEditorPopupHandler(@NotNull final String groupId) {
    return new EditorPopupHandler() {
      @Override
@@ -997,6 +999,7 @@ public class EditorActionUtil {
   * {@link EditorEx#installPopupHandler(com.intellij.openapi.editor.ex.EditorPopupHandler)} instead. To be removed in version 2020.2.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020.2")
  public static EditorPopupHandler createEditorPopupHandler(@NotNull final ActionGroup group) {
    return new EditorPopupHandler() {
      @Override
@@ -9,6 +9,7 @@ import com.intellij.openapi.editor.impl.softwrap.SoftWrapAppliancePlaces;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import org.intellij.lang.annotations.MagicConstant;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

@@ -247,6 +248,7 @@ public class EditorSettingsExternalizable implements PersistentStateComponent<Ed
   * @deprecated Not used, to be removed in version 2020.1.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
  @SuppressWarnings({"UnusedDeclaration", "SpellCheckingInspection"})
  public int getAdditinalColumnsCount() {
    return myAdditionalColumnsCount;
@@ -256,6 +258,7 @@ public class EditorSettingsExternalizable implements PersistentStateComponent<Ed
   * @deprecated Not used, to be removed in version 2020.1.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
  public void setAdditionalColumnsCount(int value) {
    myAdditionalColumnsCount = value;
  }
@@ -264,6 +267,7 @@ public class EditorSettingsExternalizable implements PersistentStateComponent<Ed
   * @deprecated Not used, to be removed in version 2020.1.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
  public boolean isLineMarkerAreaShown() {
    return myLineMarkerAreaShown;
  }
@@ -272,6 +276,7 @@ public class EditorSettingsExternalizable implements PersistentStateComponent<Ed
   * @deprecated Not used, to be removed in version 2020.1.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
  public void setLineMarkerAreaShown(boolean lineMarkerAreaShown) {
    myLineMarkerAreaShown = lineMarkerAreaShown;
  }
@@ -40,6 +40,7 @@ import com.intellij.util.ObjectUtils;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.ui.UIUtil;
 import org.intellij.lang.annotations.JdkConstants;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -300,6 +301,7 @@ public final class EditorUtil {
   * @deprecated use {@link EditorEx#setCustomCursor(Object, Cursor)} instead. To be removed in 2020.1.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
  public static void setHandCursor(@NotNull Editor view) {
    Cursor c = Cursor.getPredefinedCursor(Cursor.HAND_CURSOR);
    // XXX: Workaround, simply view.getContentComponent().setCursor(c) doesn't work
@@ -10,6 +10,7 @@ import com.intellij.openapi.util.SystemInfo;
 import com.intellij.util.text.CharArrayUtil;
 import gnu.trove.TIntHashSet;
 import org.intellij.lang.annotations.JdkConstants;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -125,6 +126,7 @@ public class ComplementaryFontsRegistry {
   * @deprecated Use {{@link #getFontAbleToDisplay(int, int, FontPreferences, FontRenderContext)}} instead. To be removed in 2020.2 version.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020.2")
  @NotNull
  public static FontInfo getFontAbleToDisplay(int codePoint, @JdkConstants.FontStyle int style, @NotNull FontPreferences preferences) {
    return getFontAbleToDisplay(codePoint, style, preferences, null);
@@ -249,6 +251,7 @@ public class ComplementaryFontsRegistry {
   * @deprecated Use {{@link #getFontAbleToDisplay(int, int, int, String, FontRenderContext)}} instead. To be removed in 2020.2 version.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020.2")
  @NotNull
  public static FontInfo getFontAbleToDisplay(int codePoint, int size, @JdkConstants.FontStyle int style, @NotNull String defaultFontFamily) {
    return getFontAbleToDisplay(codePoint, size, style, defaultFontFamily, null);
@@ -79,10 +79,7 @@ import com.intellij.util.ui.update.Activatable;
 import com.intellij.util.ui.update.UiNotifyConnector;
 import org.intellij.lang.annotations.JdkConstants;
 import org.intellij.lang.annotations.MagicConstant;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.TestOnly;
+import org.jetbrains.annotations.*;

 import javax.swing.Timer;
 import javax.swing.*;
@@ -132,6 +129,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
   */
  @NonNls
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
  public static final Object IGNORE_MOUSE_TRACKING = "ignore_mouse_tracking";
  private static final Key<JComponent> PERMANENT_HEADER = Key.create("PERMANENT_HEADER");
  public static final Key<Boolean> DO_DOCUMENT_UPDATE_TEST = Key.create("DoDocumentUpdateTest");
@@ -8,6 +8,7 @@ import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.NotNullLazyValue;
 import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -40,6 +41,7 @@ public interface DirectoryProjectGenerator<T> {

  // to be removed in 2017.3
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2017.3")
  default boolean isPrimaryGenerator() {
    return true;
  }
@@ -16,6 +16,7 @@
 package com.intellij.remote;

 import com.intellij.util.PathMappingSettings;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -42,6 +43,7 @@ public interface RemoteSdkProperties {
   * @deprecated
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2015")
  void addRemoteRoot(String remoteRoot);

  /**
@@ -51,6 +53,7 @@ public interface RemoteSdkProperties {
   * @deprecated
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2015")
  void clearRemoteRoots();

  /**
@@ -60,6 +63,7 @@ public interface RemoteSdkProperties {
   * @deprecated
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2015")
  List<String> getRemoteRoots();

  /**
@@ -69,6 +73,7 @@ public interface RemoteSdkProperties {
   * @deprecated
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2015")
  void setRemoteRoots(List<String> remoteRoots);

  @NotNull
@@ -91,6 +96,7 @@ public interface RemoteSdkProperties {
   * @deprecated
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2015")
  boolean isInitialized();

  @Deprecated
@@ -18,6 +18,7 @@ package com.intellij.settingsSummary;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.Function;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 import javax.swing.*;
@@ -26,6 +27,7 @@ import javax.swing.*;
 * @deprecated use {@link com.intellij.troubleshooting.TroubleInfoCollector}. To be removed in IDEA 2020.1.
 */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
 public interface ProblemType {
  ExtensionPointName<ProblemType> EP_SETTINGS = ExtensionPointName.create("com.intellij.settingsSummaryFactory");

@@ -5,6 +5,7 @@ import com.intellij.openapi.editor.event.EditorMouseEvent;
 import com.intellij.openapi.editor.event.EditorMouseEventArea;
 import com.intellij.openapi.editor.event.EditorMouseListener;
 import com.intellij.openapi.editor.ex.EditorEx;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 /**
@@ -13,6 +14,7 @@ import org.jetbrains.annotations.NotNull;
 */
@SuppressWarnings("DeprecatedIsStillUsed")
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2020.2")
 public abstract class EditorPopupHandler implements EditorMouseListener {
  public abstract void invokePopup(EditorMouseEvent event);

@@ -23,6 +23,7 @@ import com.intellij.openapi.util.ModificationTracker;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.testIntegration.TestLocationProvider;
 import com.intellij.util.io.URLUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -261,6 +262,7 @@ public class SMTestRunnerConnectionUtil {

  /** @deprecated use {@link #createConsole(String, TestConsoleProperties)} (to be removed in IDEA 17) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2017")
  @SuppressWarnings({"unused"})
  public static BaseTestsOutputConsoleView createConsoleWithCustomLocator(@NotNull String testFrameworkName,
                                                                          @NotNull TestConsoleProperties consoleProperties,
@@ -271,6 +273,7 @@ public class SMTestRunnerConnectionUtil {

  /** @deprecated use {@link #createConsole(String, TestConsoleProperties)} (to be removed in IDEA 17) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2017")
  @SuppressWarnings({"unused"})
  public static SMTRunnerConsoleView createConsoleWithCustomLocator(@NotNull String testFrameworkName,
                                                                    @NotNull TestConsoleProperties consoleProperties,
@@ -286,6 +289,7 @@ public class SMTestRunnerConnectionUtil {

  /** @deprecated use {@link #initConsoleView(SMTRunnerConsoleView, String)} (to be removed in IDEA 17) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2017")
  @SuppressWarnings({"unused"})
  public static void initConsoleView(@NotNull final SMTRunnerConsoleView consoleView,
                                     @NotNull final String testFrameworkName,
@@ -25,6 +25,7 @@ import com.intellij.util.xmlb.annotations.Attribute;
 import com.intellij.util.xmlb.annotations.Tag;
 import com.intellij.util.xmlb.annotations.Transient;
 import org.intellij.lang.annotations.MagicConstant;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -135,6 +136,7 @@ public abstract class TaskRepository {
   * @deprecated To be removed in IDEA 14. Use {@link #getIssues(String, int, int, boolean)} instead.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2014")
  public Task[] getIssues(@Nullable String query, int max, long since) throws Exception {
    throw new UnsupportedOperationException("Deprecated: should not be called");
  }
@@ -204,6 +204,7 @@ public class SystemInfo extends SystemInfoRt {
  //<editor-fold desc="Deprecated stuff.">
  /** @deprecated use {@link #isJavaVersionAtLeast(int, int, int)} (to be removed in IDEA 2020) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020")
  public static boolean isJavaVersionAtLeast(String v) {
    return StringUtil.compareVersionNumbers(JAVA_RUNTIME_VERSION, v) >= 0;
  }
@@ -15,6 +15,7 @@
 */
 package com.intellij.util;

+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;

 public class IncorrectOperationException extends RuntimeException {
@@ -36,6 +37,7 @@ public class IncorrectOperationException extends RuntimeException {

  /** @deprecated use {@link #IncorrectOperationException(String, Throwable)} (to be removed in IDEA 18) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018")
  public IncorrectOperationException(@NonNls String message, Exception e) {
    super(message, e);
  }
@@ -2,6 +2,7 @@
 package com.intellij.util;

 import com.intellij.openapi.util.SystemInfo;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -37,6 +38,7 @@ public class SystemProperties {

  /** @deprecated use {@link SystemInfo#OS_NAME} (to be removed in IDEA 2020) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020")
  public static String getOsName() {
    return SystemInfo.OS_NAME;
  }
@@ -49,6 +51,7 @@ public class SystemProperties {

  /** @deprecated use {@link SystemInfo#JAVA_VENDOR} (to be removed in IDEA 2020) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020")
  public static String getJavaVmVendor() {
    return SystemInfo.JAVA_VENDOR;
  }
@@ -98,6 +101,7 @@ public class SystemProperties {

  /** @deprecated use {@link SystemInfo#JAVA_VENDOR} (to be removed in IDEA 2020) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2020")
  public static String getJavaVendor() {
    return SystemInfo.JAVA_VENDOR;
  }
@@ -45,6 +45,7 @@ public abstract class BaseDataReader {

  /** @deprecated use {@link #start(String)} instead (to be removed in IDEA 17) */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2017")
  protected void start() {
    start("");
  }
@@ -4,6 +4,7 @@ package com.intellij.ui;

 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.UIUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -21,6 +22,7 @@ public class CaptionPanel extends JPanel {
   * @deprecated use {@link JBUI.CurrentTheme.Popup#borderColor} instead,
   * to be removed in 2019.1
   */
+  @ApiStatus.ScheduledForRemoval(inVersion = "2019.1")
  @Deprecated public static final Color BND_ACTIVE_COLOR = new JBColor(() -> JBUI.CurrentTheme.Popup.borderColor(true));

  private boolean myActive = false;
@@ -83,6 +85,7 @@ public class CaptionPanel extends JPanel {
   * to be removed in 2019.1
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2019.1")
  public static Color getBorderColor(boolean isActive) {
    return JBUI.CurrentTheme.Popup.borderColor(isActive);
  }
@@ -26,10 +26,7 @@ import com.siyeh.ig.InspectionGadgetsFix;
 import com.siyeh.ig.JavaOverridingMethodUtil;
 import com.siyeh.ig.psiutils.MethodUtils;
 import one.util.streamex.StreamEx;
-import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.Nls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.*;

 import javax.swing.*;
 import java.util.Map;
@@ -64,6 +61,7 @@ public class MissingOverrideAnnotationInspection extends AbstractBaseJavaLocalIn
   * Use {@link AnnotateMethodFix}. To be removed in 2019.1.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2019.1")
  @SuppressWarnings("unused")
  protected InspectionGadgetsFix buildFix(Object... infos) {
    return new InspectionGadgetsFix() {
@@ -87,6 +85,7 @@ public class MissingOverrideAnnotationInspection extends AbstractBaseJavaLocalIn
   * @deprecated To be removed in 2019.1.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2019.1")
  @SuppressWarnings("unused")
  protected String buildErrorString(Object... infos) {
    throw new UnsupportedOperationException();
@@ -96,6 +95,7 @@ public class MissingOverrideAnnotationInspection extends AbstractBaseJavaLocalIn
   * @deprecated  To be removed in 2019.1.
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2019.1")
  protected BaseInspectionVisitor buildVisitor() {
    throw new UnsupportedOperationException();
  }
@@ -1,9 +1,12 @@
 // 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.siyeh.ig.threading;

+import org.jetbrains.annotations.ApiStatus;
+
 /**
 * To be removed in 2019.1. Please use {@link AccessToNonThreadSafeStaticFieldFromInstanceInspection} directly
 */
@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2019.1")
 public class AccessToNonThreadSafeStaticFieldFromInstanceInspectionBase extends AccessToNonThreadSafeStaticFieldFromInstanceInspection {
 }
@@ -53,6 +53,7 @@ import com.intellij.ui.ColoredSideBorder;
 import com.intellij.ui.HintHint;
 import com.intellij.ui.LightweightHint;
 import com.intellij.util.Function;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -101,6 +102,7 @@ public class CoverageLineMarkerRenderer implements ActiveGutterRenderer, LineMar
   * To be removed in 2019.1. Use {@link CoverageLineMarkerRenderer#CoverageLineMarkerRenderer(int, String, TreeMap, boolean, Function, Function, CoverageSuitesBundle, boolean)}
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2019.1")
  protected CoverageLineMarkerRenderer(final TextAttributesKey key,
                                       @Nullable final String className,
                                       final TreeMap<Integer, LineData> lines,
@@ -728,6 +728,7 @@ public class GradleExecutionHelper {
   * @deprecated {@link #getModelBuilder(Class, ExternalSystemTaskId, GradleExecutionSettings, ProjectConnection, ExternalSystemTaskNotificationListener)}
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval
  @NotNull
  public <T> ModelBuilder<T> getModelBuilder(@NotNull Class<T> modelType,
                                             @NotNull final ExternalSystemTaskId id,
@@ -779,6 +780,7 @@ public class GradleExecutionHelper {
  /**
   * @deprecated to be removed in future version
   */
+  @ApiStatus.ScheduledForRemoval
  @Deprecated
  public static void prepare(@NotNull LongRunningOperation operation,
                             @NotNull final ExternalSystemTaskId id,
@@ -1,6 +1,7 @@
 // Copyright 2000-2019 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 org.jetbrains.idea.maven.indices;

+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.idea.maven.project.MavenGeneralSettings;
 import org.jetbrains.idea.maven.utils.MavenProcessCanceledException;
 import org.jetbrains.idea.maven.utils.MavenProgressIndicator;
@@ -8,6 +9,7 @@ import org.jetbrains.idea.maven.utils.MavenProgressIndicator;
 import java.io.File;

 /*this class used only for backward compatibility for legacy code, which expect to get MavenIndices. To be removed in future releases*/
+@ApiStatus.ScheduledForRemoval
 public class OnlineMavenIndex implements MavenSearchIndex {
  private final String myRepositoryId;
  private final String myRepositoryUrl;
@@ -19,6 +19,7 @@ import com.intellij.jarRepository.JarRepositoryManager;
 import com.intellij.jarRepository.RemoteRepositoryDescription;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.libraries.NewLibraryConfiguration;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.model.MavenRepositoryInfo;
@@ -32,6 +33,7 @@ import java.util.stream.Collectors;
 * This class is deprecated and is to be removed in future releases
 * Use {@link JarRepositoryManager} instead
 */
+@ApiStatus.ScheduledForRemoval
@Deprecated
 public class RepositoryAttachHandler {

@@ -13,6 +13,7 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -27,6 +28,7 @@ public class RemoveAttributeIntentionFix implements LocalQuickFix, IntentionActi
   * To be removed in 2018.3
   */
  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2018.3")
  public RemoveAttributeIntentionFix(final String localName, XmlAttribute attribute) {
    this(localName);
  }