From 4f8bcd916114f9fa22d577fbdfbf49f0e991fca8 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Fri, 4 Oct 2024 17:43:01 +0200 Subject: [PATCH] [platform] API cleanup: remove unused deprecated API (IJPL-156972) GitOrigin-RevId: 183acaca734cbf2e053be244cd4292acc8d24991 --- platform/analysis-api/api-dump-unreviewed.txt | 1 - .../intention/IntentionManager.java | 9 ---- platform/core-api/api-dump-unreviewed.txt | 6 --- .../com/intellij/ide/plugins/PluginUtil.java | 10 ---- .../openapi/application/Application.java | 13 ----- .../openapi/application/ApplicationInfo.java | 7 --- .../progress/NonCancelableSection.java | 24 --------- platform/core-impl/api-dump-unreviewed.txt | 5 -- .../intellij/ide/plugins/PluginManagerCore.kt | 5 -- .../intellij/ide/plugins/PluginUtilImpl.java | 12 ----- .../com/intellij/mock/MockApplication.java | 11 ---- .../openapi/application/ex/ApplicationEx.java | 6 --- .../src/com/intellij/psi/impl/DebugUtil.java | 18 ------- platform/core-ui/api-dump.txt | 1 - platform/core-ui/src/util/PlatformIcons.java | 4 -- platform/editor-ui-api/api-dump.txt | 3 -- .../ide/projectView/PresentationData.java | 20 -------- .../com/intellij/openapi/editor/Inlay.java | 8 --- platform/editor-ui-ex/api-dump.txt | 1 - .../colors/impl/ReadOnlyColorsScheme.java | 9 ---- .../execution-impl/api-dump-unreviewed.txt | 6 --- .../JBTerminalSystemSettingsProviderBase.java | 10 ---- .../terminal/TerminalSplitAction.java | 51 ------------------- platform/ide-core/api-dump-unreviewed.txt | 2 - .../intellij/notification/Notifications.java | 17 ------- .../openapi/actionSystem/IdeActions.java | 5 -- platform/inspect/api-dump.txt | 3 -- .../codeInspection/InspectionApplication.java | 10 ---- platform/lang-api/api-dump-unreviewed.txt | 1 - .../src/com/intellij/util/ActionRunner.java | 9 ---- platform/lang-impl/api-dump-unreviewed.txt | 3 -- .../highlighting/HighlightManagerImpl.java | 9 ---- .../intellij/ide/util/FileStructurePopup.java | 14 ----- .../editor/richcopy/HtmlSyntaxInfoUtil.java | 14 ----- .../roots/IndexableEntityProvider.java | 24 --------- platform/platform-api/api-dump-unreviewed.txt | 21 -------- .../openapi/actionSystem/DataConstants.java | 8 --- .../openapi/ui/popup/JBPopupFactory.java | 14 ----- .../openapi/ui/popup/ListPopupStepEx.java | 6 +-- .../src/com/intellij/ui/AnActionButton.java | 21 +------- .../src/com/intellij/ui/IdeBorderFactory.java | 8 --- .../src/com/intellij/ui/PopupHandler.java | 10 ---- .../src/com/intellij/util/ui/Tree.java | 37 -------------- .../platform-impl/api-dump-unreviewed.txt | 10 ---- .../plugins/PluginManagerConfigurable.java | 8 --- .../ide/plugins/PluginUtilModernImpl.kt | 7 --- .../intellij/ide/ui/laf/darcula/DarculaLaf.kt | 15 ------ .../ui/laf/darcula/ui/DarculaButtonUI.java | 5 -- .../application/impl/ApplicationImpl.java | 7 --- .../impl/ApplicationInfoServiceDelegate.kt | 1 - .../AbstractFloatingToolbarComponent.kt | 8 --- .../fileChooser/FileSystemTreeFactory.java | 23 --------- .../ex/FileSystemTreeFactoryImpl.java | 25 --------- .../vfs/newvfs/persistent/FSRecords.java | 6 --- .../com/intellij/ui/popup/WizardPopup.java | 9 ---- platform/refactoring/api-dump.txt | 1 - .../highlighting/HighlightManager.java | 10 ---- .../core/src/com/intellij/ClassFinder.java | 9 ---- platform/testRunner/api-dump.txt | 1 - .../testframework/TrackRunningTestUtil.java | 7 --- platform/util/api-dump-unreviewed.txt | 1 - platform/util/base/api-dump.txt | 1 - .../com/intellij/util/SystemProperties.java | 11 ---- .../com/intellij/openapi/util/SystemInfo.java | 4 -- platform/util/ui/api-dump.txt | 1 - .../util/ui/src/com/intellij/ui/JBColor.java | 8 --- 66 files changed, 3 insertions(+), 651 deletions(-) delete mode 100644 platform/core-api/src/com/intellij/openapi/progress/NonCancelableSection.java delete mode 100644 platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/ReadOnlyColorsScheme.java delete mode 100644 platform/execution-impl/src/com/intellij/terminal/TerminalSplitAction.java delete mode 100644 platform/inspect/src/com/intellij/codeInspection/InspectionApplication.java delete mode 100644 platform/platform-api/src/com/intellij/util/ui/Tree.java delete mode 100644 platform/platform-impl/src/com/intellij/openapi/fileChooser/FileSystemTreeFactory.java delete mode 100644 platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeFactoryImpl.java diff --git a/platform/analysis-api/api-dump-unreviewed.txt b/platform/analysis-api/api-dump-unreviewed.txt index 70f6b817b9ea..2d42b802ae4b 100644 --- a/platform/analysis-api/api-dump-unreviewed.txt +++ b/platform/analysis-api/api-dump-unreviewed.txt @@ -636,7 +636,6 @@ a:com.intellij.codeInsight.intention.IntentionManager - a:getAvailableIntentions(java.util.Collection):java.util.List - a:getCleanupIntentionOptions():java.util.List - s:getInstance():com.intellij.codeInsight.intention.IntentionManager -- s:getInstance(com.intellij.openapi.project.Project):com.intellij.codeInsight.intention.IntentionManager - a:getIntentionActions():com.intellij.codeInsight.intention.IntentionAction[] - a:getStandardIntentionOptions(com.intellij.codeInsight.daemon.HighlightDisplayKey,com.intellij.psi.PsiElement):java.util.List - a:registerIntentionAndMetaData(com.intellij.codeInsight.intention.IntentionAction,java.lang.String[]):V diff --git a/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionManager.java b/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionManager.java index 3321229692e2..0fdef5c8a2ed 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionManager.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionManager.java @@ -5,7 +5,6 @@ import com.intellij.codeInsight.daemon.HighlightDisplayKey; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ex.InspectionToolWrapper; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.UserDataHolder; import com.intellij.psi.PsiElement; @@ -28,14 +27,6 @@ public abstract class IntentionManager { */ public static final Key SHOW_INTENTION_OPTIONS_KEY = Key.create("SHOW_INTENTION_OPTIONS_KEY"); - /** - * @deprecated Use {@link #getInstance()} instead. - */ - @Deprecated(forRemoval = true) - public static IntentionManager getInstance(Project project) { - return getInstance(); - } - public static IntentionManager getInstance() { return ApplicationManager.getApplication().getService(IntentionManager.class); } diff --git a/platform/core-api/api-dump-unreviewed.txt b/platform/core-api/api-dump-unreviewed.txt index 8c662fcfb5d8..7f87f7874b9c 100644 --- a/platform/core-api/api-dump-unreviewed.txt +++ b/platform/core-api/api-dump-unreviewed.txt @@ -314,7 +314,6 @@ com.intellij.ide.plugins.IdeaPluginDescriptor com.intellij.ide.plugins.PluginUtil - a:findPluginId(java.lang.Throwable):com.intellij.openapi.extensions.PluginId - a:findPluginName(com.intellij.openapi.extensions.PluginId):java.lang.String -- a:getCallerPlugin(I):com.intellij.openapi.extensions.PluginId - s:getInstance():com.intellij.ide.plugins.PluginUtil a:com.intellij.ide.util.PropertiesComponent - ():V @@ -1290,7 +1289,6 @@ com.intellij.openapi.application.Application - exit(Z,Z,Z,I):V - a:getDefaultModalityState():com.intellij.openapi.application.ModalityState - a:getIdleTime():J -- a:getInvokator():com.intellij.openapi.application.ModalityInvokator - a:getModalityStateForComponent(java.awt.Component):com.intellij.openapi.application.ModalityState - a:getStartTime():J - a:hasWriteAction(java.lang.Class):Z @@ -1335,7 +1333,6 @@ a:com.intellij.openapi.application.ApplicationInfo - a:getApiVersion():java.lang.String - a:getBuild():com.intellij.openapi.util.BuildNumber - a:getBuildDate():java.util.Calendar -- getBuildNumber():java.lang.String - a:getCompanyName():java.lang.String - a:getCompanyURL():java.lang.String - a:getFullApplicationName():java.lang.String @@ -2350,9 +2347,6 @@ a:com.intellij.openapi.progress.EmptyProgressIndicatorBase - start():V - startNonCancelableSection():V - stop():V -com.intellij.openapi.progress.NonCancelableSection -- sf:EMPTY:com.intellij.openapi.progress.NonCancelableSection -- a:done():V com.intellij.openapi.progress.PerformInBackgroundOption - sf:ALWAYS_BACKGROUND:com.intellij.openapi.progress.PerformInBackgroundOption - sf:DEAF:com.intellij.openapi.progress.PerformInBackgroundOption diff --git a/platform/core-api/src/com/intellij/ide/plugins/PluginUtil.java b/platform/core-api/src/com/intellij/ide/plugins/PluginUtil.java index cd761d943cc0..fbd9bc784662 100644 --- a/platform/core-api/src/com/intellij/ide/plugins/PluginUtil.java +++ b/platform/core-api/src/com/intellij/ide/plugins/PluginUtil.java @@ -5,7 +5,6 @@ import com.intellij.ide.plugins.cl.PluginAwareClassLoader; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.extensions.PluginId; import org.jetbrains.annotations.ApiStatus.Internal; -import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -15,15 +14,6 @@ public interface PluginUtil { return ApplicationManager.getApplication().getService(PluginUtil.class); } - /** - * @deprecated This function is dangerous because it can be used in class initializers. - * This function was unintentionally exposed. - * This function was not expected to be used outside the code which deals with plugins (i.e., platform code). - */ - @ScheduledForRemoval - @Deprecated - @Nullable PluginId getCallerPlugin(int stackFrameCount); - @Nullable PluginId findPluginId(@NotNull Throwable t); @Nullable @Nls String findPluginName(@NotNull PluginId pluginId); diff --git a/platform/core-api/src/com/intellij/openapi/application/Application.java b/platform/core-api/src/com/intellij/openapi/application/Application.java index 05a647bdcba1..a5104752607c 100644 --- a/platform/core-api/src/com/intellij/openapi/application/Application.java +++ b/platform/core-api/src/com/intellij/openapi/application/Application.java @@ -13,7 +13,6 @@ import com.intellij.util.concurrency.annotations.*; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.awt.*; import java.util.concurrent.Callable; @@ -643,11 +642,6 @@ public interface Application extends ComponentManager { @Deprecated void removeApplicationListener(@NotNull ApplicationListener listener); - /** @deprecated use corresponding {@link Application#invokeLater} methods */ - @ApiStatus.ScheduledForRemoval - @Deprecated - @NotNull ModalityInvokator getInvokator(); - /** @deprecated use {@link #isDisposed()} instead */ @Deprecated default boolean isDisposeInProgress() { @@ -662,13 +656,6 @@ public interface Application extends ComponentManager { @Deprecated @NotNull AccessToken acquireWriteActionLock(@NotNull Class marker); - /** @deprecated Internal API */ - @ApiStatus.ScheduledForRemoval - @ApiStatus.Internal - @Deprecated - @SuppressWarnings({"override", "DeprecatedIsStillUsed"}) - @Nullable T getServiceByClassName(@NotNull String serviceClassName); - /** @deprecated bad name, use {@link #isWriteIntentLockAcquired()} instead */ @Deprecated @ApiStatus.Experimental diff --git a/platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java b/platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java index fd871fccd4d7..8db490213a0c 100644 --- a/platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java +++ b/platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java @@ -126,13 +126,6 @@ public abstract class ApplicationInfo { return info != null && info.hasContextHelp(); } - /** @deprecated use {@link #getBuild()} */ - @Deprecated - @ApiStatus.ScheduledForRemoval - public String getBuildNumber() { - return getBuild().asString(); - } - public boolean isEAP() { return false; } diff --git a/platform/core-api/src/com/intellij/openapi/progress/NonCancelableSection.java b/platform/core-api/src/com/intellij/openapi/progress/NonCancelableSection.java deleted file mode 100644 index 55f87e386fc1..000000000000 --- a/platform/core-api/src/com/intellij/openapi/progress/NonCancelableSection.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. - -/* - * @author max - */ -package com.intellij.openapi.progress; - -import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval; -import org.jetbrains.annotations.NotNull; - -/** - * @deprecated this interface is not used in the platform - */ -@ScheduledForRemoval -@Deprecated -@FunctionalInterface -public interface NonCancelableSection { - void done(); - - @NotNull - NonCancelableSection EMPTY = () -> { - // do nothing - }; -} diff --git a/platform/core-impl/api-dump-unreviewed.txt b/platform/core-impl/api-dump-unreviewed.txt index 61b07794d099..2d2fe39cd271 100644 --- a/platform/core-impl/api-dump-unreviewed.txt +++ b/platform/core-impl/api-dump-unreviewed.txt @@ -484,7 +484,6 @@ f:com.intellij.ide.plugins.PluginManagerCore - sf:getPlugin(com.intellij.openapi.extensions.PluginId):com.intellij.ide.plugins.IdeaPluginDescriptor - sf:getPluginByClassName(java.lang.String):com.intellij.openapi.extensions.PluginId - sf:getPluginNameAndVendor(com.intellij.ide.plugins.IdeaPluginDescriptor):java.lang.String -- sf:getPluginOrPlatformByClassName(java.lang.String):com.intellij.openapi.extensions.PluginId - sf:getPlugins():com.intellij.ide.plugins.IdeaPluginDescriptor[] - f:initializePlugins(com.intellij.ide.plugins.DescriptorListLoadingContext,com.intellij.ide.plugins.PluginLoadingResult,java.lang.ClassLoader,Z,com.intellij.diagnostic.Activity):com.intellij.ide.plugins.PluginManagerState - sf:invalidatePlugins():V @@ -810,11 +809,9 @@ c:com.intellij.mock.MockApplication - getCurrentModalityState():com.intellij.openapi.application.ModalityState - getDefaultModalityState():com.intellij.openapi.application.ModalityState - getIdleTime():J -- getInvokator():com.intellij.openapi.application.ModalityInvokator - getModalityStateForComponent(java.awt.Component):com.intellij.openapi.application.ModalityState - getNoneModalityState():com.intellij.openapi.application.ModalityState - f:getService(java.lang.Class):java.lang.Object -- getServiceByClassName(java.lang.String):java.lang.Object - f:getServiceIfCreated(java.lang.Class):java.lang.Object - getStartTime():J - hasWriteAction(java.lang.Class):Z @@ -2068,7 +2065,6 @@ f:com.intellij.psi.impl.DebugUtil - s:checkTreeStructure(com.intellij.lang.ASTNode):V - s:currentStackTrace():java.lang.String - s:diagnosePsiDocumentInconsistency(com.intellij.psi.PsiElement,com.intellij.openapi.editor.Document):java.lang.String -- s:finishPsiModification():V - s:graphToString(com.intellij.util.graph.InboundSemiGraph):java.lang.String - s:graphToString(com.intellij.util.graph.OutboundSemiGraph):java.lang.String - s:lightTreeToString(com.intellij.util.diff.FlyweightCapableTreeStructure,Z):java.lang.String @@ -2090,7 +2086,6 @@ f:com.intellij.psi.impl.DebugUtil - s:runWithCheckInternalInvariantsDisabled(com.intellij.util.ThrowableRunnable):V - s:runWithCheckInternalInvariantsEnabled(com.intellij.util.ThrowableRunnable):V - s:sleep(J):V -- s:startPsiModification(java.lang.String):V - s:stubTreeToBuffer(com.intellij.psi.stubs.Stub,java.lang.Appendable,I):V - s:stubTreeToString(com.intellij.psi.stubs.Stub):java.lang.String - s:treeToBuffer(java.lang.Appendable,com.intellij.lang.ASTNode,I,Z,Z,Z,Z,Z):V diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt index 4537ea15b83e..c6803e02a3b2 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt @@ -196,11 +196,6 @@ object PluginManagerCore { return if (id == null || CORE_ID == id) null else id } - @ApiStatus.ScheduledForRemoval - @Deprecated("Use {@link PluginManager#getPluginByClass}.") - @JvmStatic - fun getPluginOrPlatformByClassName(className: String): PluginId? = getPluginDescriptorOrPlatformByClassName(className)?.getPluginId() - @Internal @JvmStatic fun isPlatformClass(fqn: String): Boolean = diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginUtilImpl.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginUtilImpl.java index ec647e811ca0..38f0e5fe3687 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginUtilImpl.java +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginUtilImpl.java @@ -2,13 +2,11 @@ package com.intellij.ide.plugins; import com.intellij.diagnostic.PluginException; -import com.intellij.ide.plugins.cl.PluginAwareClassLoader; import com.intellij.ide.plugins.cl.PluginClassLoader; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.PluginDescriptor; import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.ReflectionUtil; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -22,16 +20,6 @@ import java.util.StringTokenizer; public class PluginUtilImpl implements PluginUtil { private static final Logger LOG = Logger.getInstance(PluginUtilImpl.class); - @Override - public @Nullable PluginId getCallerPlugin(int stackFrameCount) { - Class aClass = ReflectionUtil.getCallerClass(stackFrameCount + 1); - if (aClass == null) { - return null; - } - ClassLoader classLoader = aClass.getClassLoader(); - return classLoader instanceof PluginAwareClassLoader ? ((PluginAwareClassLoader)classLoader).getPluginId() : null; - } - @Override public @Nullable PluginId findPluginId(@NotNull Throwable t) { return doFindPluginId(t); diff --git a/platform/core-impl/src/com/intellij/mock/MockApplication.java b/platform/core-impl/src/com/intellij/mock/MockApplication.java index 60cebfc5fcb8..493cdafe1153 100644 --- a/platform/core-impl/src/com/intellij/mock/MockApplication.java +++ b/platform/core-impl/src/com/intellij/mock/MockApplication.java @@ -272,12 +272,6 @@ public class MockApplication extends MockComponentManager implements Application public void invokeLater(@NotNull Runnable runnable, @NotNull ModalityState state) { } - @Deprecated - @Override - public @NotNull ModalityInvokator getInvokator() { - throw new UnsupportedOperationException(); - } - @Override public void invokeAndWait(@NotNull Runnable runnable, @NotNull ModalityState modalityState) { if (isDispatchThread()) { @@ -360,11 +354,6 @@ public class MockApplication extends MockComponentManager implements Application return true; } - @Override - public @Nullable T getServiceByClassName(@NotNull String serviceClassName) { - throw new UnsupportedOperationException(); - } - @Override public boolean isWriteActionInProgress() { return false; diff --git a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java index 5968385e73b6..3d8087b5523f 100644 --- a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java +++ b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java @@ -218,12 +218,6 @@ public interface ApplicationEx extends Application { } // in some cases, we cannot get service by class - /** - * Light service is not supported. - */ - @Override - @ApiStatus.Internal - @Nullable T getServiceByClassName(@NotNull String serviceClassName); /** * @deprecated Use {@link com.intellij.ide.IdeEventQueue#flushNativeEventQueue IdeEventQueue.flushNativeEventQueue()} diff --git a/platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java b/platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java index 10bfb3b4cfb6..60edf4ac6f87 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java +++ b/platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java @@ -25,7 +25,6 @@ import com.intellij.util.*; import com.intellij.util.diff.FlyweightCapableTreeStructure; import com.intellij.util.graph.InboundSemiGraph; import com.intellij.util.graph.OutboundSemiGraph; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; @@ -713,21 +712,4 @@ public final class DebugUtil { DebugUtil.CHECK = oldDebugUtilCheck; } } - - // - - /** @deprecated use {@link #performPsiModification} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval - public static void startPsiModification(@Nullable String trace) { - beginPsiModification(trace); - } - - /** @deprecated use {@link #performPsiModification} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval - public static void finishPsiModification() { - endPsiModification(); - } - // } diff --git a/platform/core-ui/api-dump.txt b/platform/core-ui/api-dump.txt index c4ee45ef2dc0..498a26ef9f52 100644 --- a/platform/core-ui/api-dump.txt +++ b/platform/core-ui/api-dump.txt @@ -518,7 +518,6 @@ com.intellij.util.PlatformIcons - sf:CUSTOM_FILE_ICON:javax.swing.Icon - sf:DELETE_ICON:javax.swing.Icon - sf:DIRECTORY_CLOSED_ICON:javax.swing.Icon -- sf:DIRECTORY_OPEN_ICON:javax.swing.Icon - sf:EDIT:javax.swing.Icon - sf:EDIT_IN_SECTION_ICON:javax.swing.Icon - sf:ENUM_ICON:javax.swing.Icon diff --git a/platform/core-ui/src/util/PlatformIcons.java b/platform/core-ui/src/util/PlatformIcons.java index 1f888cf361d7..b8b4681e0bf3 100644 --- a/platform/core-ui/src/util/PlatformIcons.java +++ b/platform/core-ui/src/util/PlatformIcons.java @@ -93,8 +93,4 @@ public interface PlatformIcons { /** @deprecated use {@link #FOLDER_ICON} */ @Deprecated(forRemoval = true) Icon DIRECTORY_CLOSED_ICON = FOLDER_ICON; - - /** @deprecated use {@link #FOLDER_ICON} */ - @Deprecated(forRemoval = true) - Icon DIRECTORY_OPEN_ICON = FOLDER_ICON; } diff --git a/platform/editor-ui-api/api-dump.txt b/platform/editor-ui-api/api-dump.txt index b5ffcca15450..07585acb553f 100644 --- a/platform/editor-ui-api/api-dump.txt +++ b/platform/editor-ui-api/api-dump.txt @@ -134,11 +134,9 @@ c:com.intellij.ide.projectView.PresentationData - setAttributesKey(com.intellij.openapi.editor.colors.TextAttributesKey):V - f:setBackground(java.awt.Color):V - setChanged(Z):V -- setClosedIcon(javax.swing.Icon):V - setForcedTextForeground(java.awt.Color):V - setIcon(javax.swing.Icon):V - setLocationString(java.lang.String):V -- setOpenIcon(javax.swing.Icon):V - setPresentableText(java.lang.String):V - setSeparatorAbove(Z):V - setTooltip(java.lang.String):V @@ -1965,7 +1963,6 @@ com.intellij.openapi.editor.Inlay - a:isValid():Z - a:repaint():V - a:update():V -- updateSize():V e:com.intellij.openapi.editor.Inlay$Placement - java.lang.Enum - sf:ABOVE_LINE:com.intellij.openapi.editor.Inlay$Placement diff --git a/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java b/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java index 9be47a4f1499..2413df689951 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java +++ b/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java @@ -130,26 +130,6 @@ public class PresentationData implements ColoredItemPresentation, ComparableObje myPresentableText = presentableText; } - /** - * @param closedIcon the closed icon for the node. - * @deprecated Different icons for open/closed no longer supported. Use setIcon instead - * 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(forRemoval = true) - public void setClosedIcon(Icon closedIcon) { - setIcon(closedIcon); - } - - - /** - * @param ignoredOpenIcon ignored - * @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(forRemoval = true) - public void setOpenIcon(Icon ignoredOpenIcon) { - } /** * Copies the presentation parameters from the specified presentation instance. diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/Inlay.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/Inlay.java index 1e534dedab8e..9ff1a9a11881 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/Inlay.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/Inlay.java @@ -94,14 +94,6 @@ public interface Inlay extends Disposable */ @Nullable GutterIconRenderer getGutterIconRenderer(); - /** - * @deprecated Use {@link #update()} instead. - */ - @Deprecated(forRemoval = true) - default void updateSize() { - update(); - } - /** * Updates inlay properties (width, height, gutter icon renderer) from inlay's renderer. Also, repaints the inlay. * diff --git a/platform/editor-ui-ex/api-dump.txt b/platform/editor-ui-ex/api-dump.txt index 8a1986cb10a8..4ce3155a9e9d 100644 --- a/platform/editor-ui-ex/api-dump.txt +++ b/platform/editor-ui-ex/api-dump.txt @@ -262,7 +262,6 @@ c:com.intellij.openapi.editor.colors.impl.FontPreferencesImpl - setTemplateFontSize(I):V - setUseLigatures(Z):V - useLigatures():Z -com.intellij.openapi.editor.colors.impl.ReadOnlyColorsScheme com.intellij.openapi.editor.ex.MarkupModelEx - com.intellij.openapi.editor.markup.MarkupModel - a:addMarkupModelListener(com.intellij.openapi.Disposable,com.intellij.openapi.editor.impl.event.MarkupModelListener):V diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/ReadOnlyColorsScheme.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/ReadOnlyColorsScheme.java deleted file mode 100644 index fc8f783895c5..000000000000 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/ReadOnlyColorsScheme.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.openapi.editor.colors.impl; - -/** - * @deprecated Do not use. - */ -@Deprecated(forRemoval = true) -public interface ReadOnlyColorsScheme { -} diff --git a/platform/execution-impl/api-dump-unreviewed.txt b/platform/execution-impl/api-dump-unreviewed.txt index ac86ba25e024..41fa5b64ed36 100644 --- a/platform/execution-impl/api-dump-unreviewed.txt +++ b/platform/execution-impl/api-dump-unreviewed.txt @@ -2238,7 +2238,6 @@ c:com.intellij.terminal.JBTerminalSystemSettingsProviderBase - copyOnSelect():Z - getBufferMaxLinesCount():I - getClearBufferActionPresentation():com.jediterm.terminal.ui.TerminalActionPresentation -- getCloseSessionActionPresentation():com.jediterm.terminal.ui.TerminalActionPresentation - getCopyActionPresentation():com.jediterm.terminal.ui.TerminalActionPresentation - getCursorShape():com.jediterm.terminal.CursorShape - getDefaultBackground():com.jediterm.terminal.TerminalColor @@ -2399,11 +2398,6 @@ f:com.intellij.terminal.TerminalShellCommandHandler$Companion - f:executeShellCommandHandler(com.intellij.openapi.project.Project,java.lang.String,Z,java.lang.String,com.intellij.execution.Executor):V - f:getEP():com.intellij.openapi.extensions.ExtensionPointName - f:matches(com.intellij.openapi.project.Project,java.lang.String,Z,java.lang.String):Z -a:com.intellij.terminal.TerminalSplitAction -- com.jediterm.terminal.ui.TerminalAction -- actionPerformed(java.awt.event.KeyEvent):Z -- s:create(Z,com.intellij.terminal.JBTerminalWidgetListener):com.intellij.terminal.TerminalSplitAction -- a:split(Z):V f:com.intellij.terminal.TerminalTitle - ():V - f:addTitleListener(com.intellij.terminal.TerminalTitleListener,com.intellij.openapi.Disposable):V diff --git a/platform/execution-impl/src/com/intellij/terminal/JBTerminalSystemSettingsProviderBase.java b/platform/execution-impl/src/com/intellij/terminal/JBTerminalSystemSettingsProviderBase.java index 7158eea78c23..af7efa9b821f 100644 --- a/platform/execution-impl/src/com/intellij/terminal/JBTerminalSystemSettingsProviderBase.java +++ b/platform/execution-impl/src/com/intellij/terminal/JBTerminalSystemSettingsProviderBase.java @@ -310,14 +310,4 @@ public class JBTerminalSystemSettingsProviderBase extends DefaultSettingsProvide ? KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.META_DOWN_MASK) : KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)); } - - /** - * @deprecated use {@link org.jetbrains.plugins.terminal.JBTerminalSystemSettingsProvider#getCloseTabActionPresentation()} instead - */ - @Deprecated(forRemoval = true) - public @NotNull TerminalActionPresentation getCloseSessionActionPresentation() { - return new TerminalActionPresentation("Close Session", ClientSystemInfo.isMac() - ? KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.META_DOWN_MASK) - : KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)); - } } diff --git a/platform/execution-impl/src/com/intellij/terminal/TerminalSplitAction.java b/platform/execution-impl/src/com/intellij/terminal/TerminalSplitAction.java deleted file mode 100644 index afc9dbb5bd36..000000000000 --- a/platform/execution-impl/src/com/intellij/terminal/TerminalSplitAction.java +++ /dev/null @@ -1,51 +0,0 @@ -// 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.terminal; - -import com.intellij.idea.ActionsBundle; -import com.intellij.util.ui.UIUtil; -import com.jediterm.terminal.ui.TerminalAction; -import com.jediterm.terminal.ui.TerminalActionPresentation; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.awt.event.KeyEvent; -import java.util.Collections; -import java.util.Objects; - -/** - * @deprecated use {@link org.jetbrains.plugins.terminal.action.TerminalSplitAction} instead - */ -@Deprecated(forRemoval = true) -public abstract class TerminalSplitAction extends TerminalAction { - - private final boolean myVertically; - - private TerminalSplitAction(@NotNull TerminalActionPresentation presentation, boolean vertically) { - super(presentation); - myVertically = vertically; - } - - @Override - public boolean actionPerformed(@Nullable KeyEvent e) { - split(myVertically); - return true; - } - - public abstract void split(boolean vertically); - - public static TerminalSplitAction create(boolean vertically, @Nullable JBTerminalWidgetListener listener) { - String text = vertically ? UIUtil.removeMnemonic(ActionsBundle.message("action.SplitVertically.text")) - : UIUtil.removeMnemonic(ActionsBundle.message("action.SplitHorizontally.text")); - return new TerminalSplitAction(new TerminalActionPresentation(text, Collections.emptyList()), vertically) { - @Override - public boolean isEnabled(@Nullable KeyEvent e) { - return listener != null && listener.canSplit(vertically); - } - - @Override - public void split(boolean vertically) { - Objects.requireNonNull(listener).split(vertically); - } - }; - } -} diff --git a/platform/ide-core/api-dump-unreviewed.txt b/platform/ide-core/api-dump-unreviewed.txt index 23ab8c8ba7c0..1594bfef31b6 100644 --- a/platform/ide-core/api-dump-unreviewed.txt +++ b/platform/ide-core/api-dump-unreviewed.txt @@ -897,7 +897,6 @@ f:com.intellij.notification.Notifications$Bus - s:notify(com.intellij.notification.Notification):V - s:notify(com.intellij.notification.Notification,com.intellij.openapi.project.Project):V - *s:notifyAndHide(com.intellij.notification.Notification,com.intellij.openapi.project.Project):V -- s:register(java.lang.String,com.intellij.notification.NotificationDisplayType):V a:com.intellij.notification.NotificationsConfiguration - com.intellij.notification.Notifications - sf:LIGHTWEIGHT_PREFIX:java.lang.String @@ -1361,7 +1360,6 @@ com.intellij.openapi.actionSystem.IdeActions - sf:GROUP_NAVBAR_POPUP:java.lang.String - sf:GROUP_NAVBAR_TOOLBAR:java.lang.String - sf:GROUP_NEW:java.lang.String -- sf:GROUP_OTHER_MENU:java.lang.String - sf:GROUP_PARAMETERS_VIEW_POPUP:java.lang.String - sf:GROUP_PROJECT_VIEW_POPUP:java.lang.String - sf:GROUP_REFACTOR:java.lang.String diff --git a/platform/ide-core/src/com/intellij/notification/Notifications.java b/platform/ide-core/src/com/intellij/notification/Notifications.java index a93a81a8a53a..b3a9060cd842 100644 --- a/platform/ide-core/src/com/intellij/notification/Notifications.java +++ b/platform/ide-core/src/com/intellij/notification/Notifications.java @@ -12,7 +12,6 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.swing.*; import java.util.concurrent.TimeUnit; /** @@ -54,22 +53,6 @@ public interface Notifications { final class Bus { private Bus() { } - /** - * Registration is OPTIONAL: BALLOON display type will be used by default. - * - * @deprecated use {@link NotificationGroup} - */ - @Deprecated(forRemoval = true) - public static void register(@NotNull String groupId, @NotNull NotificationDisplayType defaultDisplayType) { - if (ApplicationManager.getApplication().isUnitTestMode()) return; - SwingUtilities.invokeLater(() -> { - Application app = ApplicationManager.getApplication(); - if (!app.isDisposed()) { - app.getMessageBus().syncPublisher(TOPIC).register(groupId, defaultDisplayType); - } - }); - } - /** * Use {@link #notify(Notification, Project)} when project is known to show it in its associated frame. */ diff --git a/platform/ide-core/src/com/intellij/openapi/actionSystem/IdeActions.java b/platform/ide-core/src/com/intellij/openapi/actionSystem/IdeActions.java index 9d0ad8d571e9..9770d249c3bb 100644 --- a/platform/ide-core/src/com/intellij/openapi/actionSystem/IdeActions.java +++ b/platform/ide-core/src/com/intellij/openapi/actionSystem/IdeActions.java @@ -242,11 +242,6 @@ public interface IdeActions { String GROUP_COMPILER_ERROR_VIEW_POPUP = "CompilerErrorViewPopupMenu"; - /** - * @deprecated this group isn't registered by the platform anymore, use other groups instead - */ - @Deprecated(forRemoval = true) - String GROUP_OTHER_MENU = "OtherMenu"; String GROUP_EDITOR = "EditorActions"; String GROUP_EDITOR_BIDI_TEXT_DIRECTION = "EditorBidiTextDirection"; diff --git a/platform/inspect/api-dump.txt b/platform/inspect/api-dump.txt index d29719d0474a..e189d72e196d 100644 --- a/platform/inspect/api-dump.txt +++ b/platform/inspect/api-dump.txt @@ -26,9 +26,6 @@ a:com.intellij.codeInspection.AbstractInspectionToolStarter - p:getApplication():com.intellij.codeInspection.InspectionApplicationBase - main(java.util.List):V - premain(java.util.List):V -f:com.intellij.codeInspection.InspectionApplication -- com.intellij.codeInspection.InspectionApplicationBase -- ():V c:com.intellij.codeInspection.InspectionApplicationBase - com.intellij.ide.CommandLineInspectionProgressReporter - sf:LOG:com.intellij.openapi.diagnostic.Logger diff --git a/platform/inspect/src/com/intellij/codeInspection/InspectionApplication.java b/platform/inspect/src/com/intellij/codeInspection/InspectionApplication.java deleted file mode 100644 index 64d1b18d3ba6..000000000000 --- a/platform/inspect/src/com/intellij/codeInspection/InspectionApplication.java +++ /dev/null @@ -1,10 +0,0 @@ -// 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; - - -/** - * @deprecated Inherit directly from InspectionApplicationBase - */ -@Deprecated(forRemoval = true) -public final class InspectionApplication extends InspectionApplicationBase { -} diff --git a/platform/lang-api/api-dump-unreviewed.txt b/platform/lang-api/api-dump-unreviewed.txt index b2b1a815ee34..137327896b4c 100644 --- a/platform/lang-api/api-dump-unreviewed.txt +++ b/platform/lang-api/api-dump-unreviewed.txt @@ -5241,7 +5241,6 @@ c:com.intellij.ui.popup.util.SplitterItem - updateAccessoryView(javax.swing.JComponent):V a:com.intellij.util.ActionRunner - ():V -- s:runInsideReadAction(com.intellij.util.ActionRunner$InterruptibleRunnable):V - s:runInsideWriteAction(com.intellij.util.ActionRunner$InterruptibleRunnable):V - s:runInsideWriteAction(com.intellij.util.ActionRunner$InterruptibleRunnableWithResult):java.lang.Object com.intellij.util.ActionRunner$InterruptibleRunnable diff --git a/platform/lang-api/src/com/intellij/util/ActionRunner.java b/platform/lang-api/src/com/intellij/util/ActionRunner.java index b9da06e6c160..9ccebafec7d0 100644 --- a/platform/lang-api/src/com/intellij/util/ActionRunner.java +++ b/platform/lang-api/src/com/intellij/util/ActionRunner.java @@ -1,7 +1,6 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.util; -import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.util.ThrowableComputable; import org.jetbrains.annotations.NotNull; @@ -31,14 +30,6 @@ public abstract class ActionRunner { return WriteAction.computeAndWait(() -> runnable.run()); } - /** - * @deprecated use {@link ReadAction#run(ThrowableRunnable)} or {@link ReadAction#compute(ThrowableComputable)} instead - */ - @Deprecated(forRemoval = true) - public static void runInsideReadAction(final @NotNull InterruptibleRunnable runnable) throws Exception { - ReadAction.run(() -> runnable.run()); - } - /** * @deprecated obsolete API */ diff --git a/platform/lang-impl/api-dump-unreviewed.txt b/platform/lang-impl/api-dump-unreviewed.txt index 11833251ab2d..d05e40467f84 100644 --- a/platform/lang-impl/api-dump-unreviewed.txt +++ b/platform/lang-impl/api-dump-unreviewed.txt @@ -3616,7 +3616,6 @@ f:com.intellij.codeInsight.highlighting.HighlightManagerImpl - addOccurrenceHighlight(com.intellij.openapi.editor.Editor,I,I,com.intellij.openapi.editor.colors.TextAttributesKey,I,java.util.Collection):V - addOccurrenceHighlight(com.intellij.openapi.editor.Editor,I,I,com.intellij.openapi.editor.markup.TextAttributes,I,java.util.Collection,java.awt.Color):V - addOccurrenceHighlights(com.intellij.openapi.editor.Editor,com.intellij.psi.PsiElement[],com.intellij.openapi.editor.colors.TextAttributesKey,Z,java.util.Collection):V -- addOccurrenceHighlights(com.intellij.openapi.editor.Editor,com.intellij.psi.PsiElement[],com.intellij.openapi.editor.markup.TextAttributes,Z,java.util.Collection):V - addOccurrenceHighlights(com.intellij.openapi.editor.Editor,com.intellij.psi.PsiReference[],com.intellij.openapi.editor.colors.TextAttributesKey,Z,java.util.Collection):V - addRangeHighlight(com.intellij.openapi.editor.Editor,I,I,com.intellij.openapi.editor.colors.TextAttributesKey,Z,java.util.Collection):V - addRangeHighlight(com.intellij.openapi.editor.Editor,I,I,com.intellij.openapi.editor.colors.TextAttributesKey,Z,Z,java.util.Collection):V @@ -12479,7 +12478,6 @@ f:com.intellij.ide.util.EditorHelper f:com.intellij.ide.util.FileStructurePopup - com.intellij.ide.structureView.newStructureView.TreeActionsOwner - com.intellij.openapi.Disposable -- (com.intellij.openapi.project.Project,com.intellij.openapi.fileEditor.FileEditor,com.intellij.ide.structureView.StructureView,Z):V - (com.intellij.openapi.project.Project,com.intellij.openapi.fileEditor.FileEditor,com.intellij.ide.structureView.StructureViewModel):V - createCenterPanel():javax.swing.JComponent - dispose():V @@ -14045,7 +14043,6 @@ f:com.intellij.openapi.editor.richcopy.HtmlSyntaxInfoUtil - s:appendStyledSpan(java.lang.StringBuilder,com.intellij.openapi.editor.colors.TextAttributesKey,java.lang.String,F):java.lang.StringBuilder - s:appendStyledSpan(java.lang.StringBuilder,com.intellij.openapi.editor.markup.TextAttributes,java.lang.String,F):java.lang.StringBuilder - s:appendStyledSpan(java.lang.StringBuilder,java.lang.String,java.lang.String[]):java.lang.StringBuilder -- s:getHighlightedByLexerAndEncodedAsHtmlCodeSnippet(com.intellij.openapi.project.Project,com.intellij.lang.Language,java.lang.String,F):java.lang.String - s:getHtmlContent(com.intellij.psi.PsiFile,java.lang.CharSequence,com.intellij.openapi.editor.richcopy.SyntaxInfoBuilder$RangeIterator,com.intellij.openapi.editor.colors.EditorColorsScheme,I,I):java.lang.CharSequence - s:getHtmlContent(java.lang.CharSequence,com.intellij.openapi.editor.richcopy.SyntaxInfoBuilder$RangeIterator,com.intellij.openapi.editor.colors.EditorColorsScheme,I):java.lang.CharSequence - s:getStyledSpan(com.intellij.openapi.editor.colors.TextAttributesKey,java.lang.String,F):java.lang.String diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java index f02947fd0140..d89dbd244c94 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java @@ -260,15 +260,6 @@ public final class HighlightManagerImpl extends HighlightManager { addOccurrenceHighlight(editor, startOffset, endOffset, attributes, attributesKey, flags, highlighters, scrollMarkColor); } - @Override - public void addOccurrenceHighlights(@NotNull Editor editor, - PsiElement @NotNull [] elements, - @NotNull TextAttributes attributes, - boolean hideByTextChange, - @Nullable Collection outHighlighters) { - addOccurrenceHighlights(editor, elements, attributes, null, hideByTextChange, outHighlighters); - } - @Override public void addOccurrenceHighlights(@NotNull Editor editor, PsiElement @NotNull [] elements, diff --git a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java index 0c5999ce3a0a..75fc8e2d9cbe 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java +++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java @@ -5,11 +5,9 @@ import com.intellij.CommonBundle; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.icons.AllIcons; import com.intellij.ide.*; -import com.intellij.ide.actions.ViewStructureAction; import com.intellij.ide.dnd.aware.DnDAwareTree; import com.intellij.ide.structureView.ModelListener; import com.intellij.ide.structureView.SearchableTextProvider; -import com.intellij.ide.structureView.StructureView; import com.intellij.ide.structureView.StructureViewModel; import com.intellij.ide.structureView.impl.common.PsiTreeElementBase; import com.intellij.ide.structureView.newStructureView.*; @@ -132,18 +130,6 @@ public final class FileStructurePopup implements Disposable, TreeActionsOwner { private boolean myCanClose = true; private boolean myDisposed; - /** - * @noinspection unused - * @deprecated use {@link #FileStructurePopup(Project, FileEditor, StructureViewModel)} - */ - @Deprecated(forRemoval = true) - public FileStructurePopup(@NotNull Project project, - @NotNull FileEditor fileEditor, - @NotNull StructureView structureView, - boolean applySortAndFilter) { - this(project, fileEditor, ViewStructureAction.createStructureViewModel(project, fileEditor, structureView)); - Disposer.register(this, structureView); - } public FileStructurePopup(@NotNull Project project, @NotNull FileEditor fileEditor, diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/richcopy/HtmlSyntaxInfoUtil.java b/platform/lang-impl/src/com/intellij/openapi/editor/richcopy/HtmlSyntaxInfoUtil.java index b9a051e3d3f1..eb009b2089f5 100644 --- a/platform/lang-impl/src/com/intellij/openapi/editor/richcopy/HtmlSyntaxInfoUtil.java +++ b/platform/lang-impl/src/com/intellij/openapi/editor/richcopy/HtmlSyntaxInfoUtil.java @@ -55,20 +55,6 @@ public final class HtmlSyntaxInfoUtil { return appendStyledSpan(new StringBuilder(), attributes, value, saturationFactor).toString(); } - /** - * @deprecated Use {@link QuickDocHighlightingHelper} for adding code fragments to documentation - */ - @Deprecated(forRemoval = true) - public static @NotNull String getHighlightedByLexerAndEncodedAsHtmlCodeSnippet( - @NotNull Project project, - @NotNull Language language, - @Nullable String codeSnippet, - float saturationFactor - ) { - return appendHighlightedByLexerAndEncodedAsHtmlCodeSnippet(new StringBuilder(), project, language, codeSnippet, saturationFactor) - .toString(); - } - public static @NotNull StringBuilder appendStyledSpan( @NotNull StringBuilder buffer, @Nullable String value, diff --git a/platform/lang-impl/src/com/intellij/util/indexing/roots/IndexableEntityProvider.java b/platform/lang-impl/src/com/intellij/util/indexing/roots/IndexableEntityProvider.java index e11466267f16..3fd57363706b 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/roots/IndexableEntityProvider.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/roots/IndexableEntityProvider.java @@ -92,30 +92,6 @@ public interface IndexableEntityProvider { } } - /** - * @deprecated This interface is deprecated and will be removed in a future release. For creation of iterators - * for existing {@link WorkspaceEntity} {@link com.intellij.workspaceModel.core.fileIndex.WorkspaceFileIndexContributor} is used. - */ - @Deprecated(forRemoval = true) - interface Existing extends IndexableEntityProvider { - - /** - * Provides builders for iterators to index files when just project is indexed, no events given - */ - default @NotNull Collection getExistingEntityIteratorBuilder(@NotNull E entity, - @NotNull Project project) { - return getAddedEntityIteratorBuilders(entity, project); - } - - /** - * Provides builders for iterators to index files belonging to a module when just module content is indexed, no events given - */ - @NotNull - Collection getIteratorBuildersForExistingModule(@NotNull ModuleEntity entity, - @NotNull EntityStorage entityStorage, - @NotNull Project project); - } - /** * Idea behind this marker interface is to mark that something should be reindexed as cheap as possible, * with expensive checks and merges made in batch in corresponding diff --git a/platform/platform-api/api-dump-unreviewed.txt b/platform/platform-api/api-dump-unreviewed.txt index 1e8ea3c57444..0793ed93758d 100644 --- a/platform/platform-api/api-dump-unreviewed.txt +++ b/platform/platform-api/api-dump-unreviewed.txt @@ -1677,7 +1677,6 @@ f:com.intellij.openapi.actionSystem.Constraints - (com.intellij.openapi.actionSystem.Anchor,java.lang.String):V - clone():java.lang.Object com.intellij.openapi.actionSystem.DataConstants -- sf:EDITOR:java.lang.String - sf:PROJECT:java.lang.String - sf:VIRTUAL_FILE:java.lang.String c:com.intellij.openapi.actionSystem.DecorativeElement @@ -5163,7 +5162,6 @@ a:com.intellij.openapi.ui.popup.JBPopupFactory - createActionGroupPopup(java.lang.String,com.intellij.openapi.actionSystem.ActionGroup,com.intellij.openapi.actionSystem.DataContext,Z,java.lang.Runnable,I):com.intellij.openapi.ui.popup.ListPopup - a:createActionGroupPopup(java.lang.String,com.intellij.openapi.actionSystem.ActionGroup,com.intellij.openapi.actionSystem.DataContext,Z,Z,Z,java.lang.Runnable,I,com.intellij.openapi.util.Condition):com.intellij.openapi.ui.popup.ListPopup - a:createActionsStep(com.intellij.openapi.actionSystem.ActionGroup,com.intellij.openapi.actionSystem.DataContext,java.lang.String,Z,Z,java.lang.String,java.awt.Component,Z,I,Z):com.intellij.openapi.ui.popup.ListPopupStep -- createActionsStep(com.intellij.openapi.actionSystem.ActionGroup,com.intellij.openapi.actionSystem.DataContext,Z,Z,java.lang.String,java.awt.Component,Z):com.intellij.openapi.ui.popup.ListPopupStep - createActionsStep(com.intellij.openapi.actionSystem.ActionGroup,com.intellij.openapi.actionSystem.DataContext,Z,Z,java.lang.String,java.awt.Component,Z,I,Z):com.intellij.openapi.ui.popup.ListPopupStep - a:createBalloonBuilder(javax.swing.JComponent):com.intellij.openapi.ui.popup.BalloonBuilder - a:createComponentPopupBuilder(javax.swing.JComponent,javax.swing.JComponent):com.intellij.openapi.ui.popup.ComponentPopupBuilder @@ -5211,7 +5209,6 @@ com.intellij.openapi.ui.popup.ListPopupStepEx - com.intellij.openapi.ui.popup.ListPopupStep - getSecondaryTextFor(java.lang.Object):java.lang.String - a:getTooltipTextFor(java.lang.Object):java.lang.String -- getValueFor(java.lang.Object):java.lang.String - onChosen(java.lang.Object,Z,I):com.intellij.openapi.ui.popup.PopupStep - onChosen(java.lang.Object,Z,java.awt.event.InputEvent):com.intellij.openapi.ui.popup.PopupStep - a:setEmptyText(com.intellij.util.ui.StatusText):V @@ -6023,21 +6020,10 @@ c:com.intellij.ui.AnActionButton$AnActionButtonWrapper - getDelegate():com.intellij.openapi.actionSystem.AnAction - isDumbAware():Z - updateButton(com.intellij.openapi.actionSystem.AnActionEvent):V -f:com.intellij.ui.AnActionButton$AnActionEventWrapper -- com.intellij.openapi.actionSystem.AnActionEvent -- showPopup(com.intellij.openapi.ui.popup.JBPopup):V c:com.intellij.ui.AnActionButton$CheckedAnActionButton - com.intellij.ui.AnActionButton$AnActionButtonWrapper - com.intellij.openapi.actionSystem.CheckedActionGroup - (com.intellij.openapi.actionSystem.Presentation,com.intellij.openapi.actionSystem.AnAction):V -c:com.intellij.ui.AnActionButton$GroupPopupWrapper -- com.intellij.ui.AnActionButton$AnActionButtonWrapper -- (com.intellij.openapi.actionSystem.ActionGroup):V -- actionPerformed(com.intellij.openapi.actionSystem.AnActionEvent):V -c:com.intellij.ui.AnActionButton$ToggleableButtonWrapper -- com.intellij.ui.AnActionButton$AnActionButtonWrapper -- com.intellij.openapi.actionSystem.Toggleable -- (com.intellij.openapi.actionSystem.Presentation,com.intellij.openapi.actionSystem.AnAction):V com.intellij.ui.AnActionButtonRunnable - com.intellij.util.ParameterizedRunnable com.intellij.ui.AnActionButtonUpdater @@ -6806,7 +6792,6 @@ f:com.intellij.ui.IdeBorderFactory - s:createBorder(java.awt.Color):javax.swing.border.Border - s:createBorder(java.awt.Color,I):javax.swing.border.Border - s:createEmptyBorder():javax.swing.border.Border -- s:createEmptyBorder(I):javax.swing.border.Border - s:createEmptyBorder(I,I,I,I):javax.swing.border.Border - s:createEmptyBorder(java.awt.Insets):javax.swing.border.Border - s:createRoundedBorder():com.intellij.ui.RoundedLineBorder @@ -7222,7 +7207,6 @@ a:com.intellij.ui.PopupHandler - s:installFollowingSelectionTreePopup(javax.swing.JTree,com.intellij.openapi.actionSystem.ActionGroup,java.lang.String):com.intellij.ui.PopupHandler - s:installPopupHandler(javax.swing.JComponent,com.intellij.openapi.actionSystem.ActionGroup,java.lang.String):java.awt.event.MouseListener - s:installPopupHandler(javax.swing.JComponent,com.intellij.openapi.actionSystem.ActionGroup,java.lang.String,com.intellij.openapi.actionSystem.ActionManager):java.awt.event.MouseListener -- s:installPopupHandler(javax.swing.JComponent,com.intellij.openapi.actionSystem.ActionGroup,java.lang.String,com.intellij.openapi.actionSystem.ActionManager,javax.swing.event.PopupMenuListener):java.awt.event.MouseListener - s:installPopupHandler(javax.swing.JComponent,java.lang.String,java.lang.String):V - s:installPopupMenu(javax.swing.JComponent,com.intellij.openapi.actionSystem.ActionGroup,java.lang.String):com.intellij.ui.PopupHandler - s:installPopupMenu(javax.swing.JComponent,com.intellij.openapi.actionSystem.ActionGroup,java.lang.String,javax.swing.event.PopupMenuListener):com.intellij.ui.PopupHandler @@ -12455,11 +12439,6 @@ f:com.intellij.util.ui.TimedDeadzone c:com.intellij.util.ui.TimedDeadzone$Length - (I):V - getLength():I -c:com.intellij.util.ui.Tree -- com.intellij.ui.treeStructure.Tree -- ():V -- (javax.swing.tree.TreeModel):V -- (javax.swing.tree.TreeNode):V f:com.intellij.util.ui.UI - ():V - s:scale(I):I diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java index 4628edbf89e1..c14962434458 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/DataConstants.java @@ -38,12 +38,4 @@ public interface DataConstants { */ @Deprecated(forRemoval = true) String VIRTUAL_FILE = CommonDataKeys.VIRTUAL_FILE.getName(); - - /** - * Returns {@link com.intellij.openapi.editor.Editor} - * - * @deprecated use {@link PlatformDataKeys#EDITOR} instead - */ - @Deprecated(forRemoval = true) - String EDITOR = CommonDataKeys.EDITOR.getName(); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/popup/JBPopupFactory.java b/platform/platform-api/src/com/intellij/openapi/ui/popup/JBPopupFactory.java index 1aaeb894e15d..7c17577a29fa 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/popup/JBPopupFactory.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/popup/JBPopupFactory.java @@ -150,20 +150,6 @@ public abstract class JBPopupFactory { Runnable onNo, int defaultOptionIndex); - /** - * @deprecated use {@link #createActionsStep(ActionGroup, DataContext, String, boolean, boolean, String, Component, boolean, int, boolean)} - */ - @Deprecated(forRemoval = true) - public @NotNull ListPopupStep createActionsStep(@NotNull ActionGroup actionGroup, - @NotNull DataContext dataContext, - boolean showNumbers, - boolean showDisabledActions, - @PopupTitle String title, - Component component, - boolean honorActionMnemonics) { - return createActionsStep(actionGroup, dataContext, null, showNumbers, showDisabledActions, title, component, honorActionMnemonics, 0, false); - } - /** * @deprecated use {@link #createActionsStep(ActionGroup, DataContext, String, boolean, boolean, String, Component, boolean, int, boolean)} */ diff --git a/platform/platform-api/src/com/intellij/openapi/ui/popup/ListPopupStepEx.java b/platform/platform-api/src/com/intellij/openapi/ui/popup/ListPopupStepEx.java index dc32fe68bc3b..23950a48f0ee 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/popup/ListPopupStepEx.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/popup/ListPopupStepEx.java @@ -28,9 +28,5 @@ public interface ListPopupStepEx extends ListPopupStep { void setEmptyText(@NotNull StatusText emptyText); - default @Nls @Nullable String getSecondaryTextFor(T t) { return getValueFor(t); } - - /** @deprecated Use {@link #getSecondaryTextFor(T)} instead */ - @Deprecated(forRemoval = true) - default @Nls @Nullable String getValueFor(T t) { return null; } + default @Nls @Nullable String getSecondaryTextFor(T t) { return null; } } diff --git a/platform/platform-api/src/com/intellij/ui/AnActionButton.java b/platform/platform-api/src/com/intellij/ui/AnActionButton.java index c42ecfb9f53f..9bd93ecb0506 100644 --- a/platform/platform-api/src/com/intellij/ui/AnActionButton.java +++ b/platform/platform-api/src/com/intellij/ui/AnActionButton.java @@ -5,7 +5,6 @@ import com.intellij.ide.DataManager; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.ui.JBPopupMenu; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.NlsContexts; @@ -214,31 +213,15 @@ public abstract class AnActionButton extends AnAction implements ShortcutProvide /** @deprecated Use {@link ToolbarDecorator#addExtraAction(AnAction)} directly */ @Deprecated(forRemoval = true) - public static class ToggleableButtonWrapper extends AnActionButtonWrapper implements Toggleable { + private static class ToggleableButtonWrapper extends AnActionButtonWrapper implements Toggleable { public ToggleableButtonWrapper(Presentation presentation, @NotNull AnAction action) { super(presentation, action); } } - /** @deprecated Use regular popup {@link ActionGroup} instead */ - @Deprecated(forRemoval = true) - public static class GroupPopupWrapper extends AnActionButtonWrapper { - public GroupPopupWrapper(@NotNull ActionGroup group) { - super(group.getTemplatePresentation(), group); - setShortcut(group.getShortcutSet()); - } - - @Override - public void actionPerformed(@NotNull AnActionEvent e) { - RelativePoint relativePoint = getPreferredPopupPoint(); - JBPopupMenu.showAt(relativePoint, ActionManager.getInstance().createActionPopupMenu( - e.getPlace(), (ActionGroup)getDelegate()).getComponent()); - } - } - /** @deprecated See {@link AnActionButtonWrapper} and {@link #getPreferredPopupPoint}*/ @Deprecated(forRemoval = true) - public static final class AnActionEventWrapper extends AnActionEvent { + private static final class AnActionEventWrapper extends AnActionEvent { private final AnActionButton myPeer; private AnActionEventWrapper(AnActionEvent e, AnActionButton peer) { diff --git a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java index 323d143ced30..2e998865c2af 100644 --- a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java +++ b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java @@ -66,14 +66,6 @@ public final class IdeBorderFactory { return JBUI.Borders.empty(); } - /** - * @deprecated use {@link JBUI.Borders#empty(int)} - */ - @Deprecated(forRemoval = true) - public static Border createEmptyBorder(int thickness) { - return JBUI.Borders.empty(thickness); - } - /** * @deprecated use {@link JBUI.Borders#empty(int, int, int, int)} */ diff --git a/platform/platform-api/src/com/intellij/ui/PopupHandler.java b/platform/platform-api/src/com/intellij/ui/PopupHandler.java index f2e86adda5ba..f0e61ef401d0 100644 --- a/platform/platform-api/src/com/intellij/ui/PopupHandler.java +++ b/platform/platform-api/src/com/intellij/ui/PopupHandler.java @@ -108,16 +108,6 @@ public abstract class PopupHandler extends MouseAdapter { return installPopupMenu(component, place, actionManager, null, __ -> group); } - /** @deprecated use {@link #installPopupMenu(JComponent, ActionGroup, String)} instead */ - @Deprecated(forRemoval = true) - public static @NotNull MouseListener installPopupHandler(@NotNull JComponent component, - @NotNull ActionGroup group, - @NotNull String place, - @Nullable ActionManager actionManager, - @Nullable PopupMenuListener menuListener) { - return installPopupMenu(component, place, actionManager, menuListener, __ -> group); - } - private static @NotNull PopupHandler installPopupMenu(@NotNull JComponent component, @NotNull String place, @Nullable ActionManager actionManager, diff --git a/platform/platform-api/src/com/intellij/util/ui/Tree.java b/platform/platform-api/src/com/intellij/util/ui/Tree.java deleted file mode 100644 index 544ea909634a..000000000000 --- a/platform/platform-api/src/com/intellij/util/ui/Tree.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2000-2019 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.util.ui; - -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreeNode; - -/** - * @deprecated use {@link com.intellij.ui.treeStructure.Tree} - */ -@Deprecated(forRemoval = true) -public class Tree extends com.intellij.ui.treeStructure.Tree { - - public Tree() { - } - - public Tree(TreeModel treemodel) { - super(treemodel); - } - - public Tree(TreeNode root) { - super(root); - } -} \ No newline at end of file diff --git a/platform/platform-impl/api-dump-unreviewed.txt b/platform/platform-impl/api-dump-unreviewed.txt index ea0f0580bfa7..a2efc50ca0b4 100644 --- a/platform/platform-impl/api-dump-unreviewed.txt +++ b/platform/platform-impl/api-dump-unreviewed.txt @@ -5152,13 +5152,11 @@ c:com.intellij.ide.ui.laf.darcula.DarculaLaf - getName():java.lang.String - getSupportsWindowDecorations():Z - initialize():V -- sf:isAltPressed():Z - isNativeLookAndFeel():Z - isSupportedLookAndFeel():Z - p:loadSystemColors(javax.swing.UIDefaults,java.lang.String[],Z):V - uninitialize():V f:com.intellij.ide.ui.laf.darcula.DarculaLaf$Companion -- f:isAltPressed():Z f:com.intellij.ide.ui.laf.darcula.DarculaLookAndFeelInfo - javax.swing.UIManager$LookAndFeelInfo - sf:CLASS_NAME:java.lang.String @@ -5250,7 +5248,6 @@ c:com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI - sf:DEFAULT_STYLE_KEY:com.intellij.openapi.util.Key - ps:HELP_BUTTON_DIAMETER:com.intellij.util.ui.JBValue - ps:HORIZONTAL_PADDING:com.intellij.util.ui.JBValue -- ps:MINIMUM_BUTTON_WIDTH:com.intellij.util.ui.JBValue - pf:iconRect:java.awt.Rectangle - pf:textRect:java.awt.Rectangle - pf:viewRect:java.awt.Rectangle @@ -8765,7 +8762,6 @@ Fa:com.intellij.openapi.editor.toolbar.floating.AbstractFloatingToolbarComponent - com.intellij.openapi.editor.toolbar.floating.FloatingToolbarComponent - com.intellij.ui.switcher.QuickActionProvider - javax.swing.JPanel -- (com.intellij.openapi.actionSystem.ActionGroup):V - (com.intellij.openapi.actionSystem.ActionGroup,com.intellij.openapi.Disposable):V - addNotify():V - hideImmediately():V @@ -8812,11 +8808,6 @@ f:com.intellij.openapi.editor.toolbar.floating.FloatingToolbarProvider$DefaultIm - s:register(com.intellij.openapi.editor.toolbar.floating.FloatingToolbarProvider,com.intellij.openapi.actionSystem.DataContext,com.intellij.openapi.editor.toolbar.floating.FloatingToolbarComponent,com.intellij.openapi.Disposable):V f:com.intellij.openapi.editor.toolbar.floating.FloatingToolbarUtilKt - sf:isInsideMainEditor(com.intellij.openapi.actionSystem.DataContext):Z -com.intellij.openapi.fileChooser.FileSystemTreeFactory -- a:createDefaultFileSystemActions(com.intellij.openapi.fileChooser.FileSystemTree):com.intellij.openapi.actionSystem.DefaultActionGroup -- a:createFileSystemTree(com.intellij.openapi.project.Project,com.intellij.openapi.fileChooser.FileChooserDescriptor):com.intellij.openapi.fileChooser.FileSystemTree -f:com.intellij.openapi.fileChooser.FileSystemTreeFactory$SERVICE -- s:getInstance():com.intellij.openapi.fileChooser.FileSystemTreeFactory a:com.intellij.openapi.fileChooser.actions.FileChooserAction - com.intellij.openapi.actionSystem.AnAction - com.intellij.openapi.project.DumbAware @@ -17480,7 +17471,6 @@ a:com.intellij.ui.popup.WizardPopup - p:myChild:com.intellij.ui.popup.WizardPopup - pf:myStep:com.intellij.openapi.ui.popup.PopupStep - (com.intellij.openapi.project.Project,com.intellij.openapi.ui.popup.JBPopup,com.intellij.openapi.ui.popup.PopupStep):V -- (com.intellij.openapi.ui.popup.PopupStep):V - f:actionPerformed(java.awt.event.ActionEvent):V - p:afterShow():V - cancel(java.awt.event.InputEvent):V diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java index d98c040b02bb..f7fbee74c137 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java @@ -1964,14 +1964,6 @@ public final class PluginManagerConfigurable myPluginModel.clear(myCardPanel); } - /** - * @deprecated Please use {@link #select(Collection)}. - */ - @Deprecated(since = "2020.2", forRemoval = true) - public void select(@NotNull IdeaPluginDescriptor @NotNull ... descriptors) { - select(ContainerUtil.newHashSet(descriptors)); - } - private void select(@NotNull Set descriptors) { select(ContainerUtil.map(descriptors, IdeaPluginDescriptor::getPluginId)); } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginUtilModernImpl.kt b/platform/platform-impl/src/com/intellij/ide/plugins/PluginUtilModernImpl.kt index cd479123e864..19538682dea7 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginUtilModernImpl.kt +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginUtilModernImpl.kt @@ -1,14 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.plugins -import com.intellij.ide.plugins.cl.PluginAwareClassLoader -import com.intellij.openapi.extensions.PluginId - private class PluginUtilModernImpl : PluginUtilImpl() { private val walker = StackWalker.getInstance(setOf(StackWalker.Option.RETAIN_CLASS_REFERENCE), 5) - override fun getCallerPlugin(stackFrameCount: Int): PluginId? { - val aClass = walker.walk { stream -> stream.skip((stackFrameCount).toLong()).map { it.declaringClass }.findFirst().orElse(null) } - return (aClass?.classLoader as? PluginAwareClassLoader)?.pluginId - } } \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.kt b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.kt index fd34222e5409..b9c63a70e682 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.kt +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.kt @@ -3,16 +3,11 @@ package com.intellij.ide.ui.laf.darcula -import com.intellij.ide.ui.laf.LookAndFeelThemeAdapter import com.intellij.ide.ui.laf.createRawDarculaTheme import com.intellij.ide.ui.laf.initBaseLaF import com.intellij.openapi.diagnostic.thisLogger import com.intellij.openapi.util.* import com.intellij.platform.ide.bootstrap.createBaseLaF -import kotlinx.coroutines.* -import org.jetbrains.annotations.ApiStatus -import java.awt.* -import java.util.* import javax.swing.* import javax.swing.plaf.basic.BasicLookAndFeel @@ -26,16 +21,6 @@ open class DarculaLaf : BasicLookAndFeel() { companion object { const val NAME: @NlsSafe String = "Darcula" - - @Suppress("unused") - @JvmStatic - @Deprecated("Use LookAndFeelThemeAdapter.isAltPressed", level = DeprecationLevel.ERROR, - replaceWith = ReplaceWith("LookAndFeelThemeAdapter.isAltPressed", "com.intellij.ide.ui.laf.LookAndFeelThemeAdapter")) - @get:ApiStatus.ScheduledForRemoval - @get:Deprecated("Use LookAndFeelThemeAdapter.isAltPressed", level = DeprecationLevel.ERROR, - replaceWith = ReplaceWith("LookAndFeelThemeAdapter.isAltPressed", "com.intellij.ide.ui.laf.LookAndFeelThemeAdapter")) - val isAltPressed: Boolean - get() = LookAndFeelThemeAdapter.isAltPressed } override fun getDefaults(): UIDefaults { diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java index b2ad425f70d8..82d47f085341 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java @@ -45,11 +45,6 @@ public class DarculaButtonUI extends BasicButtonUI { protected final Rectangle iconRect = new Rectangle(); protected static JBValue HELP_BUTTON_DIAMETER = new JBValue.Float(22); - /** - * @deprecated Use {@link JBUI.CurrentTheme.Button#minimumSize()} - */ - @Deprecated(forRemoval = true) - protected static JBValue MINIMUM_BUTTON_WIDTH = new JBValue.Float(72); protected static JBValue HORIZONTAL_PADDING = new JBValue.Float(14); public static final Key DEFAULT_STYLE_KEY = Key.create("JButton.styleDefault"); diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java index 35cf0ccb66a8..db23c43a6b51 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java @@ -245,13 +245,6 @@ public final class ApplicationImpl extends ClientAwareComponentManager implement return getThreadingSupport().isWriteIntentLocked(); } - @Deprecated - @Override - public @NotNull ModalityInvokator getInvokator() { - PluginException.reportDeprecatedUsage("Application.getInvokator", "Use `invokeLater` instead"); - return myInvokator; - } - @Override public void invokeLater(@NotNull Runnable runnable) { invokeLater(runnable, getDisposed()); diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoServiceDelegate.kt b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoServiceDelegate.kt index 03fe075087f6..b37a1c9e5cd0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoServiceDelegate.kt +++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoServiceDelegate.kt @@ -65,6 +65,5 @@ private class ApplicationInfoServiceDelegate : ApplicationInfoEx() { override fun getDefaultDarkLaf(): String? = delegate.defaultDarkLaf override fun getDefaultClassicDarkLaf(): String? = delegate.defaultClassicDarkLaf override fun isEAP(): Boolean = delegate.isEAP - override fun getBuildNumber(): String? = delegate.buildNumber override fun getSplashImageUrl(): String? = delegate.splashImageUrl } \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/toolbar/floating/AbstractFloatingToolbarComponent.kt b/platform/platform-impl/src/com/intellij/openapi/editor/toolbar/floating/AbstractFloatingToolbarComponent.kt index f2b59312fa9e..b863245ba5d2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/toolbar/floating/AbstractFloatingToolbarComponent.kt +++ b/platform/platform-impl/src/com/intellij/openapi/editor/toolbar/floating/AbstractFloatingToolbarComponent.kt @@ -25,14 +25,6 @@ abstract class AbstractFloatingToolbarComponent : ActionToolbarImpl, FloatingToo private val transparentComponent = ToolbarTransparentComponent() private val componentAnimator = TransparentComponentAnimator(transparentComponent, parentDisposable) - @ApiStatus.ScheduledForRemoval - @Deprecated("Use constructor with parentDisposable") - constructor( - actionGroup: ActionGroup - ) : super(ActionPlaces.CONTEXT_TOOLBAR, actionGroup, true) { - this._parentDisposable = null - } - constructor( actionGroup: ActionGroup, parentDisposable: Disposable diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/FileSystemTreeFactory.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/FileSystemTreeFactory.java deleted file mode 100644 index 1996ab391d13..000000000000 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/FileSystemTreeFactory.java +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.openapi.fileChooser; - -import com.intellij.openapi.actionSystem.DefaultActionGroup; -import com.intellij.openapi.fileChooser.ex.FileSystemTreeFactoryImpl; -import com.intellij.openapi.project.Project; - -/** @deprecated obsolete */ -@Deprecated(forRemoval = true) -@SuppressWarnings("unused") -public interface FileSystemTreeFactory { - FileSystemTree createFileSystemTree(Project project, FileChooserDescriptor fileChooserDescriptor); - - DefaultActionGroup createDefaultFileSystemActions(FileSystemTree fileSystemTree); - - final class SERVICE { - private SERVICE() { } - - public static FileSystemTreeFactory getInstance() { - return new FileSystemTreeFactoryImpl(); - } - } -} diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeFactoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeFactoryImpl.java deleted file mode 100644 index 0e5f9b5f4b84..000000000000 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeFactoryImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.openapi.fileChooser.ex; - -import com.intellij.openapi.actionSystem.ActionManager; -import com.intellij.openapi.actionSystem.DefaultActionGroup; -import com.intellij.openapi.fileChooser.FileChooserDescriptor; -import com.intellij.openapi.fileChooser.FileSystemTree; -import com.intellij.openapi.fileChooser.FileSystemTreeFactory; -import com.intellij.openapi.project.Project; -import org.jetbrains.annotations.ApiStatus; - -/** @deprecated obsolete */ -@ApiStatus.Internal -@Deprecated(forRemoval = true) -public class FileSystemTreeFactoryImpl implements FileSystemTreeFactory { - @Override - public FileSystemTree createFileSystemTree(Project project, FileChooserDescriptor fileChooserDescriptor) { - return new FileSystemTreeImpl(project, fileChooserDescriptor); - } - - @Override - public DefaultActionGroup createDefaultFileSystemActions(FileSystemTree fileSystemTree) { - return (DefaultActionGroup)ActionManager.getInstance().getAction("FileChooserToolbar"); - } -} diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java index d76206cc7826..86343f1342d4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java @@ -195,12 +195,6 @@ public final class FSRecords { //========== file record fields accessors: ================================ - /** @deprecated replace with apt FSRecords.getInstance() instance method */ - @Deprecated(forRemoval = true) - public static int getParent(int fileId) { - return implOrFail().getParent(fileId); - } - /** @deprecated replace with apt FSRecords.getInstance() instance method */ @Deprecated(forRemoval = true) public static boolean isDeleted(int fileId) { diff --git a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java index 5d0cb1a87b7d..9d1d1ab00223 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java @@ -1,7 +1,6 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ui.popup; -import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.WriteIntentReadAction; import com.intellij.openapi.diagnostic.Logger; @@ -62,14 +61,6 @@ public abstract class WizardPopup extends AbstractPopup implements ActionListene private boolean myKeyPressedReceived; - /** - * @deprecated use {@link #WizardPopup(Project, JBPopup, PopupStep)} - */ - @Deprecated(forRemoval = true) - public WizardPopup(@NotNull PopupStep aStep) { - this(CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()), null, aStep); - } - public WizardPopup(@Nullable Project project, @Nullable JBPopup aParent, @NotNull PopupStep aStep) { myParent = (WizardPopup) aParent; myStep = aStep; diff --git a/platform/refactoring/api-dump.txt b/platform/refactoring/api-dump.txt index e69a844b4301..93221aa52d41 100644 --- a/platform/refactoring/api-dump.txt +++ b/platform/refactoring/api-dump.txt @@ -6,7 +6,6 @@ a:com.intellij.codeInsight.highlighting.HighlightManager - a:addOccurrenceHighlight(com.intellij.openapi.editor.Editor,I,I,com.intellij.openapi.editor.colors.TextAttributesKey,I,java.util.Collection):V - a:addOccurrenceHighlight(com.intellij.openapi.editor.Editor,I,I,com.intellij.openapi.editor.markup.TextAttributes,I,java.util.Collection,java.awt.Color):V - a:addOccurrenceHighlights(com.intellij.openapi.editor.Editor,com.intellij.psi.PsiElement[],com.intellij.openapi.editor.colors.TextAttributesKey,Z,java.util.Collection):V -- a:addOccurrenceHighlights(com.intellij.openapi.editor.Editor,com.intellij.psi.PsiElement[],com.intellij.openapi.editor.markup.TextAttributes,Z,java.util.Collection):V - a:addOccurrenceHighlights(com.intellij.openapi.editor.Editor,com.intellij.psi.PsiReference[],com.intellij.openapi.editor.colors.TextAttributesKey,Z,java.util.Collection):V - a:addRangeHighlight(com.intellij.openapi.editor.Editor,I,I,com.intellij.openapi.editor.colors.TextAttributesKey,Z,java.util.Collection):V - a:addRangeHighlight(com.intellij.openapi.editor.Editor,I,I,com.intellij.openapi.editor.colors.TextAttributesKey,Z,Z,java.util.Collection):V diff --git a/platform/refactoring/src/com/intellij/codeInsight/highlighting/HighlightManager.java b/platform/refactoring/src/com/intellij/codeInsight/highlighting/HighlightManager.java index d819e9666fa6..dcbe104117c5 100644 --- a/platform/refactoring/src/com/intellij/codeInsight/highlighting/HighlightManager.java +++ b/platform/refactoring/src/com/intellij/codeInsight/highlighting/HighlightManager.java @@ -164,16 +164,6 @@ public abstract class HighlightManager { boolean hideByAnyKey, @Nullable Collection highlighters); - /** - * @deprecated Use the overload with TextAttributesKey - */ - @Deprecated(forRemoval = true) - public abstract void addOccurrenceHighlights(@NotNull Editor editor, - PsiElement @NotNull [] elements, - @NotNull TextAttributes attributes, - boolean hideByTextChange, - @Nullable Collection outHighlighters); - /** * @deprecated Use the overload with TextAttributesKey */ diff --git a/platform/testFramework/core/src/com/intellij/ClassFinder.java b/platform/testFramework/core/src/com/intellij/ClassFinder.java index cd3195e0ce6d..699cae86e683 100644 --- a/platform/testFramework/core/src/com/intellij/ClassFinder.java +++ b/platform/testFramework/core/src/com/intellij/ClassFinder.java @@ -9,7 +9,6 @@ import kotlin.text.StringsKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.io.File; import java.io.IOException; import java.nio.file.FileSystem; import java.nio.file.FileSystems; @@ -36,14 +35,6 @@ public class ClassFinder { } } - /** - * @deprecated Use {@linkplain ClassFinder#ClassFinder(Path, String, boolean)} instead. - */ - @Deprecated(forRemoval = true) - public ClassFinder(final File classPathRoot, final String rootPackage, boolean includeUnconventionallyNamedTests) { - this(classPathRoot.toPath(), rootPackage, includeUnconventionallyNamedTests); - } - @Nullable private String computeClassName(final @NotNull Path path, final @NotNull Path root) { Path absPath = path.toAbsolutePath(); diff --git a/platform/testRunner/api-dump.txt b/platform/testRunner/api-dump.txt index aaec7524449f..2e89d93064ee 100644 --- a/platform/testRunner/api-dump.txt +++ b/platform/testRunner/api-dump.txt @@ -274,7 +274,6 @@ c:com.intellij.execution.testframework.ToolbarPanel - hasPreviousOccurence():Z - setModel(com.intellij.execution.testframework.TestFrameworkRunningModel):V f:com.intellij.execution.testframework.TrackRunningTestUtil -- s:installStopListeners(javax.swing.JTree,com.intellij.openapi.Disposable,com.intellij.openapi.util.Pass):V - s:installStopListeners(javax.swing.JTree,com.intellij.openapi.Disposable,java.util.function.Consumer):V a:com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction - com.intellij.openapi.actionSystem.AnAction diff --git a/platform/testRunner/src/com/intellij/execution/testframework/TrackRunningTestUtil.java b/platform/testRunner/src/com/intellij/execution/testframework/TrackRunningTestUtil.java index 682c02ea577f..402b32efa765 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/TrackRunningTestUtil.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/TrackRunningTestUtil.java @@ -4,7 +4,6 @@ package com.intellij.execution.testframework; import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.Pass; import com.intellij.ui.ClickListener; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -20,12 +19,6 @@ import java.util.function.Consumer; public final class TrackRunningTestUtil { private TrackRunningTestUtil() { } - /** @deprecated use {@link #installStopListeners(JTree, Disposable, Consumer)} */ - @Deprecated(forRemoval = true) - public static void installStopListeners(JTree tree, Disposable parentDisposable, Pass setSelection) { - installStopListeners(tree, parentDisposable, (Consumer)setSelection); - } - public static void installStopListeners(JTree tree, Disposable parentDisposable, Consumer setSelection) { final ClickListener userSelectionListener = new ClickListener() { @Override diff --git a/platform/util/api-dump-unreviewed.txt b/platform/util/api-dump-unreviewed.txt index c658cebd360b..18e00e6257ba 100644 --- a/platform/util/api-dump-unreviewed.txt +++ b/platform/util/api-dump-unreviewed.txt @@ -985,7 +985,6 @@ f:com.intellij.openapi.util.SystemInfo - sf:isMacOSCatalina:Z - sf:isMacOSLeopard:Z - sf:isMacOSMonterey:Z -- sf:isMacOSMountainLion:Z - sf:isMacOSSonoma:Z - sf:isMacOSVentura:Z - sf:isMacSystemMenu:Z diff --git a/platform/util/base/api-dump.txt b/platform/util/base/api-dump.txt index 684741d7ee3a..15babe6e1a70 100644 --- a/platform/util/base/api-dump.txt +++ b/platform/util/base/api-dump.txt @@ -376,7 +376,6 @@ f:com.intellij.util.SystemProperties - s:getFloatProperty(java.lang.String,F):F - s:getIntProperty(java.lang.String,I):I - s:getJavaHome():java.lang.String -- s:getLineSeparator():java.lang.String - s:getLongProperty(java.lang.String,J):J - s:getUserHome():java.lang.String - s:getUserName():java.lang.String diff --git a/platform/util/base/src/com/intellij/util/SystemProperties.java b/platform/util/base/src/com/intellij/util/SystemProperties.java index dcaf2959b043..8a8a3c9809c4 100644 --- a/platform/util/base/src/com/intellij/util/SystemProperties.java +++ b/platform/util/base/src/com/intellij/util/SystemProperties.java @@ -1,7 +1,6 @@ // 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.util; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -75,14 +74,4 @@ public final class SystemProperties { public static @Nullable String setProperty(@NotNull String key, @Nullable String value) { return value != null ? System.setProperty(key, value) : System.clearProperty(key); } - - // - /** @deprecated please use {@link System#lineSeparator()} instead */ - @Deprecated - @ApiStatus.ScheduledForRemoval - public static String getLineSeparator() { - return System.lineSeparator(); - } - - // } diff --git a/platform/util/src/com/intellij/openapi/util/SystemInfo.java b/platform/util/src/com/intellij/openapi/util/SystemInfo.java index b6fab144f604..250f0a8ef147 100644 --- a/platform/util/src/com/intellij/openapi/util/SystemInfo.java +++ b/platform/util/src/com/intellij/openapi/util/SystemInfo.java @@ -208,9 +208,5 @@ public final class SystemInfo { @ApiStatus.ScheduledForRemoval public static final boolean isMacOSLeopard = isMac; - /** @deprecated always true (Java 8 requires macOS 10.9+) */ - @Deprecated - @ApiStatus.ScheduledForRemoval - public static final boolean isMacOSMountainLion = isMac; // } diff --git a/platform/util/ui/api-dump.txt b/platform/util/ui/api-dump.txt index b520ca3dc491..17be4d9239d6 100644 --- a/platform/util/ui/api-dump.txt +++ b/platform/util/ui/api-dump.txt @@ -2509,7 +2509,6 @@ c:com.intellij.ui.JBColor - hashCode():I - s:isBright():Z - s:lazy(java.util.function.Supplier):com.intellij.ui.JBColor -- s:link():java.awt.Color - s:marker(java.lang.String):java.awt.Color - s:namedColor(java.lang.String):com.intellij.ui.JBColor - s:namedColor(java.lang.String,I):com.intellij.ui.JBColor diff --git a/platform/util/ui/src/com/intellij/ui/JBColor.java b/platform/util/ui/src/com/intellij/ui/JBColor.java index 35df012da235..41ae0310e718 100644 --- a/platform/util/ui/src/com/intellij/ui/JBColor.java +++ b/platform/util/ui/src/com/intellij/ui/JBColor.java @@ -178,14 +178,6 @@ public class JBColor extends Color { private static final Color CACHED_NULL = marker("CACHED_NULL"); - /** - * @deprecated use {@link CurrentTheme.Link.Foreground#ENABLED} - */ - @Deprecated(forRemoval = true) - public static @NotNull Color link() { - return CurrentTheme.Link.Foreground.ENABLED; - } - public static void setDark(boolean dark) { DARK.setValue(dark); }