summaryrefslogtreecommitdiff
path: root/resources/src/idea
diff options
context:
space:
mode:
Diffstat (limited to 'resources/src/idea')
-rw-r--r--resources/src/idea/JavaActions.xml39
-rw-r--r--resources/src/idea/RichPlatformActions.xml1
-rw-r--r--resources/src/idea/RichPlatformPlugin.xml5
3 files changed, 33 insertions, 12 deletions
diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml
index d22afe07318a..d90a1dee1849 100644
--- a/resources/src/idea/JavaActions.xml
+++ b/resources/src/idea/JavaActions.xml
@@ -102,9 +102,17 @@
<action id="Debugger.PopFrame" class="com.intellij.debugger.actions.PopFrameAction" icon="AllIcons.Actions.PopFrame">
<add-to-group group-id="DebugMainMenu" anchor="after" relative-to-action="ForceRunToCursor"/>
+ <add-to-group group-id="XDebugger.Frames.Tree.Popup" anchor="first"/>
+ <add-to-group group-id="XDebugger.ToolWindow.TopToolbar" anchor="before" relative-to-action="RunToCursor"/>
</action>
- <action id="Debugger.AddSteppingFilter" class="com.intellij.debugger.actions.AddSteppingFilterAction" text="Add Stepping Filter..."/>
+ <action id="Debugger.ShowLibraryFrames" class="com.intellij.debugger.actions.ShowLibraryFramesAction">
+ <add-to-group group-id="XDebugger.Frames.TopToolbar"/>
+ </action>
+
+ <action id="Debugger.AddSteppingFilter" class="com.intellij.debugger.actions.AddSteppingFilterAction" text="Add Stepping Filter...">
+ <add-to-group group-id="XDebugger.Frames.Tree.Popup"/>
+ </action>
<group id="ToggleBreakpointAction">
<action id="ToggleMethodBreakpoint" class="com.intellij.debugger.actions.ToggleMethodBreakpointAction"/>
@@ -115,6 +123,7 @@
<action id="ExportThreads" class="com.intellij.debugger.actions.ExportThreadsAction" icon="AllIcons.Actions.Export">
<add-to-group group-id="RunMenu" anchor="last"/>
+ <add-to-group group-id="XDebugger.Frames.Tree.Popup"/>
</action>
<action id="DumpThreads" class="com.intellij.debugger.actions.ThreadDumpAction" text="Get thread dump" icon="AllIcons.Actions.Dump">
<add-to-group group-id="RunMenu" anchor="last"/>
@@ -146,11 +155,19 @@
<group id="JavaDebuggerActions">
<action id="Debugger.AdjustArrayRange" class="com.intellij.debugger.actions.AdjustArrayRangeAction"/>
<action id="Debugger.Inspect" class="com.intellij.debugger.actions.InspectAction"/>
- <action id="Debugger.ViewText" class="com.intellij.debugger.actions.ViewTextAction"/>
+ <action id="Debugger.CustomizeContextView" class="com.intellij.debugger.actions.CustomizeContextViewAction">
+ <add-to-group group-id="XDebugger.Variables.Tree.Popup" anchor="last"/>
+ <add-to-group group-id="XDebugger.Watches.Tree.Popup" anchor="last"/>
+ </action>
+ <action id="Debugger.ViewText" class="com.intellij.debugger.actions.ViewTextAction">
+ <add-to-group group-id="XDebugger.Variables.Tree.Popup" anchor="before" relative-to-action="Debugger.ViewAsGroup"/>
+ <add-to-group group-id="XDebugger.Watches.Tree.Popup" anchor="before" relative-to-action="Debugger.CustomizeContextView"/>
+ </action>
<action id="Debugger.CopyValue" class="com.intellij.debugger.actions.CopyValueAction"/>
<action id="Debugger.CompareValueWithClipboard" class="com.intellij.debugger.actions.CompareValueWithClipboardAction"/>
- <action id="Debugger.CustomizeContextView" class="com.intellij.debugger.actions.CustomizeContextViewAction"/>
- <action id="Debugger.CustomizeThreadsView" class="com.intellij.debugger.actions.CustomizeThreadsViewAction"/>
+ <action id="Debugger.CustomizeThreadsView" class="com.intellij.debugger.actions.CustomizeThreadsViewAction">
+ <add-to-group group-id="XDebugger.Frames.Tree.Popup" anchor="last"/>
+ </action>
<action id="Debugger.NewWatch" class="com.intellij.debugger.actions.NewWatchAction" icon="AllIcons.Debugger.NewWatch"/>
<action id="Debugger.EditWatch" class="com.intellij.debugger.actions.EditWatchAction"/>
<action id="Debugger.EditFrameSource" class="com.intellij.debugger.actions.EditFrameSourceAction"/>
@@ -159,8 +176,10 @@
<reference ref="Debugger.PopFrame"/>
<action id="Debugger.RemoveAllWatches" class="com.intellij.debugger.actions.RemoveAllWatchesAction"/>
<action id="Debugger.RemoveWatch" class="com.intellij.debugger.actions.RemoveWatchAction" icon="AllIcons.Actions.Delete"/>
- <action id="Debugger.ViewAsGroup" class="com.intellij.debugger.actions.ViewAsGroup"/>
- <action id="Debugger.SetValue" class="com.intellij.debugger.actions.SetValueAction"/>
+ <action id="Debugger.ViewAsGroup" class="com.intellij.debugger.actions.ViewAsGroup">
+ <add-to-group group-id="XDebugger.Variables.Tree.Popup" anchor="before" relative-to-action="Debugger.CustomizeContextView"/>
+ </action>
+ <!--<action id="Debugger.SetValue" class="com.intellij.debugger.actions.SetValueAction"/>-->
<!--<action id="Debugger.ShowAsHex" class="com.intellij.debugger.actions.ShowAsHexAction" text="Show as Hex"/>-->
<action id="Debugger.ShowFrame" class="com.intellij.debugger.actions.ShowFrameAction"/>
<action id="Debugger.ResumeThread" class="com.intellij.debugger.actions.ResumeThreadAction"/>
@@ -218,7 +237,7 @@
<reference ref="Debugger.AdjustArrayRange"/>
<reference ref="Debugger.Inspect"/>
<reference ref="Debugger.MarkObject"/>
- <reference ref="Debugger.SetValue"/>
+ <!--<reference ref="Debugger.SetValue"/>-->
<reference ref="Debugger.EditNodeSource"/>
<reference ref="Debugger.EditTypeSource"/>
<separator/>
@@ -238,7 +257,7 @@
<reference ref="Debugger.AdjustArrayRange"/>
<reference ref="Debugger.Inspect"/>
<reference ref="Debugger.MarkObject"/>
- <reference ref="Debugger.SetValue"/>
+ <!--<reference ref="Debugger.SetValue"/>-->
<reference ref="Debugger.EditNodeSource"/>
<reference ref="Debugger.EditTypeSource"/>
<separator/>
@@ -259,7 +278,7 @@
<reference ref="Debugger.AdjustArrayRange"/>
<reference ref="Debugger.Inspect"/>
<reference ref="Debugger.MarkObject"/>
- <reference ref="Debugger.SetValue"/>
+ <!--<reference ref="Debugger.SetValue"/>-->
<reference ref="Debugger.EditNodeSource"/>
<reference ref="Debugger.EditTypeSource"/>
<separator/>
@@ -301,7 +320,7 @@
<reference ref="Debugger.AdjustArrayRange"/>
<reference ref="Debugger.Inspect"/>
<reference ref="Debugger.MarkObject"/>
- <reference ref="Debugger.SetValue"/>
+ <!--<reference ref="Debugger.SetValue"/>-->
<reference ref="Debugger.EditNodeSource"/>
<reference ref="Debugger.EditTypeSource"/>
<separator/>
diff --git a/resources/src/idea/RichPlatformActions.xml b/resources/src/idea/RichPlatformActions.xml
index a92ea7c16461..0822f3c29e6c 100644
--- a/resources/src/idea/RichPlatformActions.xml
+++ b/resources/src/idea/RichPlatformActions.xml
@@ -87,6 +87,7 @@
<group id="InspectCodeGroup" text="Inspect Code Actions">
<action id="InspectCode" class="com.intellij.codeInspection.actions.CodeInspectionAction"/>
+ <action id="CodeCleanup" class="com.intellij.codeInspection.actions.CodeCleanupAction" internal="true"/>
<action id="RunInspection" class="com.intellij.codeInspection.actions.RunInspectionAction"/>
<action id="PopupHector" class="com.intellij.codeInsight.daemon.impl.PopupHectorAction"/>
<action id="ViewOfflineInspection" class="com.intellij.codeInspection.actions.ViewOfflineResultsAction"/>
diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml
index d7dc396eac86..7b38db51ac53 100644
--- a/resources/src/idea/RichPlatformPlugin.xml
+++ b/resources/src/idea/RichPlatformPlugin.xml
@@ -206,8 +206,6 @@
<projectService serviceInterface="com.intellij.compiler.CompilerWorkspaceConfiguration"
serviceImplementation="com.intellij.compiler.CompilerWorkspaceConfiguration"/>
- <projectService serviceInterface="com.intellij.openapi.vcs.changes.patch.PatchBaseDirectoryDetector"
- serviceImplementation="com.intellij.openapi.vcs.changes.patch.PsiPatchBaseDirectoryDetector"/>
<projectService serviceInterface="com.intellij.openapi.vcs.changes.ui.ChangesGroupingPolicyFactory"
serviceImplementation="com.intellij.openapi.vcs.changes.ui.ChangesModuleGroupingPolicyFactory"/>
<projectService serviceInterface="com.intellij.openapi.vcs.impl.DefaultVcsRootPolicy"
@@ -402,6 +400,9 @@
<xi:include href="/META-INF/vcs-log.xml" xpointer="xpointer(/idea-plugin/*)">
<xi:fallback/>
</xi:include>
+ <xi:include href="/META-INF/vcs-log-graph.xml" xpointer="xpointer(/idea-plugin/*)">
+ <xi:fallback/>
+ </xi:include>
<xi:include href="/META-INF/DesignerCorePlugin.xml" xpointer="xpointer(/idea-plugin/*)">
<xi:fallback/>
</xi:include>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 04:05:17 +0000