From 9718731f33e36fcbe3e28a7bfa5ac3bfdc491299 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Fri, 23 Jan 2026 14:45:06 +0100 Subject: [PATCH] IJPL-212619 Java: remove deprecated API, which was marked for removal and has no usages Space-RevId: 03757d83c4ac1f0aba4d7dd2b1c94e065cf161d0 GitOrigin-RevId: fcb1a89583973b2cd6d5e06e53c7ee5cab957836 --- .../backwardRefs/CompilerReferenceReader.java | 13 -------- .../CollectionVisualizerEvaluator.kt | 17 ---------- .../engine/requests/RequestManagerImpl.java | 10 ------ .../debugger/impl/DebuggerUtilsEx.java | 15 --------- .../JavaExceptionBreakpointProperties.java | 9 ------ .../projectWizard/generators/AssetsJava.kt | 5 --- .../IntelliJNewProjectWizardStep.kt | 5 --- .../daemon/impl/UnusedSymbolUtil.java | 15 --------- .../analysis/HighlightControlFlowUtil.java | 11 ------- .../java/inst/JvmPushInstruction.java | 31 ------------------- .../introduceField/LocalToFieldHandler.java | 8 ----- .../ide/util/TreeClassChooserFactoryImpl.java | 24 +------------- .../intellij/lang/java/lexer/JavaLexer.java | 14 --------- .../lang/java/parser/JavaParserUtil.java | 25 --------------- .../intellij/psi/ClassFileViewProvider.java | 3 +- .../intellij/psi/impl/JavaPsiFacadeImpl.java | 10 ------ .../ide/util/TreeClassChooserFactory.java | 22 ------------- 17 files changed, 3 insertions(+), 234 deletions(-) delete mode 100644 java/debugger/impl/src/com/intellij/debugger/collections/visualizer/CollectionVisualizerEvaluator.kt delete mode 100644 java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/JvmPushInstruction.java diff --git a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java index 25245a8eddd4..b25a5833ff2b 100644 --- a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java +++ b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java @@ -5,14 +5,12 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.indexing.StorageException; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.backwardRefs.CompilerRef; import org.jetbrains.jps.backwardRefs.NameEnumerator; import org.jetbrains.jps.backwardRefs.index.CompilerReferenceIndex; -import java.io.File; import java.nio.file.Path; import java.util.Map; import java.util.Set; @@ -26,17 +24,6 @@ public abstract class CompilerReferenceReader(val parent: ParentStep) : @@ -107,10 +106,6 @@ abstract class IntelliJNewProjectWizardStep(val parent: ParentStep) } } - @ApiStatus.ScheduledForRemoval - @Deprecated("The onboarding tips generated unconditionally") - protected fun setupSampleCodeWithOnBoardingTipsUI(builder: Panel) = Unit - protected fun setupModuleNameUI(builder: Panel) { builder.row(UIBundle.message("label.project.wizard.new.project.module.name")) { textField() diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java index 556e6096a7e9..e9adabee0121 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java @@ -10,7 +10,6 @@ import com.intellij.codeInspection.ex.EntryPointsManagerBase; import com.intellij.codeInspection.reference.UnusedDeclarationFixProvider; import com.intellij.find.findUsages.*; import com.intellij.ide.highlighter.XmlFileType; -import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsContexts; @@ -210,20 +209,6 @@ public final class UnusedSymbolUtil { return useScope; } - /** - * @deprecated use {@link #processUsages(Project, PsiFile, SearchScope, PsiMember, PsiFile, Processor)} - */ - @SuppressWarnings("unused") - @Deprecated(forRemoval = true) - public static boolean processUsages(@NotNull Project project, - @NotNull PsiFile containingFile, - @NotNull PsiMember member, - @NotNull ProgressIndicator progress, - @Nullable PsiFile ignoreFile, - @NotNull Processor usageInfoProcessor) { - return processUsages(project, containingFile, member, ignoreFile, usageInfoProcessor); - } - // return false if can't process usages (weird member of too may usages) or processor returned false public static boolean processUsages(@NotNull Project project, @NotNull PsiFile containingFile, diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java index 72384a2c24b0..f41ada3aa33b 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java @@ -3,9 +3,6 @@ package com.intellij.codeInsight.daemon.impl.analysis; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiVariable; -import com.intellij.psi.controlFlow.AnalysisCanceledException; -import com.intellij.psi.controlFlow.ControlFlow; -import com.intellij.psi.controlFlow.ControlFlowFactory; import com.intellij.psi.controlFlow.ControlFlowUtil; import org.jetbrains.annotations.NotNull; @@ -17,14 +14,6 @@ public final class HighlightControlFlowUtil { private HighlightControlFlowUtil() { } - /** - * @deprecated use {@link ControlFlowFactory#getControlFlowNoConstantEvaluate(PsiElement)} - */ - @Deprecated(forRemoval = true) - public static @NotNull ControlFlow getControlFlowNoConstantEvaluate(@NotNull PsiElement body) throws AnalysisCanceledException { - return ControlFlowFactory.getControlFlowNoConstantEvaluate(body); - } - /** * @deprecated use {@link ControlFlowUtil#variableDefinitelyAssignedIn(PsiVariable, PsiElement)} */ diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/JvmPushInstruction.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/JvmPushInstruction.java deleted file mode 100644 index 34a052707bfc..000000000000 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/JvmPushInstruction.java +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2000-2021 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.dataFlow.java.inst; - -import com.intellij.codeInspection.dataFlow.lang.DfaAnchor; -import com.intellij.codeInspection.dataFlow.lang.ir.Instruction; -import com.intellij.codeInspection.dataFlow.lang.ir.PushInstruction; -import com.intellij.codeInspection.dataFlow.value.DfaValue; -import com.intellij.codeInspection.dataFlow.value.DfaValueFactory; -import org.jetbrains.annotations.NotNull; - -/** - * @deprecated use simply {@link PushInstruction}. If escaping processing is necessary (which is unlikely), - * emit explicit {@link EscapeInstruction}. - */ -@Deprecated(forRemoval = true) -public class JvmPushInstruction extends PushInstruction { - public JvmPushInstruction(@NotNull DfaValue value, DfaAnchor place) { - this(value, place, false); - } - - public JvmPushInstruction(@NotNull DfaValue value, DfaAnchor place, final boolean isReferenceWrite) { - super(value, place); - assert place == null || !isReferenceWrite; - } - - @Override - public @NotNull Instruction bindToFactory(@NotNull DfaValueFactory factory) { - return new JvmPushInstruction(getValue().bindToFactory(factory), getDfaAnchor()); - } -} diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java index b69c7c6a20a9..71b886f223d7 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java @@ -108,14 +108,6 @@ public abstract class LocalToFieldHandler { PsiUtil.isConstantExpression(initializer); } - /** - * @deprecated Use {@link #isStaticFieldAllowed(PsiClass)} instead. - */ - @Deprecated(forRemoval = true) - public static boolean mayContainConstants(@NotNull PsiClass aClass) { - return isStaticFieldAllowed(aClass); - } - /** * Checks if adding a static field is allowed in the specified class. * Before Java 16 this was only allowed for inner, local and anonymous classes, diff --git a/java/java-impl/src/com/intellij/ide/util/TreeClassChooserFactoryImpl.java b/java/java-impl/src/com/intellij/ide/util/TreeClassChooserFactoryImpl.java index 5f90b2463e76..f0a073eaef56 100644 --- a/java/java-impl/src/com/intellij/ide/util/TreeClassChooserFactoryImpl.java +++ b/java/java-impl/src/com/intellij/ide/util/TreeClassChooserFactoryImpl.java @@ -86,28 +86,6 @@ public class TreeClassChooserFactoryImpl extends TreeClassChooserFactory { final PsiFile initialFile, FileType fileType, TreeFileChooser.PsiFileFilter filter) { - return createFileChooser(title, initialFile, fileType, filter, false); - } - - @Override - public @NotNull - TreeFileChooser createFileChooser(@NotNull @NlsContexts.DialogTitle String title, - @Nullable PsiFile initialFile, - @Nullable FileType fileType, - @Nullable TreeFileChooser.PsiFileFilter filter, - boolean disableStructureProviders) { - return createFileChooser(title, initialFile, fileType, filter, disableStructureProviders, false); - } - - - @Override - public @NotNull TreeFileChooser createFileChooser(@NotNull @NlsContexts.DialogTitle String title, - @Nullable PsiFile initialFile, - @Nullable FileType fileType, - @Nullable TreeFileChooser.PsiFileFilter filter, - boolean disableStructureProviders, - boolean showLibraryContents) { - return TreeFileChooserFactory.getInstance(myProject) - .createFileChooser(title, initialFile, fileType, filter, disableStructureProviders, showLibraryContents); + return TreeFileChooserFactory.getInstance(myProject).createFileChooser(title, initialFile, fileType, filter, false, false); } } diff --git a/java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java b/java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java index 108a6fab4aaf..371f01939220 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java @@ -2,12 +2,9 @@ package com.intellij.lang.java.lexer; import com.intellij.platform.syntax.psi.lexer.LexerAdapter; -import com.intellij.pom.java.JavaFeature; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.util.PsiUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import static com.intellij.lang.java.syntax.JavaElementTypeConverterKt.getJavaElementTypeConverter; @@ -39,15 +36,4 @@ public final class JavaLexer extends LexerAdapter { public static boolean isSoftKeyword(@NotNull CharSequence id, @NotNull LanguageLevel level) { return PsiUtil.isSoftKeyword(id, level); } - - /** - * @param keyword soft keyword - * @return JavaFeature, which introduced a given keyword; null if the supplied string is not a soft keyword - * @deprecated use {@link PsiUtil#softKeywordFeature(CharSequence)} - */ - @ApiStatus.ScheduledForRemoval - @Deprecated - public static @Nullable JavaFeature softKeywordFeature(@NotNull CharSequence keyword) { - return PsiUtil.softKeywordFeature(keyword); - } } diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java index a35ce6c0ca4b..297d6ddb23a3 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java @@ -37,7 +37,6 @@ import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiUtil; import com.intellij.util.indexing.IndexingDataKeys; import kotlin.Unit; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.PropertyKey; @@ -84,30 +83,6 @@ public final class JavaParserUtil { void parse(@NotNull SyntaxTreeBuilder builder, @NotNull LanguageLevel languageLevel); } - /** - * @deprecated please, use {@link OldParserWhiteSpaceAndCommentSetHolder#INSTANCE} instead - */ - @ApiStatus.ScheduledForRemoval - @Deprecated - public static final WhitespacesAndCommentsBinder PRECEDING_COMMENT_BINDER = - OldParserWhiteSpaceAndCommentSetHolder.INSTANCE.getPrecedingCommentBinder(LanguageLevel.HIGHEST); - - /** - * @deprecated please, use {@link OldParserWhiteSpaceAndCommentSetHolder#INSTANCE} instead - */ - @ApiStatus.ScheduledForRemoval - @Deprecated - public static final WhitespacesAndCommentsBinder SPECIAL_PRECEDING_COMMENT_BINDER = - OldParserWhiteSpaceAndCommentSetHolder.INSTANCE.getSpecialPrecedingCommentBinder(LanguageLevel.HIGHEST); - - /** - * @deprecated please, use {@link OldParserWhiteSpaceAndCommentSetHolder#INSTANCE} instead - */ - @ApiStatus.ScheduledForRemoval - @Deprecated - public static final WhitespacesAndCommentsBinder TRAILING_COMMENT_BINDER = - OldParserWhiteSpaceAndCommentSetHolder.INSTANCE.getTrailingCommentBinder(); - private JavaParserUtil() { } diff --git a/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java b/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java index 156295c4cb1e..897e56616030 100644 --- a/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java +++ b/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java @@ -58,11 +58,12 @@ public class ClassFileViewProvider extends SingleRootFileViewProvider { } /** - * @deprecated use {@link #isInnerClass(VirtualFile)} or {@link #isInnerClass(VirtualFile, ClassReader)} + * @deprecated use {@link #isInnerClass(VirtualFile)} or {@link #isInnerClass(VirtualFile, ClassReader)} */ @ApiStatus.Internal @ApiStatus.ScheduledForRemoval @Deprecated + //used from org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsClassFinder.isKotlinInternalCompiledFile in org.jetbrains.kotlin:kotlin-compiler-embeddable public static boolean isInnerClass(@NotNull VirtualFile file, byte @NotNull [] content) { return isInnerClass(file, (ClassReader) null); } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java index 9a2ca32a5ae1..d7447bf5fcd3 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java @@ -32,7 +32,6 @@ import com.intellij.util.containers.ConcurrentFactoryMap; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.messages.MessageBus; import kotlinx.coroutines.CoroutineScope; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -68,15 +67,6 @@ public final class JavaPsiFacadeImpl extends JavaPsiFacadeEx { DummyHolderFactory.setFactory(new JavaDummyHolderFactory()); } - /** - * @deprecated Use {@link JavaPsiFacade#getInstance(Project)} - */ - @ApiStatus.ScheduledForRemoval - @Deprecated - public JavaPsiFacadeImpl(@NotNull Project project) { - this(project, null); - } - @Override public PsiClass findClass(final @NotNull String qualifiedName, @NotNull GlobalSearchScope scope) { ProgressIndicatorProvider.checkCanceled(); // We hope this method is being called often enough to cancel daemon processes smoothly diff --git a/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java b/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java index e1669caa5e8e..c1c741c3a99c 100644 --- a/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java +++ b/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java @@ -76,26 +76,4 @@ public abstract class TreeClassChooserFactory { @Nullable PsiFile initialFile, @Nullable FileType fileType, @Nullable TreeFileChooser.PsiFileFilter filter); - - - /** - * @deprecated Use {@link TreeFileChooserFactory#createFileChooser(String, PsiFile, FileType, TreeFileChooser.PsiFileFilter, boolean)} - */ - @Deprecated(forRemoval = true) - public abstract @NotNull TreeFileChooser createFileChooser(@NotNull @NlsContexts.DialogTitle String title, - @Nullable PsiFile initialFile, - @Nullable FileType fileType, - @Nullable TreeFileChooser.PsiFileFilter filter, - boolean disableStructureProviders); - - /** - * @deprecated Use {@link TreeFileChooserFactory#createFileChooser(String, PsiFile, FileType, TreeFileChooser.PsiFileFilter, boolean, boolean)} - */ - @Deprecated(forRemoval = true) - public abstract @NotNull TreeFileChooser createFileChooser(@NotNull @NlsContexts.DialogTitle String title, - @Nullable PsiFile initialFile, - @Nullable FileType fileType, - @Nullable TreeFileChooser.PsiFileFilter filter, - boolean disableStructureProviders, - boolean showLibraryContents); }