remove feature flag and WinMD refs; add QuickFixesAvailable API; addr…

…ess some other feedback

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -174,23 +174,6 @@
     </ItemGroup>
   </Target>
 
-  <!-- We need to include some additional files in the package for things like WinGet's Command Not Found -->
-  <Target Name="IncludeAdditionalFilesInPackage">
-    <PropertyGroup>
-      <WinGetAdditionalPackageFileRoot>$(SolutionDir)\src\cascadia\TerminalControl</WinGetAdditionalPackageFileRoot>
-    </PropertyGroup>
-    <ItemGroup>
-      <WinGetAdditionalPackageFile Include="$(WinGetAdditionalPackageFileRoot)\Microsoft.Management.Deployment.winmd">
-        <PackagePath>Microsoft.Management.Deployment.winmd</PackagePath>
-      </WinGetAdditionalPackageFile>
-    </ItemGroup>
-    <ItemGroup>
-      <AppxPackagePayload Include="%(WinGetAdditionalPackageFile.Identity))">
-        <TargetPath>%(WinGetAdditionalPackageFile.PackagePath)</TargetPath>
-      </AppxPackagePayload>
-    </ItemGroup>
-  </Target>
-
   <!-- This is required to get the package dependency in the AppXManifest. -->
   <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
 

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -2934,11 +2934,6 @@ namespace winrt::TerminalApp::implementation
     {
         assert(!Dispatcher().HasThreadAccess());
 
-        if (!Feature_QuickFix::IsEnabled())
-        {
-            co_return;
-        }
-
         std::vector<hstring> suggestions;
         suggestions.reserve(1);
         suggestions.emplace_back(fmt::format(L"winget install {}", args.MissingCommand()));
@@ -2951,7 +2946,7 @@ namespace winrt::TerminalApp::implementation
             co_return;
         }
         term.UpdateWinGetSuggestions(single_threaded_vector<hstring>(std::move(suggestions)));
-        term.ShowQuickFixMenu();
+        term.RefreshQuickFixMenu();
     }
 
     // Method Description:

src/cascadia/TerminalControl/ControlCore.cpp

@@ -13,7 +13,6 @@
 #include <unicode.hpp>
 #include <utils.hpp>
 #include <WinUser.h>
-//#include <winrt/Microsoft.Management.Deployment.h>
 
 #include "EventArgs.h"
 #include "../../renderer/atlas/AtlasEngine.h"
@@ -23,7 +22,6 @@
 #include "ControlCore.g.cpp"
 #include "SelectionColor.g.cpp"
 
-//using namespace winrt::Microsoft::Management::Deployment;
 using namespace ::Microsoft::Console::Types;
 using namespace ::Microsoft::Console::VirtualTerminal;
 using namespace ::Microsoft::Terminal::Core;
@@ -2304,6 +2302,11 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         return *context;
     }
 
+    bool ControlCore::QuickFixesAvailable() const noexcept
+    {
+        return _cachedQuickFixes && _cachedQuickFixes.Size() > 0;
+    }
+
     void ControlCore::UpdateQuickFixes(const Windows::Foundation::Collections::IVector<hstring>& quickFixes)
     {
         _cachedQuickFixes = quickFixes;

src/cascadia/TerminalControl/ControlCore.h

@@ -242,6 +242,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         hstring ReadEntireBuffer() const;
         Control::CommandHistoryContext CommandHistory() const;
+        bool QuickFixesAvailable() const noexcept;
         void UpdateQuickFixes(const Windows::Foundation::Collections::IVector<hstring>& quickFixes);
 
         void AdjustOpacity(const float opacity, const bool relative);

src/cascadia/TerminalControl/ControlCore.idl

@@ -156,6 +156,7 @@ namespace Microsoft.Terminal.Control
 
         String ReadEntireBuffer();
         CommandHistoryContext CommandHistory();
+        Boolean QuickFixesAvailable { get; };
 
         void AdjustOpacity(Single Opacity, Boolean relative);
         void WindowVisibilityChanged(Boolean showOrHide);

src/cascadia/TerminalControl/EventArgs.h

@@ -217,9 +217,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     {
     public:
         SearchMissingCommandEventArgs(const winrt::hstring& missingCommand) :
-            _MissingCommand(missingCommand) {}
+            MissingCommand(missingCommand) {}
 
-        WINRT_PROPERTY(winrt::hstring, MissingCommand);
+        til::property<winrt::hstring> MissingCommand;
     };
 }
 

src/cascadia/TerminalControl/TermControl.cpp

@@ -338,24 +338,17 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 }
             }
         });
-
-        if (Feature_QuickFix::IsEnabled())
-        {
-            auto quickFixBtn{ QuickFixButton() };
-            quickFixBtn.PointerEntered({ get_weak(), &TermControl::QuickFixButton_PointerEntered });
-            quickFixBtn.PointerExited({ get_weak(), &TermControl::QuickFixButton_PointerExited });
-        }
     }
 
-    void TermControl::QuickFixButton_PointerEntered(const IInspectable& /*sender*/, const PointerRoutedEventArgs& /*e*/)
+    void TermControl::_QuickFixButton_PointerEntered(const IInspectable& /*sender*/, const PointerRoutedEventArgs& /*e*/)
     {
         if (!_IsClosing() && _quickFixButtonCollapsible)
         {
             VisualStateManager::GoToState(*this, StateNormal, false);
         }
     }
 
