From 4989334b3790cb06342431b83f33a34574e201e1 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Fri, 10 Oct 2025 17:26:30 +0200 Subject: [PATCH] [platform] API cleanup: remove unused deprecated APIs that were scheduled for removal (IJPL-190638) GitOrigin-RevId: 1e137282750200c582819dd262a7d2bceddf9bb3 --- .../src/org/jetbrains/jps/cmdline/BuildRunner.java | 10 ---------- .../openapi/vfs/local/CoreLocalVirtualFile.java | 9 --------- platform/lang-impl/api-dump-unreviewed.txt | 1 - .../codeInsight/daemon/impl/DaemonListeners.java | 7 ------- platform/vcs-api/api-dump.txt | 1 - .../openapi/vcs/changes/ChangelistBuilder.java | 14 -------------- platform/vcs-impl/api-dump.txt | 1 - .../vcs/changes/patch/ApplyPatchAction.java | 10 ---------- 8 files changed, 53 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java index 9c154a9516ce..414a8465b855 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java +++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java @@ -4,7 +4,6 @@ package org.jetbrains.jps.cmdline; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.util.containers.FileCollectionFactory; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -64,15 +63,6 @@ public final class BuildRunner { return myModelLoader.loadModel().getProject(); } - /** - * @deprecated please use {@link #load(MessageHandler, Path, BuildFSState)} - */ - @ApiStatus.Internal - @Deprecated(forRemoval = true) - public ProjectDescriptor load(@NotNull MessageHandler msgHandler, @NotNull File dataStorageRoot, @NotNull BuildFSState fsState) throws IOException { - return load(msgHandler, dataStorageRoot.toPath(), fsState); - } - public ProjectDescriptor load(@NotNull MessageHandler msgHandler, @NotNull Path dataStorageRoot, @NotNull BuildFSState fsState) throws IOException { final JpsModel jpsModel = myModelLoader.loadModel(); BuildDataPaths dataPaths = new BuildDataPathsImpl(dataStorageRoot); diff --git a/platform/core-impl/src/com/intellij/openapi/vfs/local/CoreLocalVirtualFile.java b/platform/core-impl/src/com/intellij/openapi/vfs/local/CoreLocalVirtualFile.java index f21e0d047eaa..96a778168980 100644 --- a/platform/core-impl/src/com/intellij/openapi/vfs/local/CoreLocalVirtualFile.java +++ b/platform/core-impl/src/com/intellij/openapi/vfs/local/CoreLocalVirtualFile.java @@ -7,7 +7,6 @@ import com.intellij.openapi.vfs.VFileProperty; import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileSystem; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -25,14 +24,6 @@ public class CoreLocalVirtualFile extends VirtualFile { private BasicFileAttributes myAttributes; private VirtualFile[] myChildren; - /** @deprecated please use {@link #CoreLocalVirtualFile(CoreLocalFileSystem, Path)} instead */ - @ApiStatus.Internal - @ApiStatus.ScheduledForRemoval - @Deprecated - public CoreLocalVirtualFile(@NotNull CoreLocalFileSystem fileSystem, @NotNull File ioFile) { - this(fileSystem, ioFile.toPath()); - } - public CoreLocalVirtualFile(@NotNull CoreLocalFileSystem fileSystem, @NotNull Path file) { myFileSystem = fileSystem; myFile = file; diff --git a/platform/lang-impl/api-dump-unreviewed.txt b/platform/lang-impl/api-dump-unreviewed.txt index 27191681b4d4..9e8ebecd73c1 100644 --- a/platform/lang-impl/api-dump-unreviewed.txt +++ b/platform/lang-impl/api-dump-unreviewed.txt @@ -1988,7 +1988,6 @@ f:com.intellij.codeInsight.daemon.impl.ConfigureHighlightingLevelKt - sf:getConfigureHighlightingLevelPopup(com.intellij.openapi.actionSystem.DataContext):com.intellij.openapi.ui.popup.JBPopup f:com.intellij.codeInsight.daemon.impl.DaemonListeners - com.intellij.openapi.Disposable -- s:canChangeFileSilently(com.intellij.psi.PsiFileSystemItem,Z):Z - s:canChangeFileSilently(com.intellij.psi.PsiFileSystemItem,Z,com.intellij.util.ThreeState):Z - dispose():V f:com.intellij.codeInsight.daemon.impl.DaemonTooltipActionProvider diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java index d585ba018645..9ed34b1fbd90 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java @@ -10,7 +10,6 @@ import com.intellij.codeInsight.multiverse.CodeInsightContexts; import com.intellij.codeInspection.InspectionProfile; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ex.QuickFixWrapper; -import com.intellij.diagnostic.PluginException; import com.intellij.facet.Facet; import com.intellij.facet.FacetManager; import com.intellij.facet.FacetManagerListener; @@ -547,12 +546,6 @@ public final class DaemonListeners implements Disposable { return HighlightingSessionImpl.canChangeFileSilently(file, isInContent, extensionsAllowToChangeFileSilently); } - @Deprecated(forRemoval = true) - public static boolean canChangeFileSilently(@NotNull PsiFileSystemItem file, boolean isInContent) { - PluginException.reportDeprecatedUsage("this method", ""); - return canChangeFileSilently(file, isInContent, ThreeState.UNSURE); - } - private final class MyWriteActionListener implements WriteActionListener { @Override public void beforeWriteActionStart(@NotNull Class action) { diff --git a/platform/vcs-api/api-dump.txt b/platform/vcs-api/api-dump.txt index d41ec9eba188..18b66e879cad 100644 --- a/platform/vcs-api/api-dump.txt +++ b/platform/vcs-api/api-dump.txt @@ -1023,7 +1023,6 @@ com.intellij.openapi.vcs.changes.ChangelistBuilder - a:processRootSwitch(com.intellij.openapi.vfs.VirtualFile,java.lang.String):V - a:processSwitchedFile(com.intellij.openapi.vfs.VirtualFile,java.lang.String,Z):V - a:processUnversionedFile(com.intellij.openapi.vcs.FilePath):V -- processUnversionedFile(com.intellij.openapi.vfs.VirtualFile):V - a:removeRegisteredChangeFor(com.intellij.openapi.vcs.FilePath):V - a:reportAdditionalInfo(com.intellij.openapi.util.Factory):V - a:reportAdditionalInfo(java.lang.String):V diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangelistBuilder.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangelistBuilder.java index 88084b05672d..e581bd39d0d2 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangelistBuilder.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangelistBuilder.java @@ -8,7 +8,6 @@ import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.VcsKey; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.vcsUtil.VcsUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -42,19 +41,6 @@ public interface ChangelistBuilder { void removeRegisteredChangeFor(final FilePath path); - /** - * Process a file that is not under version control. - * - * @param file a file to process - * @deprecated use {@link #processUnversionedFile(FilePath)} instead - */ - @Deprecated(forRemoval = true) - default void processUnversionedFile(VirtualFile file) { - if (file != null) { - processUnversionedFile(VcsUtil.getFilePath(file)); - } - } - void processUnversionedFile(FilePath filePath); /** diff --git a/platform/vcs-impl/api-dump.txt b/platform/vcs-impl/api-dump.txt index 069bb2303c25..12cb9d050e09 100644 --- a/platform/vcs-impl/api-dump.txt +++ b/platform/vcs-impl/api-dump.txt @@ -1656,7 +1656,6 @@ f:com.intellij.openapi.vcs.changes.patch.ApplyPatchAction - ():V - actionPerformed(com.intellij.openapi.actionSystem.AnActionEvent):V - getActionUpdateThread():com.intellij.openapi.actionSystem.ActionUpdateThread -- s:showAndGetApplyPatch(com.intellij.openapi.project.Project,java.io.File):java.lang.Boolean - s:showApplyPatch(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile):V - update(com.intellij.openapi.actionSystem.AnActionEvent):V c:com.intellij.openapi.vcs.changes.patch.ApplyPatchDefaultExecutor diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java index 353267730950..b39c5cffb3e1 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java @@ -18,7 +18,6 @@ import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.CommitContext; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.util.concurrency.annotations.RequiresEdt; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -81,15 +80,6 @@ public final class ApplyPatchAction extends DumbAwareAction { ApplyPatchUtil.showApplyPatch(project, file); } - /** - * @deprecated Use {@link ApplyPatchUtil#showAndGetApplyPatch(Project, File)} instead. - */ - @Deprecated(forRemoval = true) - @RequiresEdt - public static Boolean showAndGetApplyPatch(@NotNull Project project, @NotNull File file) { - return ApplyPatchUtil.showAndGetApplyPatch(project, file); - } - /** * @deprecated Use {@link ApplyPatchUtil#applyContent(Project, ApplyFilePatchBase, ApplyPatchContext, VirtualFile, CommitContext, boolean, String, String)} instead. */