vi-mode - Make 'dj' delete the current and next n logical lines (#1697)

Author: springcomp

PSReadLine/KeyBindings.cs

@@ -402,6 +402,7 @@ public static KeyHandlerGroup GetDisplayGrouping(string function)
             case nameof(DeleteEndOfWord):
             case nameof(DeleteLine):
             case nameof(DeleteLineToFirstChar):
+            case nameof(DeleteNextLines):
             case nameof(DeleteToEnd):
             case nameof(DeleteWord):
             case nameof(ForwardDeleteLine):

PSReadLine/KeyBindings.vi.cs

@@ -229,6 +229,7 @@ private void SetDefaultViBindings()
                 { Keys.ucG,             MakeKeyHandler( DeleteEndOfBuffer,            "DeleteEndOfBuffer") },
                 { Keys.ucE,             MakeKeyHandler( ViDeleteEndOfGlob,            "ViDeleteEndOfGlob") },
                 { Keys.H,               MakeKeyHandler( BackwardDeleteChar,           "BackwardDeleteChar") },
+                { Keys.J,               MakeKeyHandler( DeleteNextLines,              "DeleteNextLines") },
                 { Keys.L,               MakeKeyHandler( DeleteChar,                   "DeleteChar") },
                 { Keys.Space,           MakeKeyHandler( DeleteChar,                   "DeleteChar") },
                 { Keys._0,              MakeKeyHandler( BackwardDeleteLine,           "BackwardDeleteLine") },

PSReadLine/PSReadLineResources.resx

@@ -805,4 +805,7 @@ Or not saving history with:
   <data name="DeleteEndOfBufferDescription" xml:space="preserve">
     <value>Delete the current logical line and up to the end of the multiline buffer</value>
   </data>
+  <data name="DeleteNextLinesDescription" xml:space="preserve">
+    <value>Deletes the current and next n logical lines in a multiline buffer</value>
+  </data>
 </root>

PSReadLine/ReadLine.vi.cs

@@ -816,6 +816,17 @@ public static void DeleteEndOfBuffer(ConsoleKeyInfo? key = null, object arg = nu
             _singleton.Render();
         }
 
+        /// <summary>
+        /// Deletes the current and next n logical lines.
+        /// </summary>
+        private static void DeleteNextLines(ConsoleKeyInfo? key = null, object arg = null)
+        {
+            if (TryGetArgAsInt(arg, out int requestedLineCount, 1))
+            {
+                DeleteLine(key, requestedLineCount + 1);
+            }
+        }
+
         /// <summary>
         /// Deletes the previous word.
         /// </summary>

test/BasicEditingTest.VI.cs

@@ -509,6 +509,24 @@ public void ViDeleteToEnd()
                 ));
         }
 
+        [SkippableFact]
+        public void ViDeleteNextLines()
+        {
+            TestSetup(KeyMode.Vi);
+
+            int continuationPrefixLength = PSConsoleReadLineOptions.DefaultContinuationPrompt.Length;
+
+            Test("\"\n\"", Keys(
+                 _.DQuote, _.Enter,
+                 "one", _.Enter,
+                 "two", _.Enter,
+                 "three", _.Enter,
+                 _.DQuote, _.Escape,
+                 "kkkl", // go to the 'ne' portion of "one"
+                 "2dj", CheckThat(() => AssertCursorLeftIs(continuationPrefixLength + 0))
+                ));
+        }
+
         [SkippableFact]
         public void ViGlobDelete()
         {