-    void TermControl::QuickFixButton_PointerExited(const IInspectable& /*sender*/, const PointerRoutedEventArgs& /*e*/)
+    void TermControl::_QuickFixButton_PointerExited(const IInspectable& /*sender*/, const PointerRoutedEventArgs& /*e*/)
     {
         if (!_IsClosing() && _quickFixButtonCollapsible)
         {
@@ -838,11 +831,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         // update. If we enabled scrollbar marks, then great, when we handle
         // that message, we'll redraw them.
 
-        if (Feature_QuickFix::IsEnabled())
-        {
-            // update the position of the quick fix menu (in case we changed the padding)
-            ShowQuickFixMenu();
-        }
+        // update the position of the quick fix menu (in case we changed the padding)
+        RefreshQuickFixMenu();
     }
 
     // Method Description:
@@ -2349,7 +2339,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             _updateSelectionMarkers(nullptr, winrt::make<UpdateSelectionMarkersEventArgs>(false));
         }
 
-        ShowQuickFixMenu();
+        RefreshQuickFixMenu();
     }
 
     hstring TermControl::Title()
@@ -3527,13 +3517,10 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         scaleMarker(SelectionStartMarker());
         scaleMarker(SelectionEndMarker());
 
-        if (Feature_QuickFix::IsEnabled())
-        {
-            auto quickFixBtn = QuickFixButton();
-            quickFixBtn.Height(args.Height() / dpiScale);
-            QuickFixIcon().FontSize(std::min(static_cast<double>(args.Width() / dpiScale), GetPadding().Left));
-            ShowQuickFixMenu();
-        }
+        auto quickFixBtn = QuickFixButton();
+        quickFixBtn.Height(args.Height() / dpiScale);
+        QuickFixIcon().FontSize(std::min(static_cast<double>(args.Width() / dpiScale), GetPadding().Left));
+        RefreshQuickFixMenu();
     }
 
     void TermControl::_coreRaisedNotice(const IInspectable& /*sender*/,
@@ -3831,9 +3818,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         return GetPadding().Left / 3.0;
     }
 
-    void TermControl::ShowQuickFixMenu()
+    void TermControl::RefreshQuickFixMenu()
     {
-        if (!_quickFixesAvailable)
+        if (!_core.QuickFixesAvailable())
         {
             QuickFixButton().Visibility(Visibility::Collapsed);
             return;
@@ -3867,14 +3854,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
     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;
-        ShowQuickFixMenu();
+        RefreshQuickFixMenu();
     }
 
     void TermControl::ClearQuickFix()

src/cascadia/TerminalControl/TermControl.h

@@ -181,7 +181,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         void RawWriteString(const winrt::hstring& text);
 
         void ShowContextMenu();
-        void ShowQuickFixMenu();
+        void RefreshQuickFixMenu();
         void ClearQuickFix();
 
         void Detach();
@@ -340,8 +340,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         void _MouseWheelHandler(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& e);
         void _ScrollbarChangeHandler(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::Controls::Primitives::RangeBaseValueChangedEventArgs& e);
 
-        void QuickFixButton_PointerEntered(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& e);
-        void QuickFixButton_PointerExited(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& e);
+        void _QuickFixButton_PointerEntered(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& e);
+        void _QuickFixButton_PointerExited(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& e);
 
         void _GotFocusHandler(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
         void _LostFocusHandler(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);

src/cascadia/TerminalControl/TermControl.idl

@@ -148,7 +148,7 @@ namespace Microsoft.Terminal.Control
         Double CalculateQuickFixButtonCollapsedWidth { get; };
 
         void ShowContextMenu();
-        void ShowQuickFixMenu();
+        void RefreshQuickFixMenu();
         void ClearQuickFix();
 
         void Detach();

src/cascadia/TerminalControl/TermControl.xaml

@@ -1289,7 +1289,9 @@
                                 AllowFocusOnInteraction="False"
                                 CornerRadius="0,5,5,0"
                                 Style="{StaticResource AccentButtonStyle}"
-                                Visibility="Collapsed">
+                                Visibility="Collapsed"
+                                PointerEntered="_QuickFixButton_PointerEntered"
+                                PointerExited="_QuickFixButton_PointerExited">
                             <Button.Content>
                                 <FontIcon x:Name="QuickFixIcon"
                                           HorizontalAlignment="Center"

src/cascadia/TerminalControl/TerminalControlLib.vcxproj

@@ -171,13 +171,6 @@
       <Private>false</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\Microsoft.Management.Deployment.winmd">
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-    </Reference>
-  </ItemGroup>
   <!-- ====================== Compiler & Linker Flags ===================== -->
   <ItemDefinitionGroup>
     <ClCompile>

src/features.xml

@@ -155,15 +155,4 @@
         </alwaysEnabledBrandingTokens>
     </feature>
 
-    <feature>
-        <name>Feature_QuickFix</name>
-        <description>Enables the Quick Fix menu</description>
-        <id>16599</id>
-        <stage>AlwaysDisabled</stage>
-        <alwaysEnabledBrandingTokens>
-            <brandingToken>Dev</brandingToken>
-            <brandingToken>Canary</brandingToken>
-        </alwaysEnabledBrandingTokens>
-    </feature>
-
 </featureStaging>