Skip to content

Commit 424548b

Browse files
victor-matchenkovictor-matchenko
committed
platform 182.5107.16: synchronize xml files
Add internal action TextGrayFilterConfig Add SetShortcutAction action
1 parent 836e536 commit 424548b

File tree

3 files changed

+85
-66
lines changed

3 files changed

+85
-66
lines changed

‎workbench/mps-workbench/source/idea/MPSLangActions.xml‎

Lines changed: 82 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,9 @@
458458

459459
<group id="ToolbarRunGroup">
460460
<separator/>
461+
<!--
462+
<reference ref="RunAnything"/>
463+
-->
461464
<reference ref="RunConfiguration"/>
462465
<reference ref="RunnerActions"/>
463466
<reference ref="Stop"/>
@@ -558,8 +561,8 @@
558561
<separator/>
559562
<reference ref="VersionControlsGroup"/>
560563
<action id="SynchronizeCurrentFile" class="com.intellij.ide.actions.SynchronizeCurrentFileAction" icon="AllIcons.Actions.Refresh"/>
564+
<action id="ScopeView.EditScopes" class="com.intellij.ide.scopeView.EditScopesAction"/>
561565
<separator/>
562-
<action id="RevealIn" class="com.intellij.ide.actions.RevealFileAction"/>
563566
<reference ref="ShowFilePath"/>
564567
<action id="GoToLinkTarget" class="com.intellij.ide.actions.GoToLinkTargetAction"/>
565568
<separator/>
@@ -1185,33 +1188,97 @@
11851188

11861189
<!-- TODO: Enable actions and references after replacing all IDEA actions with MPS ones -->
11871190
<group id="TouchBar">
1191+
<group id="TouchBarDefault" text="Default">
1192+
<!--
1193+
<reference ref="RunConfiguration"/>
1194+
-->
1195+
<group id="RunnerActionsTouchbar" text="Touchbar Run/Debug Actions"/> <!--filled from ExecutorRegistry-->
1196+
<!--
1197+
<reference ref="Stop"/>
1198+
<separator text="type.small"/>
1199+
<separator text="type.large"/>
1200+
-->
1201+
<group id="TouchBarDefaultOptionalGroup" text="Optional Actions">
1202+
<!--
1203+
<reference ref="Vcs.UpdateProject"/>
1204+
<reference ref="CheckinProject"/>
1205+
-->
1206+
</group>
1207+
<group id="TouchBarDefault_alt" text="Default with Alt key">
1208+
<!--
1209+
<reference ref="SelectInProjectView"/>
1210+
<separator text="type.flexible"/>
1211+
<reference ref="RevealGroup"/>
1212+
-->
1213+
</group>
1214+
<group id="TouchBarDefault_cmd" text="Default with Cmd key">
1215+
<!--Use Cmd modifier key to show Navigation buttons, Bookmark and Breakpoint toggles and to Show Usages/-->
1216+
<!--Cmd key is used, because it’s used in most of the action shortcuts: Back/Forward, Breakpoint and Find Usages./-->
1217+
<!--
1218+
<reference ref="Back"/>
1219+
<reference ref="Forward"/>
1220+
<separator text="type.large"/>
1221+
<reference ref="ToggleBookmark"/>
1222+
<reference ref="ToggleLineBreakpoint"/>
1223+
<separator text="type.flexible"/>
1224+
<reference ref="ShowUsages"/>
1225+
-->
1226+
</group>
1227+
<group id="TouchBarDefault_cmd.alt" text="Default with Alt+Cmd key">
1228+
<!--
1229+
<separator text="type.flexible"/>
1230+
<reference ref="FindUsages"/>
1231+
-->
1232+
</group>
1233+
<group id="TouchBarDefault_shift" text="Default with Shift key">
1234+
<!--Use Shift to show Refactor actions/-->
1235+
<!--
1236+
<reference ref="RenameElement"/>
1237+
<reference ref="ChangeSignature"/>
1238+
<separator text="type.flexible"/>
1239+
<reference ref="CopyElement"/>
1240+
<reference ref="Move"/>
1241+
-->
1242+
</group>
1243+
</group>
11881244
<group id="TouchBarDebug" text="Debugger">
11891245
<!--
11901246
<reference ref="Rerun"/>
1191-
<reference ref="Pause"/>
11921247
<reference ref="Resume"/>
1248+
<reference ref="Pause"/>
11931249
<reference ref="Stop"/>
1194-
<separator/>
1250+
<separator text="type.small"/>
11951251
<reference ref="XDebugger.MuteBreakpoints"/>
1196-
<separator/>
1197-
<reference ref="StepOver"/>
1198-
<reference ref="StepInto"/>
1199-
<reference ref="StepOut"/>
1200-
<separator/>
1201-
<reference ref="EvaluateExpression"/>
1252+
<separator text="type.flexible"/>
1253+
-->
1254+
<group id="TouchBarDebug.StepButtons" compact="true" text="Debugger Step Actions">
1255+
<!--
1256+
<reference ref="StepOver"/>
1257+
<reference ref="StepInto"/>
1258+
<reference ref="StepOut"/>
1259+
-->
1260+
</group>
1261+
<!--
1262+
<separator text="type.small"/>
12021263
-->
12031264
<group id="TouchBarDebug_alt" text="Debugger with Alt key">
12041265
<!--
12051266
<separator/>
12061267
<reference ref="ViewBreakpoints"/>
1207-
<separator/>
1208-
<reference ref="ForceStepOver"/>
1209-
<reference ref="ForceStepInto"/>
1210-
<reference ref="SmartStepInto"/>
1211-
<reference ref="RunToCursor"/>
1268+
<separator text="type.flexible"/>
1269+
-->
1270+
<group id="TouchBarDebug.ForceStepButtons" compact="true" text="Debugger ForceStep Actions">
1271+
<!--
1272+
<reference ref="RunToCursor"/>
1273+
<reference ref="ForceStepOver"/>
1274+
<reference ref="ForceStepInto"/>
1275+
<reference ref="SmartStepInto"/>
1276+
-->
1277+
</group>
1278+
<!--
1279+
<separator text="type.small"/>
12121280
-->
12131281
</group>
1214-
<group id="TouchBarDebug_cmd" text="Debugger with Cmd key"/>
12151282
</group>
12161283
</group>
12171284
</actions>

