From e38789099cbaa1081eebb82ba23e25d23156a119 Mon Sep 17 00:00:00 2001
From: Sonakshi Saxena <nexa@google.com>
Date: Thu, 5 Jun 2025 18:18:26 +0000
Subject: [PATCH] Refactor the bookmarks groups and actions

---
 .../src/idea/LangActions.xml                  |   6 -
 .../META-INF/SherlockPlatformPlugin.xml       |   1 +
 .../resources/META-INF/override-actions.xml   | 118 ++++++++++++++++++
 3 files changed, 119 insertions(+), 6 deletions(-)
 create mode 100644 sherlock-platform/customization/resources/META-INF/override-actions.xml

diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index a5f2fd36a987e..a057ba34ccd96 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -319,9 +319,7 @@
       <reference ref="AddAnotherBookmark"/>
       <reference ref="EditBookmark"/>
       <reference ref="ToggleBookmark"/>
-      <!--Sherlock: Remove bookmarks from editor tab menu
       <add-to-group group-id="EditorTabPopupMenu" anchor="after" relative-to-action="ReopenClosedTab"/>
-      -->
     </group>
 
     <group id="BookmarkOpenTabsGroup" popup="false" searchable="false">
@@ -339,9 +337,7 @@
       <reference ref="ShowBookmarks"/>
       <reference ref="ShowTypeBookmarks"/>
       <separator/>
-      <!--Sherlock: Remove Bookmarks from Edit Menu
       <add-to-group group-id="EditMenu" anchor="after" relative-to-action="Macros"/>
-      -->
     </group>
 
     <action id="GotoDeclarationOnly" class="com.intellij.codeInsight.navigation.actions.GotoDeclarationOnlyAction"/>
@@ -879,9 +875,7 @@
       <separator/>
       <reference ref="ProjectViewPopupMenuRefactoringGroup"/>
       <separator/>
-      <!--Sherlock: Remove bookmarks from project view pop-up menu
       <reference ref="popup@ExpandableBookmarkContextMenu"/>
-      -->
       <separator/>
       <reference ref="ProjectViewPopupMenuModifyGroup"/>
       <separator/>
diff --git a/sherlock-branding/resources/META-INF/SherlockPlatformPlugin.xml b/sherlock-branding/resources/META-INF/SherlockPlatformPlugin.xml
index 174078988a59f..dff754034e381 100644
--- a/sherlock-branding/resources/META-INF/SherlockPlatformPlugin.xml
+++ b/sherlock-branding/resources/META-INF/SherlockPlatformPlugin.xml
@@ -5,4 +5,5 @@
   <xi:include href="/META-INF/XmlPlugin.xml"/>
   <xi:include href="/META-INF/SherlockPlatformCustomization.xml"/>
   <xi:include href="/META-INF/essential-modules.xml"/>
+  <xi:include href="/META-INF/override-actions.xml"/>
 </idea-plugin>
diff --git a/sherlock-platform/customization/resources/META-INF/override-actions.xml b/sherlock-platform/customization/resources/META-INF/override-actions.xml
new file mode 100644
index 0000000000000..b9ffb8ca16e21
--- /dev/null
+++ b/sherlock-platform/customization/resources/META-INF/override-actions.xml
@@ -0,0 +1,118 @@
+<idea-plugin>
+  <!-- These actions are not required to be visible in Sherlock UI.
+  Note: The actions will still be visible under Settings > Keymap
+  -->
+  <actions>
+    <!--Bookmarks-->
+    <group overrides="true" id="Bookmarks" class="com.intellij.openapi.actionSystem.EmptyActionGroup"/>
+    <group overrides="true" id="popup@BookmarkContextMenu" class="com.intellij.openapi.actionSystem.EmptyActionGroup"/>
+    <group overrides="true" id="BookmarkOpenTabsGroup" class="com.intellij.openapi.actionSystem.EmptyActionGroup"/>
+    <group overrides="true" id="EditBookmarksGroup" class="com.intellij.openapi.actionSystem.EmptyActionGroup"/>
+    <group overrides="true" id="Bookmarks.Goto" class="com.intellij.openapi.actionSystem.EmptyActionGroup"/>
+    <group overrides="true" id="Bookmarks.Toggle" class="com.intellij.openapi.actionSystem.EmptyActionGroup"/>
+    <group overrides="true" id="Bookmarks.ToolWindow.PopupMenu" class="com.intellij.openapi.actionSystem.EmptyActionGroup"/>
+    <group overrides= "true" id="GoToErrorGroup" class="com.intellij.openapi.actionSystem.EmptyActionGroup"/>
+
+    <action overrides="true" id="AddAnotherBookmark" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="EditBookmark" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmark" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkWithMnemonic" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="DeleteMnemonicFromBookmark" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarkOpenTabs" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ShowBookmarks" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ShowTypeBookmarks" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoNextBookmark" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoNextBookmarkInEditor" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoPreviousBookmark" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoPreviousBookmarkInEditor" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmark0" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmark1" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmark2" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmark3" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmark4" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmark5" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmark6" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmark7" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmark8" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmark9" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkA" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkB" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkC" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkD" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkE" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkF" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkG" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkH" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkI" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkJ" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkK" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkL" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkM" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkN" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkO" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkP" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkQ" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkR" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkS" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkT" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkU" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkV" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkW" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkX" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkY" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="GotoBookmarkZ" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmark0" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmark1" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmark2" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmark3" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmark4" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmark5" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmark6" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmark7" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmark8" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmark9" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkA" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkB" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkC" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkD" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkE" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkF" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkG" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkH" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkI" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkJ" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkK" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkL" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkM" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkN" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkO" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkP" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkQ" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkR" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkS" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkT" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkU" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkV" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkW" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkX" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkY" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="ToggleBookmarkZ" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.DefaultGroup" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.Rename" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.Delete" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.DeleteType" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.ChooseType" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.MoveUp" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.MoveDown" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.SortGroupBookmarks" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="OpenBookmarkGroup" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.Create" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.ShowPreview" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.GroupLineBookmarks" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.RewriteBookmarkType" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.AskBeforeDeletingLists" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.OpenInPreviewTab" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.AutoscrollToSource" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+    <action overrides="true" id="BookmarksView.AutoscrollFromSource" class="com.intellij.openapi.actionSystem.EmptyAction"/>
+  </actions>
+</idea-plugin>
\ No newline at end of file