clear quick fix on interaction

Author: carlos-zamora

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -4854,16 +4854,20 @@ namespace winrt::TerminalApp::implementation
             return;
         }
 
-        // Helper lambda for dispatching an ActionAndArgs onto the
+        // Helper lambda for dispatching a SendInput ActionAndArgs onto the
         // ShortcutActionDispatch. Used below to wire up each menu entry to the
-        // respective action.
-
+        // respective action. Then clear the quick fix menu.
         auto weak = get_weak();
-        auto makeCallback = [weak](const ActionAndArgs& actionAndArgs) {
-            return [weak, actionAndArgs](auto&&, auto&&) {
+        auto makeCallback = [weak](const hstring& suggestion) {
+            return [weak, suggestion](auto&&, auto&&) {
                 if (auto page{ weak.get() })
                 {
+                    const auto actionAndArgs = ActionAndArgs{ ShortcutAction::SendInput, SendInputArgs{ hstring{ L"\u0003" } + suggestion } };
                     page->_actionDispatch->DoAction(actionAndArgs);
+                    if (auto ctrl = page->_GetActiveControl())
+                    {
+                        ctrl.ClearQuickFix();
+                    }
                 }
             };
         };
@@ -4881,7 +4885,7 @@ namespace winrt::TerminalApp::implementation
             }
 
             item.Text(label);
-            item.Click(makeCallback(ActionAndArgs{ ShortcutAction::SendInput, SendInputArgs{ hstring{ L"\u0003" } + suggestion } }));
+            item.Click(makeCallback(suggestion));
             menu.Items().Append(item);
         };
 

src/cascadia/TerminalControl/TermControl.cpp

@@ -835,10 +835,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         if (Feature_QuickFix::IsEnabled())
         {
             // update the position of the quick fix menu (in case we changed the padding)
-            if (_quickFixesAvailable)
-            {
-                ShowQuickFixMenu();
-            }
+            ShowQuickFixMenu();
         }
     }
 
@@ -2341,10 +2338,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             _updateSelectionMarkers(nullptr, winrt::make<UpdateSelectionMarkersEventArgs>(false));
         }
 
-        if (_quickFixesAvailable)
-        {
-            ShowQuickFixMenu();
-        }
+        ShowQuickFixMenu();
     }
 
     hstring TermControl::Title()
@@ -3527,10 +3521,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             auto quickFixBtn = QuickFixButton();
             quickFixBtn.Height(args.Height() / dpiScale);
             QuickFixIcon().FontSize(std::min(static_cast<double>(args.Width() / dpiScale), GetPadding().Left));
-            if (quickFixBtn.Visibility() == Visibility::Visible)
-            {
-                ShowQuickFixMenu();
-            }
+            ShowQuickFixMenu();
         }
     }
 
@@ -3830,8 +3821,13 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
     void TermControl::ShowQuickFixMenu()
     {
+        if (!_quickFixesAvailable)
+        {
+            QuickFixButton().Visibility(Visibility::Collapsed);
+            return;
+        }
+
         auto quickFixBtn{ QuickFixButton() };
-        _quickFixesAvailable = true;
 
         // If the gutter is narrow, display the collapsed version
         const auto& termPadding = GetPadding();
@@ -3857,10 +3853,21 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         quickFixBtn.Visibility(Visibility::Visible);
     }
 
+    void TermControl::_bubbleSearchMissingCommand(const IInspectable& /*sender*/, const Control::SearchMissingCommandEventArgs& args)
+    {
+        _quickFixesAvailable = true;
+        SearchMissingCommand.raise(*this, args);
+    }
+
     void TermControl::_clearQuickFix(const IInspectable& /*sender*/, const IInspectable& /*args*/)
     {
         _quickFixesAvailable = false;
-        QuickFixButton().Visibility(Visibility::Collapsed);
+        ShowQuickFixMenu();
+    }
+
+    void TermControl::ClearQuickFix()
+    {
+        _clearQuickFix(nullptr, nullptr);
     }
 
     void TermControl::_PasteCommandHandler(const IInspectable& /*sender*/,

src/cascadia/TerminalControl/TermControl.h

@@ -182,6 +182,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         void ShowContextMenu();
         void ShowQuickFixMenu();
+        void ClearQuickFix();
 
         void Detach();
 
@@ -206,6 +207,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         til::typed_event<IInspectable, Control::KeySentEventArgs> KeySent;
         til::typed_event<IInspectable, Control::CharSentEventArgs> CharSent;
         til::typed_event<IInspectable, Control::StringSentEventArgs> StringSent;
+        til::typed_event<IInspectable, Control::SearchMissingCommandEventArgs> SearchMissingCommand;
 
         // UNDER NO CIRCUMSTANCES SHOULD YOU ADD A (PROJECTED_)FORWARDED_TYPED_EVENT HERE
         // Those attach the handler to the core directly, and will explode if
@@ -218,7 +220,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         BUBBLED_FORWARDED_TYPED_EVENT(CloseTerminalRequested,   IInspectable, IInspectable);
         BUBBLED_FORWARDED_TYPED_EVENT(CompletionsChanged,       IInspectable, Control::CompletionsChangedEventArgs);
         BUBBLED_FORWARDED_TYPED_EVENT(RestartTerminalRequested, IInspectable, IInspectable);
-        BUBBLED_FORWARDED_TYPED_EVENT(SearchMissingCommand,     IInspectable, Control::SearchMissingCommandEventArgs);
 
         BUBBLED_FORWARDED_TYPED_EVENT(PasteFromClipboard, IInspectable, Control::PasteFromClipboardEventArgs);
 
@@ -403,6 +404,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         void _contextMenuHandler(IInspectable sender, Control::ContextMenuRequestedEventArgs args);
         void _showContextMenuAt(const til::point& controlRelativePos);
+
+        void _bubbleSearchMissingCommand(const IInspectable& sender, const Control::SearchMissingCommandEventArgs& args);
         void _clearQuickFix(const IInspectable& sender, const IInspectable& args);
 
         void _PasteCommandHandler(const IInspectable& sender, const IInspectable& args);

src/cascadia/TerminalControl/TermControl.idl

@@ -149,6 +149,7 @@ namespace Microsoft.Terminal.Control
 
         void ShowContextMenu();
         void ShowQuickFixMenu();
+        void ClearQuickFix();
 
         void Detach();
     }