PRE-MERGE microsoft#17215 Remove command's knowledge of its keys

zadjii-msft · zadjii-msft · commit cf5077760568 · 2024-06-03T13:35:47.000-05:00
diff --git a/src/cascadia/TerminalApp/ActionPaletteItem.cpp b/src/cascadia/TerminalApp/ActionPaletteItem.cpp
@@ -18,11 +18,11 @@ using namespace winrt::Microsoft::Terminal::Settings::Model;
 
 namespace winrt::TerminalApp::implementation
 {
-    ActionPaletteItem::ActionPaletteItem(const Microsoft::Terminal::Settings::Model::Command& command) :
+    ActionPaletteItem::ActionPaletteItem(const Microsoft::Terminal::Settings::Model::Command& command, const winrt::hstring keyChordText) :
         _Command(command)
     {
         Name(command.Name());
-        KeyChordText(command.KeyChordText());
+        KeyChordText(keyChordText);
         Icon(command.IconPath());
     }
 }
diff --git a/src/cascadia/TerminalApp/ActionPaletteItem.h b/src/cascadia/TerminalApp/ActionPaletteItem.h
@@ -11,7 +11,7 @@ namespace winrt::TerminalApp::implementation
     struct ActionPaletteItem : ActionPaletteItemT<ActionPaletteItem, PaletteItem>
     {
         ActionPaletteItem() = default;
-        ActionPaletteItem(const Microsoft::Terminal::Settings::Model::Command& command);
+        ActionPaletteItem(const Microsoft::Terminal::Settings::Model::Command& command, const winrt::hstring keyChordText);
 
         WINRT_PROPERTY(Microsoft::Terminal::Settings::Model::Command, Command, nullptr);
 
diff --git a/src/cascadia/TerminalApp/ActionPaletteItem.idl b/src/cascadia/TerminalApp/ActionPaletteItem.idl
@@ -7,7 +7,7 @@ namespace TerminalApp
 {
     [default_interface] runtimeclass ActionPaletteItem : PaletteItem
     {
-        ActionPaletteItem(Microsoft.Terminal.Settings.Model.Command command);
+        ActionPaletteItem(Microsoft.Terminal.Settings.Model.Command command, String keyChordText);
 
         Microsoft.Terminal.Settings.Model.Command Command { get; };
     }
diff --git a/src/cascadia/TerminalApp/CommandPalette.cpp b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -950,21 +950,27 @@ namespace winrt::TerminalApp::implementation
     void CommandPalette::SetActionMap(const Microsoft::Terminal::Settings::Model::IActionMapView& actionMap)
     {
         _actionMap = actionMap;
+        _setCommands();
     }
 
-    void CommandPalette::SetCommands(const Collections::IVector<Command>& actions)
+    void CommandPalette::_setCommands()
     {
-        _allCommands.Clear();
-        for (const auto& action : actions)
+        if (_actionMap)
         {
-            auto actionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action) };
-            auto filteredCommand{ winrt::make<FilteredCommand>(actionPaletteItem) };
-            _allCommands.Append(filteredCommand);
-        }
+            _allCommands.Clear();
+            const auto expandedCommands{ _actionMap.ExpandedCommands() };
+            for (const auto& action : expandedCommands)
+            {
+                const auto keyChordText{ KeyChordSerialization::ToString(_actionMap.GetKeyBindingForAction(action.ID())) };
+                auto actionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action, keyChordText) };
+                auto filteredCommand{ winrt::make<FilteredCommand>(actionPaletteItem) };
+                _allCommands.Append(filteredCommand);
+            }
 
-        if (Visibility() == Visibility::Visible && _currentMode == CommandPaletteMode::ActionMode)
-        {
-            _updateFilteredActions();
+            if (Visibility() == Visibility::Visible && _currentMode == CommandPaletteMode::ActionMode)
+            {
+                _updateFilteredActions();
+            }
         }
     }
 
