Fixes x with repeat paste buffer. Fixes #217 and #212

nosami · May 7, 2018 · 873c04e · 873c04e
1 parent 72b8e9c
commit 873c04e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/XSVim.Tests/YankAndPut.fs b/XSVim.Tests/YankAndPut.fs
@@ -78,3 +78,7 @@ module ``Yank and put tests`` =
     [<Test>]
     let ``Multi line put on line without delimiter places caret at top line of paste``() =
         assertText "aa$a\nbbb\nccc" "Vjdp" "ccc\na$aa\nbbb"
+
+    [<Test>]
+    let ``x with multiplier stops at EOL``() =
+        assertText "ab$cdef\n" "100xp" "abcdef$\n"
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.54.6"
+    let version = "0.54.7"
 
 [<assembly: AssemblyTitle("XSVim")>]
 // The assembly version has the format {Major}.{Minor}.{Build}.{Revision}

diff --git a/XSVim/Types.fs b/XSVim/Types.fs
@@ -88,10 +88,11 @@ type VimKey =
         | EscapeKey c -> string c
         | Key c -> string c
 
+type Repeat = int
 
 type TextObject =
     | Jump of Jump
-    | Character
+    | Character of Repeat
     | AWord
     | InnerWord
     | AWORD

diff --git a/XSVim/XSVim.fs b/XSVim/XSVim.fs
@@ -387,6 +387,10 @@ module VimHelpers =
             else
                 editor.CaretOffset
         | EndOfLine -> editor.CaretOffset, line.EndOffset-1
+        | Character repeat ->
+            let line = editor.GetLine editor.CaretLine
+            let endOffset = min line.EndOffset (editor.CaretOffset + repeat)
+            editor.CaretOffset, endOffset
         | EndOfLineIncludingDelimiter ->
             editor.CaretOffset,
             if eofOnLine line then
@@ -1516,7 +1520,7 @@ module Vim =
                 | None -> [ runOnce (Yank EmptyRegister) WholeLineIncludingDelimiter ]
             | NormalMode, [ "C" ] -> [ run Change EndOfLine ]
             | NormalMode, [ "D" ] -> [ run Delete EndOfLine ]
-            | NormalMode, [ "x" ] -> [ run Delete CurrentLocation ]
+            | NormalMode, [ "x" ] -> [ runOnce Delete (Character (numericArgument |> Option.defaultValue 1)) ]
             | NormalMode, [ "X" ] -> [ run DeleteLeft Nothing ]
             | NormalMode, [ "s"] -> [ run Substitute CurrentLocation]
             | NormalMode, [ "S"] -> [ run Delete WholeLineIncludingDelimiter; runOnce (InsertLine After) Nothing; switchMode InsertMode ]