From 7d6c61a1cb07c129d23afced38526680a29abbf2 Mon Sep 17 00:00:00 2001
From: khvitaly <khvitaly@gmail.com>
Date: Mon, 7 Dec 2020 15:13:01 +0200
Subject: [PATCH 1/7] Introduce parsed command line text to command palette

---
 .../CommandlineTest.cpp                       |  6 +--
 .../TerminalApp/AppActionHandlers.cpp         |  2 +-
 .../TerminalApp/AppCommandlineArgs.cpp        | 43 +++++++++++++++++++
 src/cascadia/TerminalApp/AppCommandlineArgs.h |  2 +
 src/cascadia/TerminalApp/CommandPalette.cpp   | 32 +++++++++++++-
 src/cascadia/TerminalApp/CommandPalette.h     |  1 +
 src/cascadia/TerminalApp/CommandPalette.idl   |  1 +
 src/cascadia/TerminalApp/CommandPalette.xaml  | 38 ++++++++++++++++
 .../Resources/en-US/Resources.resw            |  7 +++
 src/cascadia/TerminalApp/TerminalPage.cpp     | 43 -------------------
 src/cascadia/TerminalApp/TerminalPage.h       |  1 -
 11 files changed, 127 insertions(+), 49 deletions(-)

diff --git a/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp b/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
index b9261c1c683..5afeee18f81 100644
--- a/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
@@ -1124,7 +1124,7 @@ namespace TerminalAppLocalTests
     void CommandlineTest::TestSimpleExecuteCommandlineAction()
     {
         ExecuteCommandlineArgs args{ L"new-tab" };
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto actions = AppCommandlineArgs::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(1u, actions.size());
         auto actionAndArgs = actions.at(0);
         VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
@@ -1143,7 +1143,7 @@ namespace TerminalAppLocalTests
     void CommandlineTest::TestMultipleCommandExecuteCommandlineAction()
     {
         ExecuteCommandlineArgs args{ L"new-tab ; split-pane" };
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto actions = AppCommandlineArgs::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(2u, actions.size());
         {
             auto actionAndArgs = actions.at(0);
@@ -1179,7 +1179,7 @@ namespace TerminalAppLocalTests
     {
         // -H and -V cannot be combined.
         ExecuteCommandlineArgs args{ L"split-pane -H -V" };
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto actions = AppCommandlineArgs::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(0u, actions.size());
     }
 
diff --git a/src/cascadia/TerminalApp/AppActionHandlers.cpp b/src/cascadia/TerminalApp/AppActionHandlers.cpp
index 7da1daa6f8e..4cd0de4934a 100644
--- a/src/cascadia/TerminalApp/AppActionHandlers.cpp
+++ b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -434,7 +434,7 @@ 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)));
+                AppCommandlineArgs::ConvertExecuteCommandlineToActions(realArgs)));
 
             if (_startupActions.Size() != 0)
             {
diff --git a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
index 7b7e2138265..08b4922cd25 100644
--- a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
+++ b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
@@ -720,3 +720,46 @@ int AppCommandlineArgs::ParseArgs(winrt::array_view<const winrt::hstring>& args)
     // built in _appArgs, which we'll use when the application starts up.
     return 0;
 }
+
+// Function Description:
+// - This is a helper method to get the commandline out of a
+//   ExecuteCommandline action, break it into subcommands, and attempt to
+//   parse it into actions. This is used by _HandleExecuteCommandline for
+//   processing commandlines in the current WT window.
+// Arguments:
+// - args: the ExecuteCommandlineArgs to synthesize a list of startup actions for.
+// Return Value:
+// - an empty list if we failed to parse, otherwise a list of actions to execute.
+std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs> AppCommandlineArgs::ConvertExecuteCommandlineToActions(const winrt::Microsoft::Terminal::Settings::Model::ExecuteCommandlineArgs& args)
+{
+    if (!args || args.Commandline().empty())
+    {
+        return {};
+    }
+    // Convert the commandline into an array of args with
+    // CommandLineToArgvW, similar to how the app typically does when
+    // called from the commandline.
+    int argc = 0;
+    wil::unique_any<LPWSTR*, decltype(&::LocalFree), ::LocalFree> argv{ CommandLineToArgvW(args.Commandline().c_str(), &argc) };
+    if (argv)
+    {
+        std::vector<winrt::hstring> args;
+
+        // Make sure the first argument is wt.exe, because ParseArgs will
+        // always skip the program name. The particular value of this first
+        // string doesn't terribly matter.
+        args.emplace_back(L"wt.exe");
+        for (auto& elem : wil::make_range(argv.get(), argc))
+        {
+            args.emplace_back(elem);
+        }
+        winrt::array_view<const winrt::hstring> argsView{ args };
+
+        ::TerminalApp::AppCommandlineArgs appArgs;
+        if (appArgs.ParseArgs(argsView) == 0)
+        {
+            return appArgs.GetStartupActions();
+        }
+    }
+    return {};
+}
diff --git a/src/cascadia/TerminalApp/AppCommandlineArgs.h b/src/cascadia/TerminalApp/AppCommandlineArgs.h
index 6a7d08b0e7d..40ef499a042 100644
--- a/src/cascadia/TerminalApp/AppCommandlineArgs.h
+++ b/src/cascadia/TerminalApp/AppCommandlineArgs.h
@@ -40,6 +40,8 @@ class TerminalApp::AppCommandlineArgs final
 
     std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> GetLaunchMode() const noexcept;
 
