From 7a81237ef45f2e364a82e24b9c266267f4c488fd Mon Sep 17 00:00:00 2001 From: Maksim Zuev Date: Tue, 9 Sep 2025 12:17:25 +0200 Subject: [PATCH] [rd debugger] Drop frontend action groups to keep the compatibility with plugins GitOrigin-RevId: 7431aa9f6a508f1212959a44995bffa22fe90ed2 --- .../impl/resources/META-INF/java-debugger.xml | 10 --- .../intellij.java.debugger.impl.shared.xml | 9 -- .../src/idea/XDebuggerActions.xml | 83 ++++--------------- .../impl/actions/XDebuggerActions.java | 2 - .../evaluate/XDebuggerEvaluationDialog.java | 4 +- .../evaluate/quick/XDebuggerTreeCreator.java | 5 +- .../impl/frame/XVariablesViewBase.java | 7 +- .../resources/intellij.devkit.debugger.xml | 1 - 8 files changed, 19 insertions(+), 102 deletions(-) diff --git a/java/debugger/impl/resources/META-INF/java-debugger.xml b/java/debugger/impl/resources/META-INF/java-debugger.xml index f032a3be105a..9ccfd53e3973 100644 --- a/java/debugger/impl/resources/META-INF/java-debugger.xml +++ b/java/debugger/impl/resources/META-INF/java-debugger.xml @@ -221,32 +221,27 @@ - - - - - @@ -256,11 +251,9 @@ - - @@ -271,21 +264,18 @@ - - - diff --git a/java/debugger/shared/resources/intellij.java.debugger.impl.shared.xml b/java/debugger/shared/resources/intellij.java.debugger.impl.shared.xml index adc577189e7f..87e7fa5386e7 100644 --- a/java/debugger/shared/resources/intellij.java.debugger.impl.shared.xml +++ b/java/debugger/shared/resources/intellij.java.debugger.impl.shared.xml @@ -42,24 +42,19 @@ id="MemoryView.ShowInstancesFromDebuggerTree"> - - - - @@ -68,17 +63,13 @@ - - - diff --git a/platform/platform-resources/src/idea/XDebuggerActions.xml b/platform/platform-resources/src/idea/XDebuggerActions.xml index 478c080c29db..d546b6c4321d 100644 --- a/platform/platform-resources/src/idea/XDebuggerActions.xml +++ b/platform/platform-resources/src/idea/XDebuggerActions.xml @@ -6,84 +6,36 @@ - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - + + + + + + - - - - - + use-shortcut-of="EditSource"/> + - - - - - - + + - - + use-shortcut-of="$Delete"/> - - - + - - - + @@ -95,10 +47,7 @@ - - - + diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/XDebuggerActions.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/XDebuggerActions.java index e21a132ab22b..de6b0dcf16e4 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/XDebuggerActions.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/XDebuggerActions.java @@ -32,12 +32,10 @@ public interface XDebuggerActions { @NonNls String TOOL_WINDOW_TOP_TOOLBAR_3_EXTRA_GROUP = "XDebugger.ToolWindow.TopToolbar3.Extra"; @NonNls String TOOL_WINDOW_LEFT_TOOLBAR_GROUP = "XDebugger.ToolWindow.LeftToolbar"; @NonNls String EVALUATE_DIALOG_TREE_POPUP_GROUP = "XDebugger.Evaluation.Dialog.Tree.Popup"; - @NonNls String INSPECT_TREE_POPUP_GROUP_FRONTEND = "XDebugger.Inspect.Tree.Popup.Frontend"; @NonNls String INSPECT_TREE_POPUP_GROUP = "XDebugger.Inspect.Tree.Popup"; @NonNls String VARIABLES_TREE_TOOLBAR_GROUP = "XDebugger.Variables.Tree.Toolbar"; @NonNls String VARIABLES_TREE_POPUP_GROUP = "XDebugger.Variables.Tree.Popup"; @NonNls String WATCHES_TREE_POPUP_GROUP = "XDebugger.Watches.Tree.Popup"; - @NonNls String WATCHES_TREE_POPUP_GROUP_FRONTEND = "XDebugger.Inspect.Tree.Popup.Watches.Frontend"; @NonNls String WATCHES_INLINE_POPUP_GROUP = "XDebugger.Watches.Inline.Popup"; @NonNls String WATCHES_TREE_TOOLBAR_GROUP = "XDebugger.Watches.Tree.Toolbar"; @NonNls String FRAMES_TREE_POPUP_GROUP = "XDebugger.Frames.Tree.Popup"; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java index e836da4bc636..9d76ead25a26 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java @@ -107,9 +107,7 @@ public class XDebuggerEvaluationDialog extends DialogWrapper { setOKButtonText(XDebuggerBundle.message("xdebugger.button.evaluate")); setCancelButtonText(XDebuggerBundle.message("xdebugger.evaluate.dialog.close")); - String actionGroupId = areFrontendDebuggerActionsEnabled() - ? XDebuggerActions.INSPECT_TREE_POPUP_GROUP_FRONTEND - : XDebuggerActions.EVALUATE_DIALOG_TREE_POPUP_GROUP; + String actionGroupId = XDebuggerActions.EVALUATE_DIALOG_TREE_POPUP_GROUP; myTreePanel = new XDebuggerTreePanel(project, editorsProvider, myDisposable, sourcePosition, actionGroupId, session == null ? null : session.getValueMarkers()); myResultPanel = JBUI.Panels.simplePanel() diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XDebuggerTreeCreator.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XDebuggerTreeCreator.java index d0e47d38ded1..0eff1dfb9851 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XDebuggerTreeCreator.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XDebuggerTreeCreator.java @@ -33,10 +33,7 @@ public class XDebuggerTreeCreator implements DebuggerTreeCreator descriptor) { - String treePopupGroup = areFrontendDebuggerActionsEnabled() - ? XDebuggerActions.INSPECT_TREE_POPUP_GROUP_FRONTEND - : XDebuggerActions.INSPECT_TREE_POPUP_GROUP; - + String treePopupGroup = XDebuggerActions.INSPECT_TREE_POPUP_GROUP; final XDebuggerTree tree = new XDebuggerTree(myProject, myProvider, myPosition, treePopupGroup, myMarkers); final XValueNodeImpl root = new XValueNodeImpl(tree, null, descriptor.getSecond(), descriptor.getFirst()); tree.setRoot(root, true); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java index 786c84123892..4f413758bc5e 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java @@ -57,14 +57,9 @@ public abstract class XVariablesViewBase extends XDebugView { protected XVariablesViewBase(@NotNull Project project, @NotNull XDebuggerEditorsProvider editorsProvider, @Nullable XValueMarkers markers) { - boolean isWatchesView = this instanceof XWatchesView; - String frontendGroupId = isWatchesView - ? XDebuggerActions.WATCHES_TREE_POPUP_GROUP_FRONTEND - : XDebuggerActions.INSPECT_TREE_POPUP_GROUP_FRONTEND; - String monolithGroupId = isWatchesView + String actionGroupId = this instanceof XWatchesView ? XDebuggerActions.WATCHES_TREE_POPUP_GROUP : XDebuggerActions.VARIABLES_TREE_POPUP_GROUP; - String actionGroupId = areFrontendDebuggerActionsEnabled() ? frontendGroupId : monolithGroupId; myTreePanel = new XDebuggerTreePanel(project, editorsProvider, this, null, actionGroupId, markers); getTree().getEmptyText().setText(XDebuggerBundle.message("debugger.variables.not.available")); getTree().addTreeListener(new XDebuggerTreeListener() { diff --git a/plugins/devkit/intellij.devkit.debugger/resources/intellij.devkit.debugger.xml b/plugins/devkit/intellij.devkit.debugger/resources/intellij.devkit.debugger.xml index 5ba0b3d94a8d..7239f08e3b20 100644 --- a/plugins/devkit/intellij.devkit.debugger/resources/intellij.devkit.debugger.xml +++ b/plugins/devkit/intellij.devkit.debugger/resources/intellij.devkit.debugger.xml @@ -21,7 +21,6 @@ icon="AllIcons.General.Remove" use-shortcut-of="$Delete"> -