From dbd47232c774c28b76b737f30f038e33ad815dfb Mon Sep 17 00:00:00 2001
From: Nikolay Chashnikov <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 10 Oct 2024 20:37:11 +0200
Subject: [PATCH] [java] API cleanup: mark deprecated unused API for removal
 (IJPL-156972)

GitOrigin-RevId: 5c2121d84e0d0517b6ef056bb0de6e78a468b760
---
 .../ui/breakpoints/BreakpointWithHighlighter.java      |  2 +-
 .../introduceField/BaseExpressionToFieldHandler.java   |  7 ++-----
 .../com/intellij/refactoring/util/RefactoringUtil.java |  2 +-
 .../src/com/intellij/psi/util/PsiUtil.java             | 10 ++++++----
 .../com/intellij/lang/java/parser/ReferenceParser.java |  9 +++++++--
 .../com/intellij/ide/util/TreeClassChooserFactory.java |  4 ++--
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
index 569cffaf771e..af18943c94dd 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
@@ -218,7 +218,7 @@ public abstract class BreakpointWithHighlighter<P extends JavaBreakpointProperti
    */
   @NotNull
   @Nls
-  @Deprecated
+  @Deprecated(forRemoval = true)
   public String getDescription() {
     return getDisplayName();
   }
diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
index 4811ec2aa9ff..4f79866a163b 100644
--- a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+++ b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
@@ -47,10 +47,7 @@ import com.intellij.refactoring.util.occurrences.OccurrenceManager;
 import com.intellij.util.CommonJavaRefactoringUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.VisibilityUtil;