+    static std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs> ConvertExecuteCommandlineToActions(const winrt::Microsoft::Terminal::Settings::Model::ExecuteCommandlineArgs& args);
+
 private:
     static const std::wregex _commandDelimiterRegex;
 
diff --git a/src/cascadia/TerminalApp/CommandPalette.cpp b/src/cascadia/TerminalApp/CommandPalette.cpp
index 90c1f7f95c1..8a3b928bbd5 100644
--- a/src/cascadia/TerminalApp/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "CommandPalette.h"
-
+#include "AppCommandlineArgs.h"
 #include <LibraryResources.h>
 
 #include "CommandPalette.g.cpp"
@@ -733,6 +733,35 @@ namespace winrt::TerminalApp::implementation
         {
             _noMatchesText().Visibility(Visibility::Collapsed);
         }
+
+        if (_currentMode == CommandPaletteMode::CommandlineMode)
+        {
+            const auto commandLine = _getTrimmedInput();
+            if (commandLine.empty())
+            {
+                ParsedCommandLineText(L"");
+            }
+            else
+            {
+                ExecuteCommandlineArgs args{ commandLine };
+                const auto commands = ::TerminalApp::AppCommandlineArgs::ConvertExecuteCommandlineToActions(args);
+                if (commands.size() == 0)
+                {
+                    ParsedCommandLineText(RS_(L"CommandPalette_FailedParsingCommandLine"));
+                }
+                else
+                {
+                    std::wstring commandDescription{ RS_(L"CommandPalette_ParsedCommandLine") };
+                    for (const auto& command : commands)
+                    {
+                        commandDescription += L"\n\t" + command.Args().GenerateName();
+                    }
+                    ParsedCommandLineText(commandDescription.data());
+                }
+
+                _noMatchesText().Visibility(Visibility::Visible);
+            }
+        }
     }
 
     void CommandPalette::_evaluatePrefix()
@@ -837,6 +866,7 @@ namespace winrt::TerminalApp::implementation
             }
         }
 
+        ParsedCommandLineText(L"");
         _searchBox().Text(L"");
         _searchBox().Select(_searchBox().Text().size(), 0);
         // Leaving this block of code outside the above if-statement
diff --git a/src/cascadia/TerminalApp/CommandPalette.h b/src/cascadia/TerminalApp/CommandPalette.h
index 21c00129307..06c783fcc66 100644
--- a/src/cascadia/TerminalApp/CommandPalette.h
+++ b/src/cascadia/TerminalApp/CommandPalette.h
@@ -56,6 +56,7 @@ namespace winrt::TerminalApp::implementation
         OBSERVABLE_GETSET_PROPERTY(winrt::hstring, PrefixCharacter, _PropertyChangedHandlers);
         OBSERVABLE_GETSET_PROPERTY(winrt::hstring, ControlName, _PropertyChangedHandlers);
         OBSERVABLE_GETSET_PROPERTY(winrt::hstring, ParentCommandName, _PropertyChangedHandlers);
+        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, ParsedCommandLineText, _PropertyChangedHandlers);
 
     private:
         friend struct CommandPaletteT<CommandPalette>; // for Xaml to bind events
diff --git a/src/cascadia/TerminalApp/CommandPalette.idl b/src/cascadia/TerminalApp/CommandPalette.idl
index e75209e7699..aa3e27f4b7b 100644
--- a/src/cascadia/TerminalApp/CommandPalette.idl
+++ b/src/cascadia/TerminalApp/CommandPalette.idl
@@ -17,6 +17,7 @@ namespace TerminalApp
         String PrefixCharacter { get; };
         String ControlName { get; };
         String ParentCommandName { get; };
+        String ParsedCommandLineText { get; };
 
         Windows.Foundation.Collections.IObservableVector<FilteredCommand> FilteredActions { get; };
 
diff --git a/src/cascadia/TerminalApp/CommandPalette.xaml b/src/cascadia/TerminalApp/CommandPalette.xaml
index 680a6be37f4..6f70ad53fab 100644
--- a/src/cascadia/TerminalApp/CommandPalette.xaml
+++ b/src/cascadia/TerminalApp/CommandPalette.xaml
@@ -29,6 +29,7 @@ the MIT License. See LICENSE in the project root for license information. -->
 
             <!-- This creates an instance of our CommandKeyChordVisibilityConverter we can reference below -->
             <local:EmptyStringVisibilityConverter x:Key="CommandKeyChordVisibilityConverter"/>
+            <local:EmptyStringVisibilityConverter x:Key="ParsedCommandLineTextVisibilityConverter"/>
             <local:EmptyStringVisibilityConverter x:Key="ParentCommandVisibilityConverter"/>
             <local:HasNestedCommandsVisibilityConverter x:Key="HasNestedCommandsVisibilityConverter"/>
             <local:IconPathConverter x:Key="IconSourceConverter"/>
