macOS: check conflicts for menu shortcuts and clear the default one

Similar to #11396, if one is setting `keybind=cmd+option+h=goto_split:left`, the shortcut for "Hide Others" should be cleared out

Author: bo2themax

macos/Sources/Ghostty/Ghostty.MenuShortcutManager.swift

@@ -42,6 +42,8 @@ extension Ghostty {
             configuredShortcuts.removeAll()
 
             updateShortcutRecursively(in: menu, config: config)
+
+            checkConflictsRecursively(in: menu)
         }
     }
 }
@@ -118,6 +120,21 @@ private extension Ghostty.MenuShortcutManager {
         }
         menu.update()
     }
+
+    /// Shortcuts in Ghostty configuration should have higher priority than default shortcuts
+    ///
+    /// We run this to do a final check for every menu item
+    func checkConflictsRecursively(in menu: NSMenu?) {
+        guard let menu else {
+            return
+        }
+
+        for item in menu.items {
+            checkConflicts(item: item)
+            checkConflictsRecursively(in: item.submenu)
+        }
+        menu.update()
+    }
 }
 
 // MARK: - Process a single menu item
@@ -186,6 +203,22 @@ private extension Ghostty.MenuShortcutManager {
         item.keyEquivalent = key.keyEquivalent
         item.keyEquivalentModifierMask = key.modifierFlags
     }
+
+    func checkConflicts(item: NSMenuItem) {
+        guard
+            let key = MenuShortcutKey(item),
+            // There should be an existing shortcut first
+            let existed = configuredShortcuts[key],
+            // Then we check if the action is the same
+            existed != item.action
+        else {
+            return
+        }
+        // User configured shortcut has conflicts with default one,
+        // clear the default one
+        item.keyEquivalent = ""
+        item.keyEquivalentModifierMask = []
+    }
 }
 
 extension Ghostty.MenuShortcutManager {

macos/Tests/Ghostty/MenuShortcutManagerTests.swift

@@ -61,7 +61,7 @@ struct MenuShortcutManagerTests {
     }
 
     @Test
-    func unreferencedItemShouldBeResetIfUnbound() async throws {
+    func unreferencedItemShouldBeResetIfOverrodeOrUnbound() async throws {
         let config = try TemporaryConfig("keybind=super+h=goto_split:left")
 
         let hideItem = NSMenuItem(title: "Hide Ghostty", action: "hide:", keyEquivalent: "h")
@@ -100,5 +100,16 @@ struct MenuShortcutManagerTests {
 
         #expect(goToLeftItem.keyEquivalent == "l")
         #expect(goToLeftItem.keyEquivalentModifierMask == .command)
+
+        try config.reload("""
+            keybind=super+l=goto_split:left
+            """)
+        await manager.resetRegisteredGhosttyActions()
+        await manager.register(action: "goto_split:left", menuItem: goToLeftItem)
+
+        await manager.updateShortcut(in: menu, config: config)
+
+        #expect(hideItem.keyEquivalent == "h")
+        #expect(hideItem.keyEquivalentModifierMask == .command)
     }
 }