@@ -1178,7 +1184,8 @@ namespace winrt::TerminalApp::implementation
         for (const auto& nameAndCommand : parentCommand.NestedCommands())
         {
             const auto action = nameAndCommand.Value();
-            auto nestedActionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action) };
+            // nested commands cannot have keys bound to them, so just pass in the command and no keys
+            auto nestedActionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action, L"") };
             auto nestedFilteredCommand{ winrt::make<FilteredCommand>(nestedActionPaletteItem) };
             _currentNestedCommands.Append(nestedFilteredCommand);
         }
diff --git a/src/cascadia/TerminalApp/CommandPalette.h b/src/cascadia/TerminalApp/CommandPalette.h
@@ -31,7 +31,6 @@ namespace winrt::TerminalApp::implementation
 
         Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::FilteredCommand> FilteredActions();
 
-        void SetCommands(const Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::Command>& actions);
         void SetTabs(const Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase>& tabs, const Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase>& mruTabs);
         void SetActionMap(const Microsoft::Terminal::Settings::Model::IActionMapView& actionMap);
 
@@ -81,6 +80,8 @@ namespace winrt::TerminalApp::implementation
 
         bool _lastFilterTextWasEmpty{ true };
 
+        void _setCommands();
+
         void _filterTextChanged(const Windows::Foundation::IInspectable& sender,
                                 const Windows::UI::Xaml::RoutedEventArgs& args);
         void _previewKeyDownHandler(const Windows::Foundation::IInspectable& sender,
diff --git a/src/cascadia/TerminalApp/CommandPalette.idl b/src/cascadia/TerminalApp/CommandPalette.idl
@@ -20,8 +20,6 @@ namespace TerminalApp
 
         Windows.Foundation.Collections.IObservableVector<FilteredCommand> FilteredActions { get; };
 
-        void SetCommands(Windows.Foundation.Collections.IVector<Microsoft.Terminal.Settings.Model.Command> actions);
-
         void SetTabs(Windows.Foundation.Collections.IObservableVector<TabBase> tabs, Windows.Foundation.Collections.IObservableVector<TabBase> mruTabs);
 
         void SetActionMap(Microsoft.Terminal.Settings.Model.IActionMapView actionMap);
diff --git a/src/cascadia/TerminalApp/SuggestionsControl.cpp b/src/cascadia/TerminalApp/SuggestionsControl.cpp
@@ -508,7 +508,7 @@ namespace winrt::TerminalApp::implementation
                         automationPeer.RaiseNotificationEvent(
                             Automation::Peers::AutomationNotificationKind::ItemAdded,
                             Automation::Peers::AutomationNotificationProcessing::MostRecent,
-                            paletteItem.Name() + L" " + paletteItem.KeyChordText(),
+                            paletteItem.Name(),
                             L"SuggestionsControlSelectedItemChanged" /* unique name for this notification category */);
                     }
                 }
@@ -751,17 +751,13 @@ namespace winrt::TerminalApp::implementation
         return _filteredActions;
     }
 
-    void SuggestionsControl::SetActionMap(const Microsoft::Terminal::Settings::Model::IActionMapView& actionMap)
-    {
-        _actionMap = actionMap;
-    }
-
     void SuggestionsControl::SetCommands(const Collections::IVector<Command>& actions)
     {
         _allCommands.Clear();
         for (const auto& action : actions)
         {
-            auto actionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action) };
+            // key chords aren't relevant in the suggestions control, so make the palette item with just the command and no keys
+            auto actionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action, L"") };
             auto filteredCommand{ winrt::make<FilteredCommand>(actionPaletteItem) };
             _allCommands.Append(filteredCommand);
         }
@@ -915,7 +911,7 @@ namespace winrt::TerminalApp::implementation
         for (const auto& nameAndCommand : parentCommand.NestedCommands())
         {
             const auto action = nameAndCommand.Value();
-            auto nestedActionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action) };
+            auto nestedActionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action, L"") };
             auto nestedFilteredCommand{ winrt::make<FilteredCommand>(nestedActionPaletteItem) };
             _currentNestedCommands.Append(nestedFilteredCommand);
         }
diff --git a/src/cascadia/TerminalApp/SuggestionsControl.h b/src/cascadia/TerminalApp/SuggestionsControl.h
@@ -24,7 +24,6 @@ namespace winrt::TerminalApp::implementation
         Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::FilteredCommand> FilteredActions();
 
         void SetCommands(const Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::Command>& actions);