@@ -67,6 +68,16 @@ the MIT License. See LICENSE in the project root for license information. -->
                         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
                     </Style>
 
+                    <!--  ParsedCommandLineText styles  -->
+                    <Style x:Key="ParsedCommandLineBorderStyle" TargetType="Border">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="1" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+		    <Style x:Key="ParsedCommandLineTextBlockStyle" TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="Light">
                     <Style x:Key="CommandPaletteBackground" TargetType="Grid">
@@ -98,6 +109,16 @@ the MIT License. See LICENSE in the project root for license information. -->
                         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
                     </Style>
 
+                    <!--  ParsedCommandLineText styles  -->
+                    <Style x:Key="ParsedCommandLineBorderStyle" TargetType="Border">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="1" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+		    <Style x:Key="ParsedCommandLineTextBlockStyle" TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="HighContrast">
                     <Style x:Key="CommandPaletteBackground" TargetType="Grid">
@@ -108,6 +129,9 @@ the MIT License. See LICENSE in the project root for license information. -->
                     <Style x:Key="KeyChordBorderStyle" TargetType="Border"/>
                     <Style x:Key="KeyChordTextBlockStyle" TargetType="TextBlock"/>
 
+                    <!--  ParsedCommandLineText styles (use XAML defaults for High Contrast theme) -->
+                    <Style x:Key="ParsedCommandLineBoderStyle" TargetType="Border"/>
+                    <Style x:Key="ParsedCommandLineTextBlockStyle" TargetType="TextBlock"/>
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
         </ResourceDictionary>
@@ -226,6 +250,20 @@ the MIT License. See LICENSE in the project root for license information. -->
                 Text="{x:Bind NoMatchesText, Mode=OneWay}">
             </TextBlock>
 
+            <Border
+                Grid.Row="1"
+                Visibility="{x:Bind ParsedCommandLineText, Mode=OneWay, Converter={StaticResource ParsedCommandLineTextVisibilityConverter}}"
+                Style="{ThemeResource ParsedCommandLineBorderStyle}"
+		        Padding="16"
+		        HorizontalAlignment="Stretch"
+                VerticalAlignment="Center">
+
+                <TextBlock
+                    FontStyle="Italic"
+                    TextWrapping="Wrap"
+                    Text="{x:Bind ParsedCommandLineText, Mode=OneWay}"/>
+            </Border>
+
             <ListView
                 Grid.Row="2"
                 x:Name="_filteredActionsView"
diff --git a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
index d1973062029..1a33258b93f 100644
--- a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
@@ -413,6 +413,13 @@
   <data name="CommandPalette_NoMatchesText.Text" xml:space="preserve">
     <value>No matching commands</value>
   </data>
+  <data name="CommandPalette_ParsedCommandLine" xml:space="preserve">
+    <value>Executing command line will invoke the following commands:</value>
+	<comment>Will be followed by a list of strings describing pased commands</comment>
+  </data>
+  <data name="CommandPalette_FailedParsingCommandLine" xml:space="preserve">
+    <value>Failed parsing command line</value>
+  </data>
   <data name="CommandPaletteControlName" xml:space="preserve">
     <value>Command Palette</value>
   </data>
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index eab3929e15c..e2bfa75cf8b 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -2633,49 +2633,6 @@ namespace winrt::TerminalApp::implementation
         // TODO GH#3327: Look at what to do with the NC area when we have XAML theming
     }
 
