Ex-mode line delete (:1,3d)

Fixes #221. Re #68 #42
nosami · May 15, 2018 · d5cde5f · d5cde5f
1 parent 49ef664
commit d5cde5f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/XSVim.Tests/ExModeTests.fs b/XSVim.Tests/ExModeTests.fs
@@ -73,3 +73,17 @@ module ``Ex mode tests`` =
     let ``Could not parse message is reset``() =
         let _, state, _ = test "a$bc" ":garbage<ret>l"
         state.statusMessage |> should equal None
+
+    [<Test>]
+    let ``Deletes lines 2 to 4``() =
+        assertText
+            """11111
+22222
+33333
+44444
+55555$"""
+
+            ":2,4d<ret>"
+
+            """11111
+5$5555"""
diff --git a/XSVim/ExMode.fs b/XSVim/ExMode.fs
@@ -26,6 +26,14 @@ module exMode =
         else
             None
 
+    let (|DeleteLines|_|) input =
+        let matches = Regex.Matches(input, "([\d+]),([\d+])d", RegexOptions.Compiled)
+        if matches.Count = 1 then 
+            let m = matches.[0]
+            Some (int m.Groups.[1].Value, int m.Groups.[2].Value)
+        else
+            None
+
     let processKey (state:VimState) (key:KeyDescriptor) =
         let setMessage message = { state with statusMessage = message }
         let normalMode = { state with statusMessage = None; mode = NormalMode }
@@ -119,6 +127,11 @@ module exMode =
                             [ runOnce Move (Jump (ToMark (startMarker, MarkerJumpType.StartOfLine)))
                               runOnce DeleteWholeLines (Jump (ToMark (endMarker, MarkerJumpType.StartOfLine))) ]
                         normalMode, actions
+                    | DeleteLines (startLine, endLine) ->
+                        let actions =
+                            [ runOnce Move (Jump (StartOfLineNumber startLine))
+                              runOnce DeleteWholeLines (Jump (StartOfLineNumber endLine)) ]
+                        normalMode, actions
                     | _  ->
                         { state with statusMessage = sprintf "Could not parse :%s" rest |> Some; mode = NormalMode; }
                         , resetKeys

diff --git a/XSVim/Properties/AssemblyInfo.fs b/XSVim/Properties/AssemblyInfo.fs
@@ -5,7 +5,7 @@ open System.Runtime.CompilerServices
 [<AutoOpen>]
 module AddinVersion =
     [<Literal>]
-    let version = "0.58.0"
+    let version = "0.59.0"
 
 [<assembly: AssemblyTitle("XSVim")>]
 // The assembly version has the format {Major}.{Minor}.{Build}.{Revision}