-        void SetActionMap(const Microsoft::Terminal::Settings::Model::IActionMapView& actionMap);
 
         bool OnDirectKeyEvent(const uint32_t vkey, const uint8_t scanCode, const bool down);
 
diff --git a/src/cascadia/TerminalApp/SuggestionsControl.idl b/src/cascadia/TerminalApp/SuggestionsControl.idl
@@ -36,7 +36,6 @@ namespace TerminalApp
         SuggestionsMode Mode { get; set; };
 
         void SetCommands(Windows.Foundation.Collections.IVector<Microsoft.Terminal.Settings.Model.Command> actions);
-        void SetActionMap(Microsoft.Terminal.Settings.Model.IActionMapView actionMap);
         void SelectNextItem(Boolean moveDown);
 
         void Open(SuggestionsMode mode, IVector<Microsoft.Terminal.Settings.Model.Command> commands, String filterText, Windows.Foundation.Point anchor, Windows.Foundation.Size space, Single characterHeight);
diff --git a/src/cascadia/TerminalApp/SuggestionsControl.xaml b/src/cascadia/TerminalApp/SuggestionsControl.xaml
@@ -31,7 +31,6 @@
                               MinHeight="0"
                               Padding="16,0,12,0"
                               HorizontalContentAlignment="Stretch"
-                              AutomationProperties.AcceleratorKey="{x:Bind Item.KeyChordText, Mode=OneWay}"
                               AutomationProperties.Name="{x:Bind Item.Name, Mode=OneWay}"
                               FontSize="12" />
             </DataTemplate>
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -123,7 +123,6 @@ namespace winrt::TerminalApp::implementation
         // to happen before the Settings UI is reloaded and tries to re-read those values.
         if (const auto p = CommandPaletteElement())
         {
-            p.SetCommands(_settings.GlobalSettings().ActionMap().ExpandedCommands());
             p.SetActionMap(_settings.ActionMap());
         }
 
@@ -1828,7 +1827,6 @@ namespace winrt::TerminalApp::implementation
     {
         const auto p = FindName(L"CommandPaletteElement").as<CommandPalette>();
 
-        p.SetCommands(_settings.GlobalSettings().ActionMap().ExpandedCommands());
         p.SetActionMap(_settings.ActionMap());
 
         // When the visibility of the command palette changes to "collapsed",
diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.cpp b/src/cascadia/TerminalSettingsModel/ActionMap.cpp
@@ -108,9 +108,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
                         if (cmdID == pair.first)
                         {
                             keysToReassign.insert_or_assign(key, inboxCmd->second.ID());
-
-                            // register the keys with the inbox action
-                            inboxCmd->second.RegisterKey(key);
                         }
                     }
 
@@ -446,7 +443,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     // - Adds a command to the ActionMap
     // Arguments:
     // - cmd: the command we're adding
-    void ActionMap::AddAction(const Model::Command& cmd)
+    void ActionMap::AddAction(const Model::Command& cmd, const Control::KeyChord& keys)
     {
         // _Never_ add null to the ActionMap
         if (!cmd)
@@ -486,7 +483,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         //  Add the new keybinding to the _KeyMap
 
         _TryUpdateActionMap(cmd);
-        _TryUpdateKeyChord(cmd);
+        _TryUpdateKeyChord(cmd, keys);
     }
 
     // Method Description:
@@ -545,28 +542,17 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     // - Update our internal state with the key chord of the newly registered action
     // Arguments:
     // - cmd: the action we're trying to register