-    // Function Description:
-    // - This is a helper method to get the commandline out of a
-    //   ExecuteCommandline action, break it into subcommands, and attempt to
-    //   parse it into actions. This is used by _HandleExecuteCommandline for
-    //   processing commandlines in the current WT window.
-    // Arguments:
-    // - args: the ExecuteCommandlineArgs to synthesize a list of startup actions for.
-    // Return Value:
-    // - an empty list if we failed to parse, otherwise a list of actions to execute.
-    std::vector<ActionAndArgs> TerminalPage::ConvertExecuteCommandlineToActions(const ExecuteCommandlineArgs& args)
-    {
-        if (!args || args.Commandline().empty())
-        {
-            return {};
-        }
-        // Convert the commandline into an array of args with
-        // CommandLineToArgvW, similar to how the app typically does when
-        // called from the commandline.
-        int argc = 0;
-        wil::unique_any<LPWSTR*, decltype(&::LocalFree), ::LocalFree> argv{ CommandLineToArgvW(args.Commandline().c_str(), &argc) };
-        if (argv)
-        {
-            std::vector<winrt::hstring> args;
-
-            // Make sure the first argument is wt.exe, because ParseArgs will
-            // always skip the program name. The particular value of this first
-            // string doesn't terribly matter.
-            args.emplace_back(L"wt.exe");
-            for (auto& elem : wil::make_range(argv.get(), argc))
-            {
-                args.emplace_back(elem);
-            }
-            winrt::array_view<const winrt::hstring> argsView{ args };
-
-            ::TerminalApp::AppCommandlineArgs appArgs;
-            if (appArgs.ParseArgs(argsView) == 0)
-            {
-                return appArgs.GetStartupActions();
-            }
-        }
-        return {};
-    }
-
     void TerminalPage::_CommandPaletteClosed(const IInspectable& /*sender*/,
                                              const RoutedEventArgs& /*eventArgs*/)
     {
diff --git a/src/cascadia/TerminalApp/TerminalPage.h b/src/cascadia/TerminalApp/TerminalPage.h
index e24ee871020..605621734fd 100644
--- a/src/cascadia/TerminalApp/TerminalPage.h
+++ b/src/cascadia/TerminalApp/TerminalPage.h
@@ -70,7 +70,6 @@ namespace winrt::TerminalApp::implementation
         bool AlwaysOnTop() const;
 
         void SetStartupActions(std::vector<Microsoft::Terminal::Settings::Model::ActionAndArgs>& actions);
-        static std::vector<Microsoft::Terminal::Settings::Model::ActionAndArgs> ConvertExecuteCommandlineToActions(const Microsoft::Terminal::Settings::Model::ExecuteCommandlineArgs& args);
 
         winrt::TerminalApp::IDialogPresenter DialogPresenter() const;
         void DialogPresenter(winrt::TerminalApp::IDialogPresenter dialogPresenter);

From e0739c2b718f82a8e9ef6a89f9144df9da135ce9 Mon Sep 17 00:00:00 2001
From: khvitaly <khvitaly@gmail.com>
Date: Mon, 7 Dec 2020 16:43:56 +0200
Subject: [PATCH 2/7] Introduce support for command line parsing failure
 message

---
 .../CommandlineTest.cpp                       |  6 +--
 .../TerminalApp/AppActionHandlers.cpp         |  2 +-
 .../TerminalApp/AppCommandlineArgs.cpp        | 44 ++++++++++++-------
 src/cascadia/TerminalApp/AppCommandlineArgs.h |  3 +-
 src/cascadia/TerminalApp/CommandPalette.cpp   | 33 +++++++-------
 .../Resources/en-US/Resources.resw            |  2 +-
 src/cascadia/TerminalApp/TerminalPage.cpp     | 20 +++++++++
 src/cascadia/TerminalApp/TerminalPage.h       |  1 +
 8 files changed, 74 insertions(+), 37 deletions(-)

diff --git a/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp b/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
index 5afeee18f81..b9261c1c683 100644
--- a/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
@@ -1124,7 +1124,7 @@ namespace TerminalAppLocalTests
     void CommandlineTest::TestSimpleExecuteCommandlineAction()
     {
         ExecuteCommandlineArgs args{ L"new-tab" };
-        auto actions = AppCommandlineArgs::ConvertExecuteCommandlineToActions(args);
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(1u, actions.size());
         auto actionAndArgs = actions.at(0);
         VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
@@ -1143,7 +1143,7 @@ namespace TerminalAppLocalTests
     void CommandlineTest::TestMultipleCommandExecuteCommandlineAction()
     {
         ExecuteCommandlineArgs args{ L"new-tab ; split-pane" };
-        auto actions = AppCommandlineArgs::ConvertExecuteCommandlineToActions(args);
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(2u, actions.size());
         {
             auto actionAndArgs = actions.at(0);
@@ -1179,7 +1179,7 @@ namespace TerminalAppLocalTests
     {
         // -H and -V cannot be combined.
         ExecuteCommandlineArgs args{ L"split-pane -H -V" };
-        auto actions = AppCommandlineArgs::ConvertExecuteCommandlineToActions(args);
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(0u, actions.size());
     }
 
diff --git a/src/cascadia/TerminalApp/AppActionHandlers.cpp b/src/cascadia/TerminalApp/AppActionHandlers.cpp
index 4cd0de4934a..7da1daa6f8e 100644
--- a/src/cascadia/TerminalApp/AppActionHandlers.cpp
+++ b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -434,7 +434,7 @@ namespace winrt::TerminalApp::implementation
         if (const auto& realArgs = actionArgs.ActionArgs().try_as<ExecuteCommandlineArgs>())
         {
             auto actions = winrt::single_threaded_vector<ActionAndArgs>(std::move(
-                AppCommandlineArgs::ConvertExecuteCommandlineToActions(realArgs)));
+                TerminalPage::ConvertExecuteCommandlineToActions(realArgs)));
 
             if (_startupActions.Size() != 0)
             {
diff --git a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
index 08b4922cd25..55e9bce1fe5 100644
--- a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
+++ b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
@@ -721,21 +721,26 @@ int AppCommandlineArgs::ParseArgs(winrt::array_view<const winrt::hstring>& args)
     return 0;
 }
 
-// Function Description:
-// - This is a helper method to get the commandline out of a
-//   ExecuteCommandline action, break it into subcommands, and attempt to
-//   parse it into actions. This is used by _HandleExecuteCommandline for
-//   processing commandlines in the current WT window.
+// Method Description:
+// - Attempts to parse an array of commandline args into a list of
+//   commands to execute, and then parses these commands. As commands are
+//   successfully parsed, they will generate ShortcutActions for us to be
+//   able to execute. If we fail to parse any commands, we'll return the
+//   error code from the failure to parse that command, and stop processing
+//   additional commands.
+// - The first arg in args should be the program name "wt" (or some variant). It
+//   will be ignored during parsing.
 // Arguments:
-// - args: the ExecuteCommandlineArgs to synthesize a list of startup actions for.
+// - args: ExecuteCommandlineArgs describing the command line to parse
 // Return Value:
-// - an empty list if we failed to parse, otherwise a list of actions to execute.
-std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs> AppCommandlineArgs::ConvertExecuteCommandlineToActions(const winrt::Microsoft::Terminal::Settings::Model::ExecuteCommandlineArgs& args)
+// - 0 if the commandline was successfully parsed
+int AppCommandlineArgs::ParseArgs(const winrt::Microsoft::Terminal::Settings::Model::ExecuteCommandlineArgs& args)
 {
     if (!args || args.Commandline().empty())
     {
-        return {};
+        return 0;
     }
+
     // Convert the commandline into an array of args with
     // CommandLineToArgvW, similar to how the app typically does when
     // called from the commandline.
@@ -754,12 +759,19 @@ std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs> AppComma
             args.emplace_back(elem);
         }
         winrt::array_view<const winrt::hstring> argsView{ args };
-
-        ::TerminalApp::AppCommandlineArgs appArgs;
-        if (appArgs.ParseArgs(argsView) == 0)
-        {
-            return appArgs.GetStartupActions();
-        }
+        return ParseArgs(argsView);
     }
-    return {};
+    return 0;
+}
+
+// Method Description:
+// - Allows disabling addition of help-related info in the exit message
+// Arguments:
+// - none
+// Return Value:
+// - none
+void AppCommandlineArgs::DisableHelpInExitMessage()
+{
+    _app.set_help_flag();
+    _app.set_help_all_flag();
 }
diff --git a/src/cascadia/TerminalApp/AppCommandlineArgs.h b/src/cascadia/TerminalApp/AppCommandlineArgs.h
index 40ef499a042..eaeddc013f5 100644
--- a/src/cascadia/TerminalApp/AppCommandlineArgs.h
+++ b/src/cascadia/TerminalApp/AppCommandlineArgs.h
@@ -40,7 +40,8 @@ class TerminalApp::AppCommandlineArgs final
 
     std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> GetLaunchMode() const noexcept;
 
-    static std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs> ConvertExecuteCommandlineToActions(const winrt::Microsoft::Terminal::Settings::Model::ExecuteCommandlineArgs& args);
+    int ParseArgs(const winrt::Microsoft::Terminal::Settings::Model::ExecuteCommandlineArgs& args);
+    void DisableHelpInExitMessage();
 
 private:
     static const std::wregex _commandDelimiterRegex;
diff --git a/src/cascadia/TerminalApp/CommandPalette.cpp b/src/cascadia/TerminalApp/CommandPalette.cpp
index 8a3b928bbd5..270e2b0d320 100644
--- a/src/cascadia/TerminalApp/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -736,29 +736,32 @@ namespace winrt::TerminalApp::implementation
 
         if (_currentMode == CommandPaletteMode::CommandlineMode)
         {
+            ParsedCommandLineText(L"");
+
             const auto commandLine = _getTrimmedInput();
-            if (commandLine.empty())
-            {
-                ParsedCommandLineText(L"");
-            }
-            else
+            if (!commandLine.empty())
             {
                 ExecuteCommandlineArgs args{ commandLine };
-                const auto commands = ::TerminalApp::AppCommandlineArgs::ConvertExecuteCommandlineToActions(args);
-                if (commands.size() == 0)
+                ::TerminalApp::AppCommandlineArgs appArgs;
+                appArgs.DisableHelpInExitMessage();
+
+                if (appArgs.ParseArgs(args) == 0)
                 {
-                    ParsedCommandLineText(RS_(L"CommandPalette_FailedParsingCommandLine"));
+                    const auto& commands = appArgs.GetStartupActions();
+                    if (commands.size() > 0)
+                    {
+                        std::wstring commandDescription{ RS_(L"CommandPalette_ParsedCommandLine") + L":" };
+                        for (const auto& command : commands)
+                        {
+                            commandDescription += L"\n\t" + command.Args().GenerateName();
+                        }
+                        ParsedCommandLineText(commandDescription.data());
+                    }
                 }
                 else
                 {
-                    std::wstring commandDescription{ RS_(L"CommandPalette_ParsedCommandLine") };
-                    for (const auto& command : commands)
-                    {
-                        commandDescription += L"\n\t" + command.Args().GenerateName();
-                    }
-                    ParsedCommandLineText(commandDescription.data());
+                    ParsedCommandLineText(RS_(L"CommandPalette_FailedParsingCommandLine") + L":\n\t" + til::u8u16(appArgs.GetExitMessage()));
                 }
-
                 _noMatchesText().Visibility(Visibility::Visible);
             }
         }
diff --git a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
index 1a33258b93f..d1fca0396cf 100644
--- a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
@@ -414,7 +414,7 @@
     <value>No matching commands</value>
   </data>
   <data name="CommandPalette_ParsedCommandLine" xml:space="preserve">
-    <value>Executing command line will invoke the following commands:</value>
+    <value>Executing command line will invoke the following commands</value>
 	<comment>Will be followed by a list of strings describing pased commands</comment>
   </data>
   <data name="CommandPalette_FailedParsingCommandLine" xml:space="preserve">
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index e2bfa75cf8b..1e7b3b08e77 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -2633,6 +2633,26 @@ namespace winrt::TerminalApp::implementation
         // TODO GH#3327: Look at what to do with the NC area when we have XAML theming
     }
 
