Implement keybindings to quick edit selection

doc/cascadia/SettingsSchema.md

@@ -129,6 +129,7 @@ For commands with arguments:
 | `duplicateTab` | Make a copy and open the current tab. | | | |
 | `find` | Open the search dialog box. | | | |
 | `moveFocus` | Focus on a different pane depending on direction. | `direction`* | `left`, `right`, `up`, `down` | Direction in which the focus will move. |
+| `moveSelectionPoint` | Modify the existing selection by moving an endpoint. | `direction`* | `left`, `right`, `up`, `down` | Direction in which the focus will move. |
 | `newTab` | Create a new tab. Without any arguments, this will open the default profile in a new tab. | 1. `commandLine`<br>2. `startingDirectory`<br>3. `tabTitle`<br>4. `index`<br>5. `profile` | 1. string<br>2. string<br>3. string<br>4. integer<br>5. string | 1. Executable run within the tab.<br>2. Directory in which the tab will open.<br>3. Title of the new tab.<br>4. Profile that will open based on its position in the dropdown (starting at 0).<br>5. Profile that will open based on its GUID or name. |
 | `nextTab` | Open the tab to the right of the current one. | | | |
 | `openNewTabDropdown` | Open the dropdown menu. | | | |

doc/cascadia/profiles.schema.json

@@ -62,6 +62,15 @@
       ],
       "type": "string"
     },
+    "SelectionExpansionMode": {
+      "enum": [
+        "cell",
+        "word",
+        "line",
+        "viewport",
+        "buffer"
+      ]
+    },
     "Direction": {
       "enum": [
         "left",
@@ -233,6 +242,28 @@
         }
       ]
     },
+    "MoveSelectionPointAction": {
+      "description": "Arguments corresponding to a Move Selection Point Action",
+      "allOf": [
+        { "$ref": "#/definitions/ShortcutAction" },
+        {
+          "properties":
+            { "action": { "type": "string", "pattern": "moveSelectionPoint" },
+            "direction": {
+              "$ref": "#/definitions/Direction",
+              "default": "left",
+              "description": "The direction to move the selection endpoint in."
+            },
+            "expansionMode": {
+              "$ref": "#/definitions/SelectionExpansionMode",
+              "default": "cell",
+              "description": "The unit of expansion that the selection endpoint moves by."
+            }
+          }
+        }
+      ],
+      "required": [ "direction" ]
+    },
     "OpenSettingsAction": {
       "description": "Arguments corresponding to a Open Settings Action",
       "allOf": [
@@ -287,6 +318,7 @@
               { "$ref": "#/definitions/NewTabAction" },
               { "$ref": "#/definitions/SwitchToTabAction" },
               { "$ref": "#/definitions/MoveFocusAction" },
+              { "$ref": "#/definitions/MoveSelectionPointAction" },
               { "$ref": "#/definitions/ResizePaneAction" },
               { "$ref": "#/definitions/SplitPaneAction" },
               { "$ref": "#/definitions/OpenSettingsAction" },

src/cascadia/LocalTests_TerminalApp/KeyBindingsTests.cpp

@@ -344,7 +344,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
@@ -353,7 +353,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('E') };
@@ -362,7 +362,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
@@ -371,7 +371,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
@@ -380,7 +380,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('H') };
@@ -389,7 +389,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('I') };
@@ -398,7 +398,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
         }
     }
 

src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp

@@ -1773,7 +1773,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
             VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
@@ -1792,7 +1792,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
             VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
@@ -1812,7 +1812,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
             VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
@@ -1832,7 +1832,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
             VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
@@ -1852,7 +1852,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
             VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
             VERIFY_IS_FALSE(realArgs.TerminalArgs().Commandline().empty());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
@@ -1872,7 +1872,7 @@ namespace TerminalAppLocalTests
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
             VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
             VERIFY_IS_FALSE(realArgs.TerminalArgs().Commandline().empty());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());

src/cascadia/TerminalApp/ActionAndArgs.cpp

@@ -23,10 +23,11 @@ static constexpr std::string_view ScrolldownKey{ "scrollDown" };
 static constexpr std::string_view ScrolluppageKey{ "scrollUpPage" };
 static constexpr std::string_view ScrolldownpageKey{ "scrollDownPage" };
 static constexpr std::string_view SwitchToTabKey{ "switchToTab" };
-static constexpr std::string_view OpenSettingsKey{ "openSettings" }; // TODO GH#2557: Add args for OpenSettings
+static constexpr std::string_view OpenSettingsKey{ "openSettings" };
 static constexpr std::string_view SplitPaneKey{ "splitPane" };
 static constexpr std::string_view ResizePaneKey{ "resizePane" };
 static constexpr std::string_view MoveFocusKey{ "moveFocus" };
+static constexpr std::string_view MoveSelectionPointKey{ "moveSelectionPoint" };
 static constexpr std::string_view FindKey{ "find" };
 static constexpr std::string_view ToggleFullscreenKey{ "toggleFullscreen" };
 static constexpr std::string_view SetTabColorKey{ "setTabColor" };
@@ -70,6 +71,7 @@ namespace winrt::TerminalApp::implementation
         { SwitchToTabKey, ShortcutAction::SwitchToTab },
         { ResizePaneKey, ShortcutAction::ResizePane },
         { MoveFocusKey, ShortcutAction::MoveFocus },
+        { MoveSelectionPointKey, ShortcutAction::MoveSelectionPoint },
         { OpenSettingsKey, ShortcutAction::OpenSettings },
         { ToggleFullscreenKey, ShortcutAction::ToggleFullscreen },
         { SplitPaneKey, ShortcutAction::SplitPane },
@@ -100,6 +102,8 @@ namespace winrt::TerminalApp::implementation
 
         { ShortcutAction::MoveFocus, winrt::TerminalApp::implementation::MoveFocusArgs::FromJson },
 
+        { ShortcutAction::MoveSelectionPoint, winrt::TerminalApp::implementation::MoveSelectionPointArgs::FromJson },
+
         { ShortcutAction::AdjustFontSize, winrt::TerminalApp::implementation::AdjustFontSizeArgs::FromJson },
 
         { ShortcutAction::SplitPane, winrt::TerminalApp::implementation::SplitPaneArgs::FromJson },

src/cascadia/TerminalApp/ActionArgs.cpp

@@ -13,13 +13,16 @@
 #include "ResizePaneArgs.g.cpp"
 #include "MoveFocusArgs.g.cpp"
 #include "AdjustFontSizeArgs.g.cpp"
+#include "MoveSelectionPointArgs.g.cpp"
 #include "SplitPaneArgs.g.cpp"
 #include "OpenSettingsArgs.g.cpp"
 #include "SetTabColorArgs.g.cpp"
 #include "RenameTabArgs.g.cpp"
 
 #include <LibraryResources.h>
 
+using namespace winrt::Microsoft::Terminal::Settings;
+
 namespace winrt::TerminalApp::implementation
 {
     winrt::hstring NewTerminalArgs::GenerateName() const
@@ -258,4 +261,9 @@ namespace winrt::TerminalApp::implementation
         return RS_(L"ResetTabNameCommandKey");
     }
 
+    winrt::hstring MoveSelectionPointArgs::GenerateName() const
+    {
+        // no generated name
+        return winrt::hstring();
+    }
 }