-    void ActionMap::_TryUpdateKeyChord(const Model::Command& cmd)
+    void ActionMap::_TryUpdateKeyChord(const Model::Command& cmd, const Control::KeyChord& keys)
     {
         // Example (this is a legacy case, where the keys are provided in the same block as the command):
         //   {                "command": "copy", "keys": "ctrl+c" } --> we are registering a new key chord
         //   { "name": "foo", "command": "copy" }                   --> no change to keys, exit early
-        const auto keys{ cmd.Keys() };
         if (!keys)
         {
             // the user is not trying to update the keys.
             return;
         }
 
-        // Handle collisions
-        if (const auto foundCommand = _GetActionByKeyChordInternal(keys); foundCommand && *foundCommand)
-        {
-            // collision: the key chord is bound to some command, make sure that command erases
-            //            this key chord as we are about to overwrite it
-
-            const auto foundCommandImpl{ get_self<implementation::Command>(*foundCommand) };
-            foundCommandImpl->EraseKey(keys);
-        }
-
         // Assign the new action in the _KeyMap
         // However, there's a strange edge case here - since we're parsing a legacy or modern block,
         // the user might have { "command": null, "id": "someID", "keys": "ctrl+c" }
@@ -670,12 +656,23 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     // Return Value:
     // - the key chord that executes the given action
     // - nullptr if the action is not bound to a key chord
-    Control::KeyChord ActionMap::GetKeyBindingForAction(const winrt::hstring& cmdID) const
+    Control::KeyChord ActionMap::GetKeyBindingForAction(const winrt::hstring& cmdID)
     {
-        // Check our internal state.
-        if (const auto cmd{ _GetActionByID(cmdID) })
+        if (!_ResolvedKeyActionMapCache)
         {
-            return cmd.Keys();
+            _RefreshKeyBindingCaches();
+        }
+
+        // I dislike that we have to do an O(n) lookup every time we want to get the keybinding for an action -
+        // an alternative is having the key->action map be a bi-map (would require a dependency), or store another map that is just
+        // the reverse direction (action->key) which would be mean storing the same data twice but getting faster lookup
+        for (const auto [key, action] : _ResolvedKeyActionMapCache)
+        {
+            if (action.ID() == cmdID)
+            {
+                // if there are multiple keys bound to this action, we will just return the first one we find
+                return key;
+            }
         }
 
         // This key binding does not exist
@@ -711,11 +708,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             _KeyMap.insert_or_assign(oldKeys, L"");
         }
 
-        // make sure to update the Command with these changes
-        const auto cmdImpl{ get_self<implementation::Command>(cmd) };
-        cmdImpl->EraseKey(oldKeys);
-        cmdImpl->RegisterKey(newKeys);
-
         return true;
     }
 
@@ -753,10 +745,9 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     void ActionMap::RegisterKeyBinding(Control::KeyChord keys, Model::ActionAndArgs action)
     {
         auto cmd{ make_self<Command>() };
-        cmd->RegisterKey(keys);
         cmd->ActionAndArgs(action);
         cmd->GenerateID();
-        AddAction(*cmd);
+        AddAction(*cmd, keys);
     }
 
     // This is a helper to aid in sorting commands by their `Name`s, alphabetically.
diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.h b/src/cascadia/TerminalSettingsModel/ActionMap.h
@@ -61,10 +61,10 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         // queries
         Model::Command GetActionByKeyChord(const Control::KeyChord& keys) const;
         bool IsKeyChordExplicitlyUnbound(const Control::KeyChord& keys) const;
-        Control::KeyChord GetKeyBindingForAction(const winrt::hstring& cmdID) const;
+        Control::KeyChord GetKeyBindingForAction(const winrt::hstring& cmdID);
 
         // population
-        void AddAction(const Model::Command& cmd);
+        void AddAction(const Model::Command& cmd, const Control::KeyChord& keys);
 
         // JSON
         static com_ptr<ActionMap> FromJson(const Json::Value& json, const OriginTag origin = OriginTag::None);
@@ -98,7 +98,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         void _PopulateCumulativeActionMap(std::unordered_map<hstring, Model::Command>& actionMap);
 
         void _TryUpdateActionMap(const Model::Command& cmd);
-        void _TryUpdateKeyChord(const Model::Command& cmd);
+        void _TryUpdateKeyChord(const Model::Command& cmd, const Control::KeyChord& keys);
 
         Windows::Foundation::Collections::IMap<hstring, Model::ActionAndArgs> _AvailableActionsCache{ nullptr };
         Windows::Foundation::Collections::IMap<hstring, Model::Command> _NameMapCache{ nullptr };
@@ -111,8 +111,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 
         bool _fixupsAppliedDuringLoad{ false };
 