+    // Function Description:
+    // - This is a helper method to get the commandline out of a
+    //   ExecuteCommandline action, break it into subcommands, and attempt to
+    //   parse it into actions. This is used by _HandleExecuteCommandline for
+    //   processing commandlines in the current WT window.
+    // Arguments:
+    // - args: the ExecuteCommandlineArgs to synthesize a list of startup actions for.
+    // Return Value:
+    // - an empty list if we failed to parse, otherwise a list of actions to execute.
+    std::vector<ActionAndArgs> TerminalPage::ConvertExecuteCommandlineToActions(const ExecuteCommandlineArgs& args)
+    {
+        ::TerminalApp::AppCommandlineArgs appArgs;
+        if (appArgs.ParseArgs(args) == 0)
+        {
+            return appArgs.GetStartupActions();
+        }
+
+        return {};
+    }
+
     void TerminalPage::_CommandPaletteClosed(const IInspectable& /*sender*/,
                                              const RoutedEventArgs& /*eventArgs*/)
     {
diff --git a/src/cascadia/TerminalApp/TerminalPage.h b/src/cascadia/TerminalApp/TerminalPage.h
index 605621734fd..e24ee871020 100644
--- a/src/cascadia/TerminalApp/TerminalPage.h
+++ b/src/cascadia/TerminalApp/TerminalPage.h
@@ -70,6 +70,7 @@ namespace winrt::TerminalApp::implementation
         bool AlwaysOnTop() const;
 
         void SetStartupActions(std::vector<Microsoft::Terminal::Settings::Model::ActionAndArgs>& actions);
+        static std::vector<Microsoft::Terminal::Settings::Model::ActionAndArgs> ConvertExecuteCommandlineToActions(const Microsoft::Terminal::Settings::Model::ExecuteCommandlineArgs& args);
 
         winrt::TerminalApp::IDialogPresenter DialogPresenter() const;
         void DialogPresenter(winrt::TerminalApp::IDialogPresenter dialogPresenter);

From dc33d613fb1c1fe05f73d69fe744692ddf6a0df8 Mon Sep 17 00:00:00 2001
From: khvitaly <khvitaly@gmail.com>
Date: Mon, 7 Dec 2020 20:56:20 +0200
Subject: [PATCH 3/7] Fix typo in resource comment

---
 src/cascadia/TerminalApp/Resources/en-US/Resources.resw | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
index d1fca0396cf..0137c8078ca 100644
--- a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
@@ -415,7 +415,7 @@
   </data>
   <data name="CommandPalette_ParsedCommandLine" xml:space="preserve">
     <value>Executing command line will invoke the following commands</value>
-	<comment>Will be followed by a list of strings describing pased commands</comment>
+	<comment>Will be followed by a list of strings describing parsed commands</comment>
   </data>
   <data name="CommandPalette_FailedParsingCommandLine" xml:space="preserve">
     <value>Failed parsing command line</value>

From a39dc0de062aa77f51ba4bfa5a4d3a9ddb593f57 Mon Sep 17 00:00:00 2001
From: khvitaly <khvitaly@gmail.com>
Date: Sat, 12 Dec 2020 01:09:13 +0200
Subject: [PATCH 4/7] Introduce command line args as a member of CmdPal to
 reduce allocations

---
 .../TerminalApp/AppCommandlineArgs.cpp        | 21 +++++++++++++++++--
 src/cascadia/TerminalApp/AppCommandlineArgs.h |  8 +++----
 src/cascadia/TerminalApp/CommandPalette.cpp   | 15 +++++++------
 src/cascadia/TerminalApp/CommandPalette.h     |  2 ++
 .../Resources/en-US/Resources.resw            |  6 +++---
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
index 55e9bce1fe5..4fcf9026c7b 100644
--- a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
+++ b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
@@ -767,11 +767,28 @@ int AppCommandlineArgs::ParseArgs(const winrt::Microsoft::Terminal::Settings::Mo
 // Method Description:
 // - Allows disabling addition of help-related info in the exit message
 // Arguments:
-// - none
+// - <none>
 // Return Value:
-// - none
+// - <none>
 void AppCommandlineArgs::DisableHelpInExitMessage()
 {
     _app.set_help_flag();
     _app.set_help_all_flag();
 }
+
+// Method Description:
+// - Resets the state to allow external consumers to reuse this instance
+// Arguments:
+// - <none>
+// Return Value:
+// - <none>
+void AppCommandlineArgs::FullResetState()
+{
+    _resetStateToDefault();
+
+    _currentCommandline = nullptr;
+    _launchMode = std::nullopt;
+    _startupActions.clear();
+    _exitMessage = "";
+    _shouldExitEarly = false;
+}
diff --git a/src/cascadia/TerminalApp/AppCommandlineArgs.h b/src/cascadia/TerminalApp/AppCommandlineArgs.h
index eaeddc013f5..984a2b123d6 100644
--- a/src/cascadia/TerminalApp/AppCommandlineArgs.h
+++ b/src/cascadia/TerminalApp/AppCommandlineArgs.h
@@ -42,6 +42,7 @@ class TerminalApp::AppCommandlineArgs final
 
     int ParseArgs(const winrt::Microsoft::Terminal::Settings::Model::ExecuteCommandlineArgs& args);
     void DisableHelpInExitMessage();
+    void FullResetState();
 
 private:
     static const std::wregex _commandDelimiterRegex;
@@ -83,21 +84,20 @@ class TerminalApp::AppCommandlineArgs final
     // _commandline will contain the command line with which we'll be spawning a new terminal
     std::vector<std::string> _commandline;
 
-    const Commandline* _currentCommandline{ nullptr };
-
     bool _splitVertical{ false };
     bool _splitHorizontal{ false };
 
     int _focusTabIndex{ -1 };
     bool _focusNextTab{ false };
     bool _focusPrevTab{ false };
-
-    std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> _launchMode{ std::nullopt };
     // Are you adding more args here? Make sure to reset them in _resetStateToDefault
 
+    const Commandline* _currentCommandline{ nullptr };
+    std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> _launchMode{ std::nullopt };
     std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs> _startupActions;
     std::string _exitMessage;
     bool _shouldExitEarly{ false };
+    // Are you adding more args or attributes here? If they are not reset in _resetStateToDefault, make sure to reset them in FullResetState
 
     winrt::Microsoft::Terminal::Settings::Model::NewTerminalArgs _getNewTerminalArgs(NewTerminalSubcommand& subcommand);
     void _addNewTerminalArgs(NewTerminalSubcommand& subcommand);
diff --git a/src/cascadia/TerminalApp/CommandPalette.cpp b/src/cascadia/TerminalApp/CommandPalette.cpp
index 92b9a04c333..37bb79bbda9 100644
--- a/src/cascadia/TerminalApp/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -6,7 +6,6 @@
 #include "TabPaletteItem.h"
 #include "CommandLinePaletteItem.h"
 #include "CommandPalette.h"
-#include "AppCommandlineArgs.h"
 #include <LibraryResources.h>
 
 #include "CommandPalette.g.cpp"
@@ -99,6 +98,8 @@ namespace winrt::TerminalApp::implementation
         });
 
         _filteredActionsView().SelectionChanged({ this, &CommandPalette::_selectedCommandChanged });
