diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index 0ba3603b9d..bed904b662 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -4691,7 +4691,7 @@ namespace winrt::TerminalApp::implementation _updateThemeColors(); } - winrt::fire_and_forget TerminalPage::_ControlCompletionsChangedHandler(const IInspectable /*sender*/, + winrt::fire_and_forget TerminalPage::_ControlCompletionsChangedHandler(const IInspectable sender, const CompletionsChangedEventArgs args) { // This will come in on a background (not-UI, not output) thread. @@ -4713,20 +4713,22 @@ namespace winrt::TerminalApp::implementation args.ReplacementLength()); auto weakThis{ get_weak() }; - Dispatcher().RunAsync(CoreDispatcherPriority::Normal, [weakThis, commandsCollection]() { + Dispatcher().RunAsync(CoreDispatcherPriority::Normal, [weakThis, commandsCollection, sender]() { // On the UI thread... if (const auto& page{ weakThis.get() }) { // Open the Suggestions UI with the commands from the control - page->_OpenSuggestions(commandsCollection, SuggestionsMode::Menu); + page->_OpenSuggestions(sender.try_as(), commandsCollection, SuggestionsMode::Menu); } }); } CATCH_LOG(); } - void TerminalPage::_OpenSuggestions(IVector commandsCollection, - winrt::TerminalApp::SuggestionsMode mode) + void TerminalPage::_OpenSuggestions( + const TermControl& sender, + IVector commandsCollection, + winrt::TerminalApp::SuggestionsMode mode) { // ON THE UI THREAD assert(Dispatcher().HasThreadAccess()); @@ -4744,7 +4746,7 @@ namespace winrt::TerminalApp::implementation return; } - const auto& control{ _GetActiveControl() }; + const auto& control{ sender ? sender : _GetActiveControl() }; if (!control) { return; diff --git a/src/cascadia/TerminalApp/TerminalPage.h b/src/cascadia/TerminalApp/TerminalPage.h index 98d441139d..e14b46fee7 100644 --- a/src/cascadia/TerminalApp/TerminalPage.h +++ b/src/cascadia/TerminalApp/TerminalPage.h @@ -519,7 +519,7 @@ namespace winrt::TerminalApp::implementation void _updatePaneResources(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme); winrt::fire_and_forget _ControlCompletionsChangedHandler(const winrt::Windows::Foundation::IInspectable sender, const winrt::Microsoft::Terminal::Control::CompletionsChangedEventArgs args); - void _OpenSuggestions(Windows::Foundation::Collections::IVector commandsCollection, winrt::TerminalApp::SuggestionsMode mode); + void _OpenSuggestions(const Microsoft::Terminal::Control::TermControl& sender, Windows::Foundation::Collections::IVector commandsCollection, winrt::TerminalApp::SuggestionsMode mode); void _ShowWindowChangedHandler(const IInspectable sender, const winrt::Microsoft::Terminal::Control::ShowWindowArgs args); diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.h b/src/cascadia/TerminalSettingsModel/ActionArgs.h index ae2b05f4d2..99f52ad991 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.h +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.h @@ -816,7 +816,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation BASIC_FACTORY(RenameTabArgs); BASIC_FACTORY(SwapPaneArgs); BASIC_FACTORY(SplitPaneArgs); - BASIC_FACTORY(SendInputArgs); BASIC_FACTORY(SetFocusModeArgs); BASIC_FACTORY(SetFullScreenArgs); BASIC_FACTORY(SetMaximizedArgs);