-import org.jetbrains.annotations.Nls;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -880,7 +877,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
     /**
      * @deprecated use CommonJavaRefactoringUtil.appendField instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public static PsiField appendField(final PsiClass destClass,
                                        final PsiField psiField,
                                        final PsiElement anchorMember,
diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl-refactorings/src/com/intellij/refactoring/util/RefactoringUtil.java
index b4209a72268c..82b17222e2da 100644
--- a/java/java-impl-refactorings/src/com/intellij/refactoring/util/RefactoringUtil.java
+++ b/java/java-impl-refactorings/src/com/intellij/refactoring/util/RefactoringUtil.java
@@ -489,7 +489,7 @@ public final class RefactoringUtil {
   /**
    * @deprecated use CommonJavaRefactoringUtil.suggestUniqueVariableName instead.
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   public static String suggestUniqueVariableName(String baseName, PsiElement place, PsiField fieldToReplace) {
     return CommonJavaRefactoringUtil.suggestUniqueVariableName(baseName, place, fieldToReplace);
   }
diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
index f3fe9930158d..cc274408e229 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
@@ -37,10 +37,7 @@ import com.intellij.util.containers.CollectionFactory;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.JBIterable;
 import org.intellij.lang.annotations.MagicConstant;
-import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Unmodifiable;
+import org.jetbrains.annotations.*;
 
 import java.util.*;
 import java.util.function.Predicate;
@@ -1607,6 +1604,7 @@ public final class PsiUtil extends PsiUtilCore {
    * @deprecated  use {@link #isAvailable(JavaFeature, PsiElement)} instead to check whether a particular feature is available, rather 
    * than to check against a language level; if you still need an explicit language level check, just inline the method call.
    */
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static boolean isLanguageLevel10OrHigher(@NotNull PsiElement element) {
     return getLanguageLevel(element).isAtLeast(LanguageLevel.JDK_10);
@@ -1625,6 +1623,7 @@ public final class PsiUtil extends PsiUtilCore {
    * @deprecated use {@link #isAvailable(JavaFeature, PsiElement)} instead to check whether a particular feature is available, rather
    * than to check against a language level; if you still need an explicit language level check, just inline the method call.
    */
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static boolean isLanguageLevel14OrHigher(@NotNull PsiElement element) {
     return getLanguageLevel(element).isAtLeast(LanguageLevel.JDK_14);
@@ -1634,6 +1633,7 @@ public final class PsiUtil extends PsiUtilCore {
    * @deprecated use {@link #isAvailable(JavaFeature, PsiElement)} instead to check whether a particular feature is available, rather
    * than to check against a language level; if you still need an explicit language level check, just inline the method call.
    */
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static boolean isLanguageLevel16OrHigher(@NotNull PsiElement element) {
     return getLanguageLevel(element).isAtLeast(LanguageLevel.JDK_16);
@@ -1643,6 +1643,7 @@ public final class PsiUtil extends PsiUtilCore {
    * @deprecated use {@link #isAvailable(JavaFeature, PsiElement)} instead to check whether a particular feature is available, rather
    * than to check against a language level; if you still need an explicit language level check, just inline the method call.
    */
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static boolean isLanguageLevel17OrHigher(@NotNull PsiElement element) {
     return getLanguageLevel(element).isAtLeast(LanguageLevel.JDK_17);
@@ -1652,6 +1653,7 @@ public final class PsiUtil extends PsiUtilCore {
    * @deprecated use {@link #isAvailable(JavaFeature, PsiElement)} instead to check whether a particular feature is available, rather
    * than to check against a language level; if you still need an explicit language level check, just inline the method call.
    */
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static boolean isLanguageLevel18OrHigher(@NotNull PsiElement element) {
     return getLanguageLevel(element).isAtLeast(LanguageLevel.JDK_18);
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
index 79f677f7e940..e00362ad962c 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
@@ -2,9 +2,8 @@
 package com.intellij.lang.java.parser;
 
 import com.intellij.lang.PsiBuilder;
-import com.intellij.psi.tree.IElementType;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class ReferenceParser extends BasicReferenceParser {
 
@@ -12,24 +11,30 @@ public class ReferenceParser extends BasicReferenceParser {
   @Deprecated
   public static final int EAT_LAST_DOT = 0x01;
   /** @deprecated use {@link BasicReferenceParser#ELLIPSIS} instead **/
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static final int ELLIPSIS = 0x02;
   /** @deprecated use {@link BasicReferenceParser#WILDCARD} instead **/
   @Deprecated
   public static final int WILDCARD = 0x04;
   /** @deprecated use {@link BasicReferenceParser#DIAMONDS} instead **/
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static final int DIAMONDS = 0x08;
   /** @deprecated use {@link BasicReferenceParser#DISJUNCTIONS} instead **/
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static final int DISJUNCTIONS = 0x10;
   /** @deprecated use {@link BasicReferenceParser#CONJUNCTIONS} instead **/
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static final int CONJUNCTIONS = 0x20;
   /** @deprecated use {@link BasicReferenceParser#INCOMPLETE_ANNO} instead **/
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static final int INCOMPLETE_ANNO = 0x40;
   /** @deprecated use {@link BasicReferenceParser#VAR_TYPE} instead **/
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static final int VAR_TYPE = 0x80;
 
diff --git a/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java b/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java
index 2758403b6c97..8452bfa631be 100644
--- a/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java
+++ b/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java
@@ -91,7 +91,7 @@ public abstract class TreeClassChooserFactory {
   /**
    * @deprecated Use {@link TreeFileChooserFactory#createFileChooser(String, PsiFile, FileType, TreeFileChooser.PsiFileFilter, boolean)}
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   @NotNull
   public abstract TreeFileChooser createFileChooser(@NotNull @NlsContexts.DialogTitle String title,
                                                     @Nullable PsiFile initialFile,
@@ -102,7 +102,7 @@ public abstract class TreeClassChooserFactory {
   /**
    * @deprecated Use {@link TreeFileChooserFactory#createFileChooser(String, PsiFile, FileType, TreeFileChooser.PsiFileFilter, boolean, boolean)}
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   @NotNull
   public abstract TreeFileChooser createFileChooser(@NotNull @NlsContexts.DialogTitle String title,
                                                     @Nullable PsiFile initialFile,