diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.cpp b/src/cascadia/TerminalSettingsModel/ActionMap.cpp index 48e1a61b84d..93199cc65be 100644 --- a/src/cascadia/TerminalSettingsModel/ActionMap.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionMap.cpp @@ -270,7 +270,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation } // Method Description: - // - Recursively populated keyBindingsMap with ours and our parents' key -> id pairs + // - Recursively populate keyBindingsMap with ours and our parents' key -> id pairs + // - This is a bottom-up approach, ensuring that the keybindings of the parents are overridden by the children void ActionMap::_PopulateCumulativeKeyMap(std::unordered_map& keyBindingsMap) { for (const auto& [keys, cmdID] : _KeyMap) @@ -288,7 +289,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation } // Method Description: - // - Recursively populated actionMap with ours and our parents' id -> command pairs + // - Recursively populate actionMap with ours and our parents' id -> command pairs + // - This is a bottom-up approach, ensuring that the actions of the parents are overridden by the children void ActionMap::_PopulateCumulativeActionMap(std::unordered_map& actionMap) { for (const auto& [cmdID, cmd] : _ActionMap) diff --git a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp index 70e1e3a758d..0d3a7d75c7b 100644 --- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp +++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp @@ -155,7 +155,7 @@ void GlobalAppSettings::LayerJson(const Json::Value& json, const OriginTag origi void GlobalAppSettings::LayerActionsFrom(const Json::Value& json, const OriginTag origin, const bool withKeybindings) { - // this order change is intentional, we want to do the keybindings map _after_ so that we have already + // we want to do the keybindings map after the actions map so that we have already // stored the action IDs in the action map // also, we want the keybindings map to overwrite any leftover keybindings that might have existed in the first pass, // in case the user did a partial update from legacy to modern