-        void _AddKeyBindingHelper(const Json::Value& json, std::vector<SettingsLoadWarnings>& warnings);
-
         // _KeyMap is the map of key chords -> action IDs defined in this layer
         // _ActionMap is the map of action IDs -> commands defined in this layer
         // These maps are the ones that we deserialize into when parsing the user json and vice-versa
diff --git a/src/cascadia/TerminalSettingsModel/ActionMapSerialization.cpp b/src/cascadia/TerminalSettingsModel/ActionMapSerialization.cpp
diff --git a/src/cascadia/TerminalSettingsModel/Command.cpp b/src/cascadia/TerminalSettingsModel/Command.cpp
diff --git a/src/cascadia/TerminalSettingsModel/Command.h b/src/cascadia/TerminalSettingsModel/Command.h
diff --git a/src/cascadia/TerminalSettingsModel/Command.idl b/src/cascadia/TerminalSettingsModel/Command.idl

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@ using namespace winrt::Microsoft::Terminal::Settings::Model;`
`18`	`18`
`19`	`19`	`namespace winrt::TerminalApp::implementation`
`20`	`20`	`{`
`21`		`- ActionPaletteItem::ActionPaletteItem(const Microsoft::Terminal::Settings::Model::Command& command) :`
	`21`	`+ ActionPaletteItem::ActionPaletteItem(const Microsoft::Terminal::Settings::Model::Command& command, const winrt::hstring keyChordText) :`
`22`	`22`	`_Command(command)`
`23`	`23`	`{`
`24`	`24`	`Name(command.Name());`
`25`		`- KeyChordText(command.KeyChordText());`
	`25`	`+ KeyChordText(keyChordText);`
`26`	`26`	`Icon(command.IconPath());`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace winrt::TerminalApp::implementation`
`11`	`11`	`struct ActionPaletteItem : ActionPaletteItemT<ActionPaletteItem, PaletteItem>`
`12`	`12`	`{`
`13`	`13`	`ActionPaletteItem() = default;`
`14`		`- ActionPaletteItem(const Microsoft::Terminal::Settings::Model::Command& command);`
	`14`	`+ ActionPaletteItem(const Microsoft::Terminal::Settings::Model::Command& command, const winrt::hstring keyChordText);`
`15`	`15`
`16`	`16`	`WINRT_PROPERTY(Microsoft::Terminal::Settings::Model::Command, Command, nullptr);`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace TerminalApp`
`7`	`7`	`{`
`8`	`8`	`[default_interface] runtimeclass ActionPaletteItem : PaletteItem`
`9`	`9`	`{`
`10`		`- ActionPaletteItem(Microsoft.Terminal.Settings.Model.Command command);`
	`10`	`+ ActionPaletteItem(Microsoft.Terminal.Settings.Model.Command command, String keyChordText);`
`11`	`11`
`12`	`12`	`Microsoft.Terminal.Settings.Model.Command Command { get; };`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -950,21 +950,27 @@ namespace winrt::TerminalApp::implementation`
`950`	`950`	`void CommandPalette::SetActionMap(const Microsoft::Terminal::Settings::Model::IActionMapView& actionMap)`
`951`	`951`	`{`
`952`	`952`	`_actionMap = actionMap;`
	`953`	`+ _setCommands();`
`953`	`954`	`}`
`954`	`955`
`955`		`- void CommandPalette::SetCommands(const Collections::IVector<Command>& actions)`
	`956`	`+ void CommandPalette::_setCommands()`
`956`	`957`	`{`
`957`		`- _allCommands.Clear();`
`958`		`- for (const auto& action : actions)`
	`958`	`+ if (_actionMap)`
`959`	`959`	`{`
`960`		`- auto actionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action) };`
`961`		`- auto filteredCommand{ winrt::make<FilteredCommand>(actionPaletteItem) };`
`962`		`- _allCommands.Append(filteredCommand);`
`963`		`- }`
	`960`	`+ _allCommands.Clear();`
	`961`	`+ const auto expandedCommands{ _actionMap.ExpandedCommands() };`
	`962`	`+ for (const auto& action : expandedCommands)`
	`963`	`+ {`
	`964`	`+ const auto keyChordText{ KeyChordSerialization::ToString(_actionMap.GetKeyBindingForAction(action.ID())) };`
	`965`	`+ auto actionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action, keyChordText) };`
	`966`	`+ auto filteredCommand{ winrt::make<FilteredCommand>(actionPaletteItem) };`
	`967`	`+ _allCommands.Append(filteredCommand);`
	`968`	`+ }`
`964`	`969`
`965`		`- if (Visibility() == Visibility::Visible && _currentMode == CommandPaletteMode::ActionMode)`
`966`		`- {`
`967`		`- _updateFilteredActions();`
	`970`	`+ if (Visibility() == Visibility::Visible && _currentMode == CommandPaletteMode::ActionMode)`
	`971`	`+ {`
	`972`	`+ _updateFilteredActions();`
	`973`	`+ }`
`968`	`974`	`}`
`969`	`975`	`}`
`970`	`976`
`@@ -1178,7 +1184,8 @@ namespace winrt::TerminalApp::implementation`
`1178`	`1184`	`for (const auto& nameAndCommand : parentCommand.NestedCommands())`
`1179`	`1185`	`{`
`1180`	`1186`	`const auto action = nameAndCommand.Value();`
`1181`		`- auto nestedActionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action) };`
	`1187`	`+ // nested commands cannot have keys bound to them, so just pass in the command and no keys`
	`1188`	`+ auto nestedActionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action, L"") };`
`1182`	`1189`	`auto nestedFilteredCommand{ winrt::make<FilteredCommand>(nestedActionPaletteItem) };`
`1183`	`1190`	`_currentNestedCommands.Append(nestedFilteredCommand);`
`1184`	`1191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ namespace winrt::TerminalApp::implementation`
`508`	`508`	`automationPeer.RaiseNotificationEvent(`
`509`	`509`	`Automation::Peers::AutomationNotificationKind::ItemAdded,`
`510`	`510`	`Automation::Peers::AutomationNotificationProcessing::MostRecent,`
`511`		`- paletteItem.Name() + L" " + paletteItem.KeyChordText(),`
	`511`	`+ paletteItem.Name(),`
`512`	`512`	`L"SuggestionsControlSelectedItemChanged" /* unique name for this notification category */);`
`513`	`513`	`}`
`514`	`514`	`}`
`@@ -751,17 +751,13 @@ namespace winrt::TerminalApp::implementation`
`751`	`751`	`return _filteredActions;`
`752`	`752`	`}`
`753`	`753`
`754`		`- void SuggestionsControl::SetActionMap(const Microsoft::Terminal::Settings::Model::IActionMapView& actionMap)`
`755`		`- {`
`756`		`- _actionMap = actionMap;`
`757`		`- }`
`758`		`-`
`759`	`754`	`void SuggestionsControl::SetCommands(const Collections::IVector<Command>& actions)`
`760`	`755`	`{`
`761`	`756`	`_allCommands.Clear();`
`762`	`757`	`for (const auto& action : actions)`
`763`	`758`	`{`
`764`		`- auto actionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action) };`
	`759`	`+ // key chords aren't relevant in the suggestions control, so make the palette item with just the command and no keys`
	`760`	`+ auto actionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action, L"") };`
`765`	`761`	`auto filteredCommand{ winrt::make<FilteredCommand>(actionPaletteItem) };`
`766`	`762`	`_allCommands.Append(filteredCommand);`
`767`	`763`	`}`
`@@ -915,7 +911,7 @@ namespace winrt::TerminalApp::implementation`
`915`	`911`	`for (const auto& nameAndCommand : parentCommand.NestedCommands())`
`916`	`912`	`{`
`917`	`913`	`const auto action = nameAndCommand.Value();`
`918`		`- auto nestedActionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action) };`
	`914`	`+ auto nestedActionPaletteItem{ winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(action, L"") };`
`919`	`915`	`auto nestedFilteredCommand{ winrt::make<FilteredCommand>(nestedActionPaletteItem) };`
`920`	`916`	`_currentNestedCommands.Append(nestedFilteredCommand);`
`921`	`917`	`}`