Handle key chord parse failure

microsoft · Jan 2, 2024 · 5d99e7b · 5d99e7b
1 parent dd46338
commit 5d99e7b
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 13 deletions.
diff --git a/src/cascadia/TerminalApp/AppActionHandlers.cpp b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -1258,13 +1258,26 @@ namespace winrt::TerminalApp::implementation
                 winrt::Microsoft::Terminal::Control::KeyChord keyChord = nullptr;
                 if (!realArgs.KeyChord().empty())
                 {
-                    keyChord = KeyChordSerialization::FromString(winrt::to_hstring(realArgs.KeyChord()));
+                    try
+                    {
+                        keyChord = KeyChordSerialization::FromString(winrt::to_hstring(realArgs.KeyChord()));
+                        _settings.GlobalSettings().ActionMap().AddSendInputAction(realArgs.Name(), realArgs.Commandline(), keyChord);
+                        _settings.WriteSettingsToDisk();
+                        ActionSaved(realArgs.Commandline(), realArgs.Name(), KeyChordSerialization::ToString(keyChord));
+                    }
+                    catch (const winrt::hresult_error& ex)
+                    {
+                        auto code = ex.code();
+                        auto message = ex.message();
+                        ActionSaveFailed(message);
+                        return;
+                    }
                 }
 
                 _settings.GlobalSettings().ActionMap().AddSendInputAction(realArgs.Name(), realArgs.Commandline(), keyChord);
-
                 _settings.WriteSettingsToDisk();
                 ActionSaved(realArgs.Commandline(), realArgs.Name(), KeyChordSerialization::ToString(keyChord));
+
                 args.Handled(true);
             }
         }

diff --git a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
@@ -560,16 +560,6 @@ void AppCommandlineArgs::_buildSaveParser()
             // as it might clear those options while finding the commandline
             SaveTaskArgs args{};
 
-            if (!_saveInputName.empty())
-            {
-                winrt::hstring hString = winrt::to_hstring(_saveInputName);
-                args.Name(hString);
-            }
-            else
-            {
-                args.Name(args.GenerateName());
-            }
-
             if (!_commandline.empty())
             {
                 std::ostringstream cmdlineBuffer;
@@ -599,6 +589,16 @@ void AppCommandlineArgs::_buildSaveParser()
             {
                 args.KeyChord(winrt::to_hstring(_keyChordOption));
             }
+
+            if (!_saveInputName.empty())
+            {
+                winrt::hstring hString = winrt::to_hstring(_saveInputName);
+                args.Name(hString);
+            }
+            else
+            {
+                args.Name(args.GenerateName());
+            }
 
             saveAction.Args(args);
             _startupActions.push_back(saveAction);

diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -4235,6 +4235,35 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
+    winrt::fire_and_forget TerminalPage::ActionSaveFailed(winrt::hstring message)
+    {
+        auto weakThis{ get_weak() };
+        co_await wil::resume_foreground(Dispatcher());
+        if (auto page{ weakThis.get() })
+        {
+            // If we haven't ever loaded the TeachingTip, then do so now and
+            // create the toast for it.
+            if (page->_actionSaveFailedToast == nullptr)
+            {
+                if (auto tip{ page->FindName(L"ActionSaveFailedToast").try_as<MUX::Controls::TeachingTip>() })
+                {
+                    page->_actionSaveFailedToast = std::make_shared<Toast>(tip);
+                    // Make sure to use the weak ref when setting up this
+                    // callback.
+                    tip.Closed({ page->get_weak(), &TerminalPage::_FocusActiveControl });
+                }
+            }
+            _UpdateTeachingTipTheme(ActionSaveFailedToast().try_as<winrt::Windows::UI::Xaml::FrameworkElement>());
+
+            ActionSaveFailedMessage().Text(message);
+
+            if (page->_actionSaveFailedToast != nullptr)
+            {
+                page->_actionSaveFailedToast->Open();
+            }
+        }
+    }
+
     // Method Description:
     // - Called when an attempt to rename the window has failed. This will open
     //   the toast displaying a message to the user that the attempt to rename

diff --git a/src/cascadia/TerminalApp/TerminalPage.h b/src/cascadia/TerminalApp/TerminalPage.h
@@ -150,6 +150,7 @@ namespace winrt::TerminalApp::implementation
 
         winrt::fire_and_forget IdentifyWindow();
         winrt::fire_and_forget ActionSaved(winrt::hstring input, winrt::hstring name, winrt::hstring keyChord);
+        winrt::fire_and_forget ActionSaveFailed(winrt::hstring message);
         winrt::fire_and_forget RenameFailed();
         winrt::fire_and_forget ShowTerminalWorkingDirectory();
 
@@ -262,6 +263,7 @@ namespace winrt::TerminalApp::implementation
 
         std::shared_ptr<Toast> _windowIdToast{ nullptr };
         std::shared_ptr<Toast> _actionSavedToast{ nullptr };
+        std::shared_ptr<Toast> _actionSaveFailedToast{ nullptr };
         std::shared_ptr<Toast> _windowRenameFailedToast{ nullptr };
         std::shared_ptr<Toast> _windowCwdToast{ nullptr };
 

diff --git a/src/cascadia/TerminalApp/TerminalPage.xaml b/src/cascadia/TerminalApp/TerminalPage.xaml
@@ -233,5 +233,14 @@
                 </StackPanel>
             </mux:TeachingTip.Content>
         </mux:TeachingTip>
+        <mux:TeachingTip x:Name="ActionSaveFailedToast"
+                         x:Uid="ActionSaveFailedToast"
+                         Title="Action Save Failed"
+                         x:Load="False"
+                         IsLightDismissEnabled="True">
+            <mux:TeachingTip.Content>
+                <TextBox x:Name="ActionSaveFailedMessage" Text="" />
+            </mux:TeachingTip.Content>
+        </mux:TeachingTip>
     </Grid>
 </Page>
diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp
@@ -945,7 +945,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         return winrt::hstring{
             fmt::format(L"Save Task commandline:{}, name: {}, keyChord {}", Commandline(), Name(), KeyChord())
         };
-    }
+     }
 
     static winrt::hstring _FormatColorString(const Control::SelectionColor& selectionColor)
     {