Refactor ActionMap and Command to use ActionIDs

doc/cascadia/profiles.schema.json

@@ -2058,7 +2058,7 @@
  ]
  }
  },
- "Keybinding": {
+ "FullCommand": {
  "additionalProperties": false,
  "properties": {
  "command": {
@@ -2186,21 +2186,6 @@
  }
  ]
  },
- "keys": {
- "description": "Defines the key combinations used to call the command. It must be composed of...\n -any number of modifiers (ctrl/alt/shift)\n -a non-modifier key",
- "oneOf": [
- {
- "$ref": "#/$defs/KeyChordSegment"
- },
- {
- "items": {
- "$ref": "#/$defs/KeyChordSegment"
- },
- "minItems": 1,
- "type": "array"
- }
- ]
- },
  "icon": {
  "$ref": "#/$defs/Icon"
  },
@@ -2235,10 +2220,10 @@
  "type": "object",
  "properties": {
  "command": {
- "$ref": "#/$defs/Keybinding/properties/command"
+ "$ref": "#/$defs/FullCommand/properties/command"
  },
  "name": {
- "$ref": "#/$defs/Keybinding/properties/name"
+ "$ref": "#/$defs/FullCommand/properties/name"
  }
  }
  },
@@ -2261,6 +2246,44 @@
  ],
  "type": "object"
  },
+ "Keybinding": {
+ "additionalProperties": false,
+ "properties": {
+ "id": {
+ "description": "The ID of the command this keybinding should execute.",
+ "type": "string"
+ },
+ "keys": {
+ "description": "Defines the key combinations used to call the command. It must be composed of...\n -any number of modifiers (ctrl/alt/shift)\n -a non-modifier key",
+ "oneOf": [
+ {
+ "$ref": "#/$defs/KeyChordSegment"
+ },
+ {
+ "items": {
+ "$ref": "#/$defs/KeyChordSegment"
+ },
+ "minItems": 1,
+ "type": "array"
+ }
+ ]
+ }
+ },
+ "anyOf": [
+ {
+ "required": [
+ "keys",
+ "id"
+ ]
+ },
+ {
+ "required": [
+ "keys"
+ ]
+ }
+ ],
+ "type": "object"
+ },
  "Globals": {
  "additionalProperties": true,
  "description": "Properties that affect the entire window, regardless of the profile settings.",
@@ -2464,12 +2487,12 @@
  "actions": {
  "description": "Properties are specific to each custom action.",
  "items": {
- "$ref": "#/$defs/Keybinding"
+ "$ref": "#/$defs/FullCommand"
  },
  "type": "array"
  },
  "keybindings": {
- "description": "[deprecated] Use actions instead.",
+ "description": "A list of keychords bound to action IDs",
  "deprecated": true,
  "items": {
  "$ref": "#/$defs/Keybinding"

src/cascadia/TerminalApp/TabBase.cpp

@@ -192,7 +192,8 @@ namespace winrt::TerminalApp::implementation
  // - <none>
  void TabBase::_UpdateSwitchToTabKeyChord()
  {
- const auto keyChord = _actionMap ? _actionMap.GetKeyBindingForAction(ShortcutAction::SwitchToTab, SwitchToTabArgs{ _TabViewIndex }) : nullptr;
+ const auto id = fmt::format(FMT_COMPILE(L"Terminal.SwitchToTab{}"), _TabViewIndex);
+ const auto keyChord{ _actionMap.GetKeyBindingForAction(id) };
  const auto keyChordText = keyChord ? KeyChordSerialization::ToString(keyChord) : L"";
 
  if (_keyChord == keyChordText)

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -826,7 +826,7 @@ namespace winrt::TerminalApp::implementation
  newTabFlyout.Items().Append(settingsItem);
 
  auto actionMap = _settings.ActionMap();
- const auto settingsKeyChord{ actionMap.GetKeyBindingForAction(ShortcutAction::OpenSettings, OpenSettingsArgs{ SettingsTarget::SettingsUI }) };
+ const auto settingsKeyChord{ actionMap.GetKeyBindingForAction(L"Terminal.OpenSettingsUI") };
  if (settingsKeyChord)
  {
  _SetAcceleratorForMenuItem(settingsItem, settingsKeyChord);
@@ -848,7 +848,7 @@ namespace winrt::TerminalApp::implementation
  commandPaletteFlyout.Click({ this, &TerminalPage::_CommandPaletteButtonOnClick });
  newTabFlyout.Items().Append(commandPaletteFlyout);
 
- const auto commandPaletteKeyChord{ actionMap.GetKeyBindingForAction(ShortcutAction::ToggleCommandPalette) };
+ const auto commandPaletteKeyChord{ actionMap.GetKeyBindingForAction(L"Terminal.ToggleCommandPalette") };
  if (commandPaletteKeyChord)
  {
  _SetAcceleratorForMenuItem(commandPaletteFlyout, commandPaletteKeyChord);
@@ -1023,7 +1023,8 @@ namespace winrt::TerminalApp::implementation
  // NewTab(ProfileIndex=N) action
  NewTerminalArgs newTerminalArgs{ profileIndex };
  NewTabArgs newTabArgs{ newTerminalArgs };
- auto profileKeyChord{ _settings.ActionMap().GetKeyBindingForAction(ShortcutAction::NewTab, newTabArgs) };
+ const auto id = fmt::format(FMT_COMPILE(L"Terminal.OpenNewTabProfile{}"), profileIndex);
+ const auto profileKeyChord{ _settings.ActionMap().GetKeyBindingForAction(id) };
 
  // make sure we find one to display
  if (profileKeyChord)