Add action for Quick Fix and key binding for Suggestions

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -1599,8 +1599,8 @@ namespace winrt::TerminalApp::implementation
     {
         if (const auto& control{ _GetActiveControl() })
         {
-            control.OpenQuickFixMenu();
+            const auto handled = control.OpenQuickFixMenu();
+            args.Handled(handled);
         }
-        args.Handled(true);
     }
 }

src/cascadia/TerminalControl/TermControl.cpp

@@ -340,6 +340,19 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 }
             }
         });
+        if constexpr (Feature_QuickFix::IsEnabled())
+        {
+            QuickFixMenu().Closed([weakThis = get_weak()](auto&&, auto&&) {
+                if (auto control{ weakThis.get() }; control && !control->_IsClosing())
+                {
+                    // Expand the quick fix button if it's collapsed (looks nicer)
+                    if (control->_quickFixButtonCollapsible)
+                    {
+                        VisualStateManager::GoToState(*control, StateCollapsed, false);
+                    }
+                }
+            });
+        }
     }
 
     void TermControl::_QuickFixButton_PointerEntered(const IInspectable& /*sender*/, const PointerRoutedEventArgs& /*e*/)
@@ -3555,8 +3568,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         if (Feature_QuickFix::IsEnabled())
         {
-            auto quickFixBtn = FindName(L"QuickFixButton").as<Controls::Button>();
-            quickFixBtn.Height(args.Height() / dpiScale);
+            QuickFixButton().Height(args.Height() / dpiScale);
             QuickFixIcon().FontSize(static_cast<double>(args.Width() / dpiScale));
             RefreshQuickFixMenu();
         }
@@ -3892,24 +3904,20 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         return std::max(CharacterDimensions().Width * 2.0 / 3.0, GetPadding().Left);
     }
 
-    void TermControl::OpenQuickFixMenu()
+    bool TermControl::OpenQuickFixMenu()
     {
         if (Feature_QuickFix::IsEnabled() && _core.QuickFixesAvailable())
         {
             // Expand the quick fix button if it's collapsed (looks nicer)
             if (_quickFixButtonCollapsible)
             {
                 VisualStateManager::GoToState(*this, StateNormal, false);
-                QuickFixButton().Flyout().Closing([weakThis = get_weak()](auto& /*sender*/, auto& /*args*/) {
-                    if (auto termCtrl = weakThis.get())
-                    {
-                        VisualStateManager::GoToState(*termCtrl, StateCollapsed, false);
-                    }
-                });
             }
             auto quickFixBtn = QuickFixButton();
             quickFixBtn.Flyout().ShowAt(quickFixBtn);
+            return true;
         }
+        return false;
     }
 
     void TermControl::RefreshQuickFixMenu()
@@ -3919,7 +3927,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             return;
         }
 
-        auto quickFixBtn = FindName(L"QuickFixButton").as<Controls::Button>();
+        auto quickFixBtn = QuickFixButton();
         if (!_core.QuickFixesAvailable())
         {
             quickFixBtn.Visibility(Visibility::Collapsed);

src/cascadia/TerminalControl/TermControl.h

@@ -182,7 +182,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         void RawWriteString(const winrt::hstring& text);
 
         void ShowContextMenu();
-        void OpenQuickFixMenu();
+        bool OpenQuickFixMenu();
         void RefreshQuickFixMenu();
         void ClearQuickFix();
 

src/cascadia/TerminalControl/TermControl.idl

@@ -149,7 +149,7 @@ namespace Microsoft.Terminal.Control
         Double QuickFixButtonCollapsedWidth { get; };
 
         void ShowContextMenu();
-        void OpenQuickFixMenu();
+        Boolean OpenQuickFixMenu();
         void RefreshQuickFixMenu();
         void ClearQuickFix();
 

src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw

@@ -735,6 +735,6 @@
     <value>Save Snippet</value>
   </data>
   <data name="QuickFixCommandKey" xml:space="preserve">
-    <value>Quick fix</value>
+    <value>Open quick fix menu</value>
   </data>
 </root>

src/cascadia/TerminalSettingsModel/defaults.json

@@ -447,6 +447,7 @@
         { "command": "restoreLastClosed", "id": "Terminal.RestoreLastClosed" },
         { "command": "openAbout", "id": "Terminal.OpenAboutDialog" },
         { "command": "experimental.openTasks", "id": "Terminal.OpenTasks" },
+        { "command": "quickFix", "id": "Terminal.QuickFix" },
         { "command": { "action": "showSuggestions", "source": "all"}, "id": "Terminal.Suggestions" },
 
         // Tab Management