+
+        _appArgs.DisableHelpInExitMessage();
     }
 
     // Method Description:
@@ -802,15 +803,13 @@ namespace winrt::TerminalApp::implementation
             if (!commandLine.empty())
             {
                 ExecuteCommandlineArgs args{ commandLine };
-                ::TerminalApp::AppCommandlineArgs appArgs;
-                appArgs.DisableHelpInExitMessage();
-
-                if (appArgs.ParseArgs(args) == 0)
+                _appArgs.FullResetState();
+                if (_appArgs.ParseArgs(args) == 0)
                 {
-                    const auto& commands = appArgs.GetStartupActions();
+                    const auto& commands = _appArgs.GetStartupActions();
                     if (commands.size() > 0)
                     {
-                        std::wstring commandDescription{ RS_(L"CommandPalette_ParsedCommandLine") + L":" };
+                        std::wstring commandDescription{ RS_(L"CommandPalette_ParsedCommandLine") };
                         for (const auto& command : commands)
                         {
                             commandDescription += L"\n\t" + command.Args().GenerateName();
@@ -820,7 +819,7 @@ namespace winrt::TerminalApp::implementation
                 }
                 else
                 {
-                    ParsedCommandLineText(RS_(L"CommandPalette_FailedParsingCommandLine") + L":\n\t" + til::u8u16(appArgs.GetExitMessage()));
+                    ParsedCommandLineText(RS_(L"CommandPalette_FailedParsingCommandLine") + L"\n\t" + til::u8u16(_appArgs.GetExitMessage()));
                 }
                 _noMatchesText().Visibility(Visibility::Visible);
             }
diff --git a/src/cascadia/TerminalApp/CommandPalette.h b/src/cascadia/TerminalApp/CommandPalette.h
index aac3bfd0afc..07a20f56bb4 100644
--- a/src/cascadia/TerminalApp/CommandPalette.h
+++ b/src/cascadia/TerminalApp/CommandPalette.h
@@ -5,6 +5,7 @@
 
 #include "FilteredCommand.h"
 #include "CommandPalette.g.h"
+#include "AppCommandlineArgs.h"
 #include "../../cascadia/inc/cppwinrt_utils.h"
 
 // fwdecl unittest classes
@@ -129,6 +130,7 @@ namespace winrt::TerminalApp::implementation
 
         static constexpr int CommandLineHistoryLength = 10;
         Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand> _commandLineHistory{ nullptr };
+        ::TerminalApp::AppCommandlineArgs _appArgs;
 
         friend class TerminalAppLocalTests::TabTests;
     };
diff --git a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
index 88dc24222e8..d2747322c42 100644
--- a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
@@ -414,11 +414,11 @@
     <value>No matching commands</value>
   </data>
   <data name="CommandPalette_ParsedCommandLine" xml:space="preserve">
-    <value>Executing command line will invoke the following commands</value>
+    <value>Executing command line will invoke the following commands:</value>
 	<comment>Will be followed by a list of strings describing parsed commands</comment>
   </data>
   <data name="CommandPalette_FailedParsingCommandLine" xml:space="preserve">
-    <value>Failed parsing command line</value>
+    <value>Failed parsing command line:</value>
   </data>
   <data name="CommandPaletteControlName" xml:space="preserve">
     <value>Command Palette</value>
@@ -520,4 +520,4 @@
   <data name="NoticeWarning" xml:space="preserve">
     <value>Warning</value>
   </data>
-</root>
\ No newline at end of file
+</root>

From 39553a3ec51b522f45369452ec01f28eff952b05 Mon Sep 17 00:00:00 2001
From: khvitaly <khvitaly@gmail.com>
Date: Wed, 16 Dec 2020 03:23:15 +0200
Subject: [PATCH 5/7] Fix spacing in CmdPal xaml

---
 src/cascadia/TerminalApp/CommandPalette.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cascadia/TerminalApp/CommandPalette.xaml b/src/cascadia/TerminalApp/CommandPalette.xaml
index 7b273e874d1..e7277cb0ccb 100644
--- a/src/cascadia/TerminalApp/CommandPalette.xaml
+++ b/src/cascadia/TerminalApp/CommandPalette.xaml
@@ -77,7 +77,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                         <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
                         <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
                     </Style>
-		    <Style x:Key="ParsedCommandLineTextBlockStyle" TargetType="TextBlock">
+                    <Style x:Key="ParsedCommandLineTextBlockStyle" TargetType="TextBlock">
                         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
                     </Style>
                 </ResourceDictionary>
@@ -118,7 +118,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                         <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
                         <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
                     </Style>
-		    <Style x:Key="ParsedCommandLineTextBlockStyle" TargetType="TextBlock">
+                    <Style x:Key="ParsedCommandLineTextBlockStyle" TargetType="TextBlock">
                         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
                     </Style>
                 </ResourceDictionary>

From 75fffb344a8cf4722b6c6ca0d79805d58b015079 Mon Sep 17 00:00:00 2001
From: khvitaly <khvitaly@gmail.com>
Date: Wed, 16 Dec 2020 03:24:43 +0200
Subject: [PATCH 6/7] Cleanup leftover setting noMatchText visible in command
 line mode

---
 src/cascadia/TerminalApp/CommandPalette.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/cascadia/TerminalApp/CommandPalette.cpp b/src/cascadia/TerminalApp/CommandPalette.cpp
index 37bb79bbda9..9543b0a1bec 100644
--- a/src/cascadia/TerminalApp/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -821,7 +821,6 @@ namespace winrt::TerminalApp::implementation
                 {
                     ParsedCommandLineText(RS_(L"CommandPalette_FailedParsingCommandLine") + L"\n\t" + til::u8u16(_appArgs.GetExitMessage()));
                 }
-                _noMatchesText().Visibility(Visibility::Visible);
             }
         }
     }

