[pull] main from microsoft:main

dep/CLI11/README.md

@@ -1,4 +1,4 @@
 # CLI11
 
-Taken from [release v1.9.1](https://github.com/CLIUtils/CLI11/releases/tag/v1.9.1), source commit
-[5cb3efa](https://github.com/CLIUtils/CLI11/commit/5cb3efabce007c3a0230e4cc2e27da491c646b6c)
+Taken from [release v2.4.1](https://github.com/CLIUtils/CLI11/releases/tag/v2.4.1), source commit
+[f4d0731](https://github.com/CLIUtils/CLI11/commit/f4d0731cebb123ff0ace712c099dffbcd2c58e5a)

dep/CLI11/cgmanifest.json

@@ -6,7 +6,7 @@
         "type": "git",
         "git": {
           "repositoryUrl": "https://github.com/CLIUtils/CLI11",
-          "commitHash": "5cb3efabce007c3a0230e4cc2e27da491c646b6c"
+          "commitHash": "88e9bb17418ee730817d5942894d99a4bdd78fb3"
         }
       }
     }

src/buffer/out/OutputCellView.cpp

@@ -29,7 +29,8 @@ OutputCellView::OutputCellView(const std::wstring_view view,
 // - Reference to UTF-16 character data
 // C26445 - suppressed to enable the `TextBufferTextIterator::operator->` method which needs a non-temporary memory location holding the wstring_view.
 // TODO: GH 2681 - remove this suppression by reconciling the probably bad design of the iterators that leads to this being required.
-[[gsl::suppress(26445)]] const std::wstring_view& OutputCellView::Chars() const noexcept
+GSL_SUPPRESS(26445)
+const std::wstring_view& OutputCellView::Chars() const noexcept
 {
     return _view;
 }

src/buffer/out/textBufferTextIterator.cpp

@@ -25,7 +25,8 @@ TextBufferTextIterator::TextBufferTextIterator(const TextBufferCellIterator& cel
 // Return Value:
 // - Read only UTF-16 text data
 // TODO GH 2682, fix design so this doesn't have to be suppressed.
-[[gsl::suppress(26434)]] const std::wstring_view TextBufferTextIterator::operator*() const noexcept
+GSL_SUPPRESS(26434)
+const std::wstring_view TextBufferTextIterator::operator*() const noexcept
 {
     return _view.Chars();
 }
@@ -35,7 +36,8 @@ TextBufferTextIterator::TextBufferTextIterator(const TextBufferCellIterator& cel
 // Return Value:
 // - Read only UTF-16 text data
 // TODO GH 2682, fix design so this doesn't have to be suppressed.
-[[gsl::suppress(26434)]] const std::wstring_view* TextBufferTextIterator::operator->() const noexcept
+GSL_SUPPRESS(26434)
+const std::wstring_view* TextBufferTextIterator::operator->() const noexcept
 {
     return &_view.Chars();
 }

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -737,8 +737,8 @@ namespace winrt::TerminalApp::implementation
     {
         if (const auto& realArgs = actionArgs.ActionArgs().try_as<ExecuteCommandlineArgs>())
         {
-            auto actions = winrt::single_threaded_vector<ActionAndArgs>(std::move(
-                TerminalPage::ConvertExecuteCommandlineToActions(realArgs)));
+            auto actions = winrt::single_threaded_vector<ActionAndArgs>(
+                TerminalPage::ConvertExecuteCommandlineToActions(realArgs));
 
             if (actions.Size() != 0)
             {

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -1348,7 +1348,7 @@ namespace winrt::TerminalApp::implementation
         // there aren't any recent commands, then just store the new command.
         if (!recentCommands)
         {
-            ApplicationState::SharedInstance().RecentCommands(single_threaded_vector(std::move(std::vector{ command })));
+            ApplicationState::SharedInstance().RecentCommands(single_threaded_vector(std::vector{ command }));
             return;
         }
 

src/cascadia/TerminalControl/HwndTerminal.cpp

@@ -896,7 +896,8 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
         for (size_t tableIndex = 0; tableIndex < 16; tableIndex++)
         {
             // It's using gsl::at to check the index is in bounds, but the analyzer still calls this array-to-pointer-decay
-            [[gsl::suppress(bounds .3)]] renderSettings.SetColorTableEntry(tableIndex, gsl::at(theme.ColorTable, tableIndex));
+            GSL_SUPPRESS(bounds .3)
+            renderSettings.SetColorTableEntry(tableIndex, gsl::at(theme.ColorTable, tableIndex));
         }
 
         publicTerminal->_terminal->SetCursorStyle(static_cast<Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle>(theme.CursorStyle));

src/cascadia/TerminalControl/SearchBoxControl.cpp

@@ -17,6 +17,13 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     {
         InitializeComponent();
 
+        _initialLoadedRevoker = Loaded(winrt::auto_revoke, [weakThis{ get_weak() }](auto&&, auto&&) {
+            if (auto searchbox{ weakThis.get() })
+            {
+                searchbox->_Initialize();
+                searchbox->_initialLoadedRevoker.revoke();
+            }
+        });
         this->CharacterReceived({ this, &SearchBoxControl::_CharacterHandler });
         this->KeyDown({ this, &SearchBoxControl::_KeyDownHandler });
         this->RegisterPropertyChangedCallback(UIElement::VisibilityProperty(), [this](auto&&, auto&&) {
@@ -41,6 +48,165 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         StatusBox().Width(_GetStatusMaxWidth());
     }
 
+    winrt::Windows::Foundation::Rect SearchBoxControl::ContentClipRect() const noexcept
+    {
+        return _contentClipRect;
+    }
+
+    void SearchBoxControl::_ContentClipRect(const winrt::Windows::Foundation::Rect& rect)
+    {
+        if (rect != _contentClipRect)
+        {
+            _contentClipRect = rect;
+            _PropertyChangedHandlers(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"ContentClipRect" });
+        }
+    }
+
+    double SearchBoxControl::OpenAnimationStartPoint() const noexcept
+    {
+        return _openAnimationStartPoint;
+    }
+
+    void SearchBoxControl::_OpenAnimationStartPoint(double y)
+    {
+        if (y != _openAnimationStartPoint)
+        {
+            _openAnimationStartPoint = y;
+            _PropertyChangedHandlers(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"OpenAnimationStartPoint" });
+        }
+    }
+
+    void SearchBoxControl::_UpdateSizeDependents()
+    {
+        const winrt::Windows::Foundation::Size infiniteSize{ std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity() };
+        Measure(infiniteSize);
+        const auto desiredSize = DesiredSize();
+        _OpenAnimationStartPoint(-desiredSize.Height);
+        _ContentClipRect({ 0, 0, desiredSize.Width, desiredSize.Height });
+    }
+
+    void SearchBoxControl::_PlayOpenAnimation()
+    {
+        if (CloseAnimation().GetCurrentState() == Media::Animation::ClockState::Active)
+        {
+            CloseAnimation().Stop();
+        }
+
+        if (OpenAnimation().GetCurrentState() != Media::Animation::ClockState::Active)
+        {
+            OpenAnimation().Begin();
+        }
+    }
+
+    void SearchBoxControl::_PlayCloseAnimation()
+    {
+        if (OpenAnimation().GetCurrentState() == Media::Animation::ClockState::Active)
+        {
+            OpenAnimation().Stop();
+        }
+
+        if (CloseAnimation().GetCurrentState() != Media::Animation::ClockState::Active)
+        {
+            CloseAnimation().Begin();
+        }
+    }
+
+    // Method Description:
+    // - Sets the search box control to its initial state and calls the initialized callback if it's set.
+    void SearchBoxControl::_Initialize()
+    {
+        _UpdateSizeDependents();
+
+        // Search box is in Visible visibility state by default. This is to make
+        // sure DesiredSize() returns the correct size for the search box.
+        // (DesiredSize() seems to report a size of 0,0 until the control is
+        // visible for the first time, i.e not in Collapsed state).
+        // Here, we set the search box to "Closed" state (and hence Collapsed
+        // visibility) after we've updated the size-dependent properties.
+        VisualStateManager::GoToState(*this, L"Closed", false);
+
+        CloseAnimation().Completed([weakThis{ get_weak() }](auto&&, auto&&) {
+            if (auto searchbox{ weakThis.get() })
+            {
+                searchbox->CloseAnimation().Stop();
+                VisualStateManager::GoToState(*searchbox, L"Closed", false);
+            }
+        });
+
+        _initialized = true;
+        if (_initializedCallback)
+        {
+            _initializedCallback();
+            _initializedCallback = nullptr;
+        }
+    }
+
+    bool SearchBoxControl::_AnimationEnabled()
+    {
+        const auto uiSettings = winrt::Windows::UI::ViewManagement::UISettings{};
+        const auto isOsAnimationEnabled = uiSettings.AnimationsEnabled();
+        const auto isAppAnimationEnabled = Media::Animation::Timeline::AllowDependentAnimations();
+        return isOsAnimationEnabled && isAppAnimationEnabled;
+    }
+
+    // Method Description:
+    // - Opens the search box taking a callback to be executed when it's opened.
+    void SearchBoxControl::Open(std::function<void()> callback)
+    {
+        // defer opening the search box until we have initialized our size-dependent
+        // properties so we don't animate to wrong values.
+        if (!_initialized)
+        {
+            _initializedCallback = [this, callback]() { Open(callback); };
+        }
+        else
+        {
+            // don't run animation if we're already open.
+            // Note: We can't apply this check at the beginning of the function because the
+            // search box remains in Visible state (though not really *visible*) during the
+            // first load. So, we only need to apply this check here (after checking that
+            // we're done initializing).
+            if (Visibility() == Visibility::Visible)
+            {
+                callback();
+                return;
+            }
+
+            VisualStateManager::GoToState(*this, L"Opened", false);
+
+            // Call the callback only after we're in Opened state. Setting focus
+            // (through the callback) to a collapsed search box will not work.
+            callback();
+
+            // Don't animate if animation is disabled
+            if (_AnimationEnabled())
+            {
+                _PlayOpenAnimation();
+            }
+        }
+    }
+
+    // Method Description:
+    // - Closes the search box.
+    void SearchBoxControl::Close()
+    {
+        // Nothing to do if we're already closed
+        if (Visibility() == Visibility::Collapsed)
+        {
+            return;
+        }
+
+        if (_AnimationEnabled())
+        {
+            // close animation will set the state to "Closed" in its Completed handler.
+            _PlayCloseAnimation();
+        }
+        else
+        {
+            VisualStateManager::GoToState(*this, L"Closed", false);
+        }
+    }
+
     // Method Description:
     // - Check if the current search direction is forward
     // Arguments:

src/cascadia/TerminalControl/SearchBoxControl.h

@@ -28,7 +28,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         SearchBoxControl();
 
+        winrt::Windows::Foundation::Rect ContentClipRect() const noexcept;
+        double OpenAnimationStartPoint() const noexcept;
+
         void TextBoxKeyDown(const winrt::Windows::Foundation::IInspectable& /*sender*/, const winrt::Windows::UI::Xaml::Input::KeyRoutedEventArgs& e);
+        void Open(std::function<void()> callback);
+        void Close();
 
         void SetFocusOnTextbox();
         void PopulateTextbox(const winrt::hstring& text);
@@ -44,12 +49,26 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         void TextBoxTextChanged(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
         void CaseSensitivityButtonClicked(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
 
+        WINRT_CALLBACK(PropertyChanged, winrt::Windows::UI::Xaml::Data::PropertyChangedEventHandler);
         WINRT_CALLBACK(Search, SearchHandler);
         WINRT_CALLBACK(SearchChanged, SearchHandler);
         TYPED_EVENT(Closed, Control::SearchBoxControl, Windows::UI::Xaml::RoutedEventArgs);
 
     private:
         std::unordered_set<winrt::Windows::Foundation::IInspectable> _focusableElements;
+        winrt::Windows::Foundation::Rect _contentClipRect{ 0, 0, 0, 0 };
+        double _openAnimationStartPoint = 0;
+        winrt::Windows::UI::Xaml::FrameworkElement::Loaded_revoker _initialLoadedRevoker;
+        bool _initialized = false;
+        std::function<void()> _initializedCallback;
+
+        void _Initialize();
+        void _UpdateSizeDependents();
+        void _ContentClipRect(const winrt::Windows::Foundation::Rect& rect);
+        void _OpenAnimationStartPoint(double y);
+        void _PlayOpenAnimation();
+        void _PlayCloseAnimation();
+        bool _AnimationEnabled();
 
         static winrt::hstring _FormatStatus(int32_t totalMatches, int32_t currentMatch);
         static double _TextWidth(winrt::hstring text, double fontSize);

src/cascadia/TerminalControl/SearchBoxControl.idl

@@ -5,13 +5,15 @@ namespace Microsoft.Terminal.Control
 {
     delegate void SearchHandler(String query, Boolean goForward, Boolean isCaseSensitive);
 
-    [default_interface] runtimeclass SearchBoxControl : Windows.UI.Xaml.Controls.UserControl
+    [default_interface] runtimeclass SearchBoxControl : Windows.UI.Xaml.Controls.UserControl, Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
         SearchBoxControl();
         void SetFocusOnTextbox();
         void PopulateTextbox(String text);
         Boolean ContainsFocus();
         void SetStatus(Int32 totalMatches, Int32 currentMatch);
+        Windows.Foundation.Rect ContentClipRect{ get; };
+        Double OpenAnimationStartPoint{ get; };
 
         Boolean NavigationEnabled;
 

src/cascadia/TerminalControl/SearchBoxControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="Microsoft.Terminal.Control.SearchBoxControl"
+<UserControl x:Class="Microsoft.Terminal.Control.SearchBoxControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -142,9 +142,38 @@
                     </Style>
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
+
+            <Duration x:Key="SearchBoxAnimationDuration">0:0:0.3</Duration>
+            <ExponentialEase x:Key="OpenAnimationEase"
+                             EasingMode="EaseOut"
+                             Exponent="6" />
+            <ExponentialEase x:Key="CloseAnimationEase"
+                             EasingMode="EaseIn"
+                             Exponent="6" />
+            <Storyboard x:Name="OpenAnimation">
+                <DoubleAnimation EasingFunction="{StaticResource OpenAnimationEase}"
+                                 Storyboard.TargetName="Transform"
+                                 Storyboard.TargetProperty="Y"
+                                 From="{x:Bind OpenAnimationStartPoint, Mode=OneWay}"
+                                 To="0"
+                                 Duration="{StaticResource SearchBoxAnimationDuration}" />
+            </Storyboard>
+            <Storyboard x:Name="CloseAnimation">
+                <DoubleAnimation EasingFunction="{StaticResource CloseAnimationEase}"
+                                 Storyboard.TargetName="Transform"
+                                 Storyboard.TargetProperty="Y"
+                                 From="0"
+                                 To="{x:Bind OpenAnimationStartPoint, Mode=OneWay}"
+                                 Duration="{StaticResource SearchBoxAnimationDuration}" />
+            </Storyboard>
+
         </ResourceDictionary>
     </UserControl.Resources>
 
+    <UserControl.Clip>
+        <RectangleGeometry Rect="{x:Bind ContentClipRect, Mode=OneWay}" />
+    </UserControl.Clip>
+
     <StackPanel Margin="8"
                 Padding="4,8"
                 Background="{ThemeResource FlyoutPresenterBackground}"
@@ -154,6 +183,10 @@
                 Orientation="Horizontal"
                 Shadow="{StaticResource SharedShadow}"
                 Translation="0,0,16">
+        <StackPanel.RenderTransform>
+            <TranslateTransform x:Name="Transform" />
+        </StackPanel.RenderTransform>
+
         <TextBox x:Name="TextBox"
                  x:Uid="SearchBox_TextBox"
                  Width="160"
@@ -220,5 +253,23 @@
                       FontSize="12"
                       Glyph="&#xE711;" />
         </Button>
+
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="SearchBoxStates">
+
+                <VisualState x:Name="Opened">
+                    <VisualState.Setters>
+                        <Setter Target="Root.Visibility" Value="Visible" />
+                    </VisualState.Setters>
+                </VisualState>
+
+                <VisualState x:Name="Closed">
+                    <VisualState.Setters>
+                        <Setter Target="Root.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </StackPanel>
 </UserControl>