‎workbench/mps-workbench/source/idea/MPSRichPlatformActions.xml‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -53,56 +53,5 @@
5353
<action id="WhatsNewAction" class="com.intellij.ide.actions.WhatsNewAction">
5454
<add-to-group group-id="HelpMenu" anchor="after" relative-to-action="ShowTips"/>
5555
</action>
56-
57-
<!-- TODO: Enable actions and references after replacing all IDEA actions with MPS ones -->
58-
<group id="TouchBarDefault" text="Default">
59-
<!--
60-
<reference ref="CompileDirty"/>
61-
<reference ref="RunConfiguration"/>
62-
-->
63-
<group id="RunnerActionsTouchbar"/> <!--filled from ExecutorRegistry-->
64-
<!--
65-
<reference ref="Stop"/>
66-
<separator/>
67-
<reference ref="Vcs.UpdateProject"/>
68-
<reference ref="CheckinProject"/>
69-
-->
70-
<add-to-group group-id="TouchBar" anchor="before" relative-to-action="TouchBarDebugger"/>
71-
<group id="TouchBarDefault_alt" text="Default with Alt key">
72-
<!--
73-
<separator text="type.flexible"/>
74-
<reference ref="RevealGroup"/>
75-
-->
76-
</group>
77-
<group id="TouchBarDefault_cmd" text="Default with Cmd key">
78-
<!--Use Cmd modifier key to show Navigation buttons, Bookmark and Breakpoint toggles and to Show Usages/-->
79-
<!--Cmd key is used, because it’s used in most of the action shortcuts: Back/Forward, Breakpoint and Find Usages./-->
80-
<!--
81-
<reference ref="Back"/>
82-
<reference ref="Forward"/>
83-
<separator text="type.big"/>
84-
<reference ref="ToggleBookmark"/>
85-
<reference ref="ToggleLineBreakpoint"/>
86-
<separator text="type.flexible"/>
87-
<reference ref="FindUsages"/>
88-
-->
89-
</group>
90-
<group id="TouchBarDefault_cmd.alt" text="Default with Alt+Cmd key">
91-
<!--
92-
<separator text="type.flexible"/>
93-
<reference ref="ShowUsages"/>
94-
-->
95-
</group>
96-
<group id="TouchBarDefault_shift" text="Default with Shift key">
97-
<!--Use Shift to show Refactor actions/-->
98-
<!--
99-
<reference ref="RenameElement"/>
100-
<reference ref="ChangeSignature"/>
101-
<separator text="type.flexible"/>
102-
<reference ref="CopyElement"/>
103-
<reference ref="Move"/>
104-
-->
105-
</group>
106-
</group>
10756
</actions>
10857
</component>

‎workbench/resources/source/idea/PlatformActions.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,7 @@
837837
<action id="UiDropper" internal="true" class="com.intellij.internal.inspector.UiDropperAction" text="UI &amp;Dropper"/>
838838
<action id="HidpiInfo" internal="true" class="com.intellij.internal.HidpiInfo" text="Show &amp;HiDPI Info"/>
839839
<action id="GrayFilterConfig" internal="true" class="com.intellij.internal.GrayFilterConfig" text="&amp;GrayFilter"/>
840+
<action id="TextGrayFilterConfig" internal="true" class="com.intellij.internal.TextGrayFilterConfig" text="&amp;TextGrayFilter"/>
840841
<action id="ShowSplash" internal="true" class="com.intellij.ui.ShowSplashAction" text="Show Splash" />
841842
<action id="ShowAboutPopupInDebugModeAction" class="com.intellij.internal.ui.ShowAboutPopupInDebugModeAction"
842843
text="Show About Popup in Debug Mode"/>
@@ -931,5 +932,7 @@
931932

932933
<action id="MarkNotificationsAsRead" class="com.intellij.notification.impl.actions.MarkAllNotificationsAsReadAction"/>
933934
<action class="com.intellij.ide.actions.SelectInProjectViewAction" id="SelectInProjectView" text="Select in Project View" />
935+
936+
<action id="SetShortcutAction" class="com.intellij.ide.actions.SetShortcutAction" use-shortcut-of="ShowIntentionActions"/>
934937
</actions>
935938
</idea-plugin>

0 commit comments

Comments
 (0)