From dc2459247f85287e8a73a31603187c9b7e95e6ab Mon Sep 17 00:00:00 2001
From: khvitaly <khvitaly@gmail.com>
Date: Wed, 16 Dec 2020 03:40:36 +0200
Subject: [PATCH 7/7] Introduce vertical scroll for parsed command text

---
 src/cascadia/TerminalApp/CommandPalette.xaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/cascadia/TerminalApp/CommandPalette.xaml b/src/cascadia/TerminalApp/CommandPalette.xaml
index e7277cb0ccb..1926b1b0c60 100644
--- a/src/cascadia/TerminalApp/CommandPalette.xaml
+++ b/src/cascadia/TerminalApp/CommandPalette.xaml
@@ -260,10 +260,12 @@ the MIT License. See LICENSE in the project root for license information. -->
 		        HorizontalAlignment="Stretch"
                 VerticalAlignment="Center">
 
-                <TextBlock
-                    FontStyle="Italic"
-                    TextWrapping="Wrap"
-                    Text="{x:Bind ParsedCommandLineText, Mode=OneWay}"/>
+                <ScrollViewer MaxHeight="200" VerticalScrollBarVisibility="Auto">
+                    <TextBlock
+                        FontStyle="Italic"
+                        TextWrapping="Wrap"
+                        Text="{x:Bind ParsedCommandLineText, Mode=OneWay}"/>
+                </ScrollViewer>
             </Border>
 
             <ListView