Move save input behind velocity

Author: e82eric

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -1267,44 +1267,47 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleSaveTask(const IInspectable& /*sender*/,
                                        const ActionEventArgs& args)
     {
-        if (args)
+        if (Feature_SaveTask::IsEnabled())
         {
-            if (const auto& realArgs = args.ActionArgs().try_as<SaveTaskArgs>())
+            if (args)
             {
-                if (realArgs.Commandline().empty())
+                if (const auto& realArgs = args.ActionArgs().try_as<SaveTaskArgs>())
                 {
-                    if (const auto termControl{ _GetActiveControl() })
+                    if (realArgs.Commandline().empty())
                     {
-                        if (termControl.HasSelection())
+                        if (const auto termControl{ _GetActiveControl() })
                         {
-                            const auto selections{ termControl.SelectedText(true) };
-                            const auto selection = std::accumulate(selections.begin(), selections.end(), std::wstring());
-                            realArgs.Commandline(selection);
+                            if (termControl.HasSelection())
+                            {
+                                const auto selections{ termControl.SelectedText(true) };
+                                const auto selection = std::accumulate(selections.begin(), selections.end(), std::wstring());
+                                realArgs.Commandline(selection);
+                            }
                         }
                     }
-                }
 
-                try
-                {
-                    KeyChord keyChord = nullptr;
-                    hstring keyChordText = L"";
-                    if (!realArgs.KeyChord().empty())
+                    try
+                    {
+                        KeyChord keyChord = nullptr;
+                        hstring keyChordText = L"";
+                        if (!realArgs.KeyChord().empty())
+                        {
+                            keyChord = KeyChordSerialization::FromString(winrt::to_hstring(realArgs.KeyChord()));
+                            keyChordText = KeyChordSerialization::ToString(keyChord);
+                        }
+
+                        _settings.GlobalSettings().ActionMap().AddSendInputAction(realArgs.Name(), realArgs.Commandline(), keyChord);
+                        ActionSaved(realArgs.Commandline(), realArgs.Name(), keyChordText);
+                        _settings.WriteSettingsToDisk();
+                    }
+                    catch (const winrt::hresult_error& ex)
                     {
-                        keyChord = KeyChordSerialization::FromString(winrt::to_hstring(realArgs.KeyChord()));
-                        keyChordText = KeyChordSerialization::ToString(keyChord);
+                        const auto message = ex.message();
+                        ActionSaveFailed(message);
                     }
 
-                    _settings.GlobalSettings().ActionMap().AddSendInputAction(realArgs.Name(), realArgs.Commandline(), keyChord);
-                    ActionSaved(realArgs.Commandline(), realArgs.Name(), keyChordText);
-                    _settings.WriteSettingsToDisk();
-                }
-                catch (const winrt::hresult_error& ex)
-                {
-                    const auto message = ex.message();
-                    ActionSaveFailed(message);
+                    args.Handled(true);
                 }
-
-                args.Handled(true);
             }
         }
     }

src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp

@@ -52,7 +52,7 @@ static constexpr std::string_view SwitchToTabKey{ "switchToTab" };
 static constexpr std::string_view TabSearchKey{ "tabSearch" };
 static constexpr std::string_view ToggleAlwaysOnTopKey{ "toggleAlwaysOnTop" };
 static constexpr std::string_view ToggleCommandPaletteKey{ "commandPalette" };
-static constexpr std::string_view SaveTaskKey{ "saveTask" };
+static constexpr std::string_view SaveTaskKey{ "experimental.saveTask" };
 static constexpr std::string_view SuggestionsKey{ "showSuggestions" };
 static constexpr std::string_view ToggleFocusModeKey{ "toggleFocusMode" };
 static constexpr std::string_view SetFocusModeKey{ "setFocusMode" };

src/cascadia/TerminalSettingsModel/ActionArgs.cpp

@@ -950,21 +950,25 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 
     winrt::hstring SaveTaskArgs::GenerateName() const
     {
-        std::wstringstream ss;
+        if (Feature_SaveTask::IsEnabled())
+        {
+            std::wstringstream ss;
 
-        ss << RS_(L"SaveActionNamePrefix").c_str() << L" commandline: " << Commandline().c_str();
+            ss << RS_(L"SaveActionNamePrefix").c_str() << L" commandline: " << Commandline().c_str();
 
-        if (!Name().empty())
-        {
-            ss << L", name: " << Name().c_str();
-        }
+            if (!Name().empty())
+            {
+                ss << L", name: " << Name().c_str();
+            }
 
-        if (!KeyChord().empty())
-        {
-            ss << L", keyChord " << KeyChord().c_str();
-        }
+            if (!KeyChord().empty())
+            {
+                ss << L", keyChord " << KeyChord().c_str();
+            }
 
-        return winrt::hstring{ ss.str() };
+            return winrt::hstring{ ss.str() };
+        }
+        return L"";
     }
 
     static winrt::hstring _FormatColorString(const Control::SelectionColor& selectionColor)

src/features.xml

@@ -155,4 +155,15 @@
         </alwaysEnabledBrandingTokens>
     </feature>
 
+    <feature>
+        <name>Feature_SaveTask</name>
+        <description>Save Input</description>
+        <id>9971</id>
+        <stage>AlwaysDisabled</stage>
+        <alwaysEnabledBrandingTokens>
+            <brandingToken>Dev</brandingToken>
+            <brandingToken>Canary</brandingToken>
+        </alwaysEnabledBrandingTokens>
+    </feature>
+
 </featureStaging>