MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

idea: reuse PlatformLangActionManager.xml instead of copying its content

Browse Source 
Groups which include analysis actions into Code, Tools and popup menus are now overriden with empty groups in JavaActions.xml so these actions will be shown in a separate Analyze menu as before if Java support is enabled.

This is a preliminary step to reuse PlatformLangPlugin.xml in IntelliJ IDEA as well to make all IDEs consistent and avoid duplication. This is also needed to properly extract Java support to a separate plugin (IDEA-195719).
This commit is contained in:
nik
2019-03-20 14:31:56 +03:00
parent f9c75e076d
commit 4b3b6dad5e
3 changed files with 9 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/idea/PlatformLangActionManager.xml
+4 -3
View File
@@ -40,7 +40,7 @@
<add-to-group group-id="ToolsMenu" anchor="last"/>
</group>
<group id="InspectCodeGroup">
<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"/>
<action id="SilentCodeCleanup" class="com.intellij.codeInspection.actions.SilentCodeCleanupAction" />
@@ -60,10 +60,11 @@
<add-to-group group-id="CodeMenu" anchor="last"/>
</group>
<reference ref="InspectCode">
<group id="InspectCodeActionInPopupMenus">
<reference ref="InspectCode"/>
<add-to-group group-id="ProjectViewPopupMenu" anchor="after" relative-to-action="ReplaceInPath"/>
<add-to-group group-id="FavoritesViewPopupMenu" anchor="after" relative-to-action="ReplaceInPath"/>
</reference>
</group>
</actions>
</idea-plugin>
resources/src/META-INF/JavaIdePlugin.xml
+1 -40
View File
@@ -101,34 +101,7 @@
<checkoutCompletedListener implementation="com.intellij.openapi.vcs.checkout.PlatformProjectCheckoutListener" id="PlatformProjectCheckoutListener"/>
</extensions>
<actions>
<group id="LookupActions">
<!-- these must be declared before standard EnterAction and TabAction -->
<action id="EditorChooseLookupItem" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$FocusedOnly"/>
<action id="EditorChooseLookupItemReplace" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$Replacing"/>
<action id="EditorChooseLookupItemCompleteStatement"
class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$CompletingStatement"
use-shortcut-of="EditorCompleteStatement"/>
<action id="EditorChooseLookupItemDot" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$ChooseWithDot"/>
<action id="ExpandLiveTemplateByTab" class="com.intellij.codeInsight.template.impl.editorActions.ExpandLiveTemplateByTabAction"/>
<action id="ExpandLiveTemplateCustom" class="com.intellij.codeInsight.template.impl.editorActions.ExpandLiveTemplateCustomAction"/>
<action id="NextTemplateVariable" class="com.intellij.codeInsight.template.impl.actions.NextVariableAction"/>
<action id="PreviousTemplateVariable" class="com.intellij.codeInsight.template.impl.actions.PreviousVariableAction"/>
<action id="NextParameter" class="com.intellij.codeInsight.hint.actions.NextParameterAction"/>
<action id="PrevParameter" class="com.intellij.codeInsight.hint.actions.PrevParameterAction"/>
</group>
<action id="EditorIndentSelection" class="com.intellij.openapi.editor.actions.LangIndentSelectionAction"/>
<action id="EditorLookupUp" class="com.intellij.codeInsight.lookup.impl.LookupActionHandler$UpAction"/>
<action id="EditorLookupDown" class="com.intellij.codeInsight.lookup.impl.LookupActionHandler$DownAction"/>
</actions>
<xi:include href="/idea/PlatformActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/idea/VcsActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/idea/LangActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/idea/PlatformLangActionManager.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/idea/ExternalSystemActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/META-INF/xdebugger.xml" xpointer="xpointer(/idea-plugin/*)"/>
@@ -167,18 +140,6 @@
<xi:include href="/META-INF/built-in-server.xml" xpointer="xpointer(/idea-plugin/*)"/>
<actions>
<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"/>
<action id="SilentCodeCleanup" class="com.intellij.codeInspection.actions.SilentCodeCleanupAction"/>
<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"/>
</group>
<action id="Unscramble" class="com.intellij.unscramble.AnalyzeStacktraceAction"/>
</actions>
<xi:include href="/idea/JavaActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/META-INF/JavaAnalysisPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
resources/src/idea/JavaActions.xml
+4
View File
@@ -42,6 +42,10 @@
</reference>
<!-- Analyze -->
<group overrides="true" class="com.intellij.openapi.actionSystem.EmptyActionGroup" id="AnalyzePlatformMenu"/>
<group overrides="true" class="com.intellij.openapi.actionSystem.EmptyActionGroup" id="InspectCodeInCodeMenuGroup"/>
<group overrides="true" class="com.intellij.openapi.actionSystem.EmptyActionGroup" id="InspectCodeActionInPopupMenus"/>
<group id="AnalyzeActions">
</group>