Add support for # and £. Fixes #40

nosami · May 13, 2017 · c8ad990 · c8ad990
1 parent c5227b8
commit c8ad990
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 10 deletions.
diff --git a/XSVim.Tests/MiscTests.fs b/XSVim.Tests/MiscTests.fs
@@ -58,3 +58,11 @@ module ``Miscellaneous tests`` =
     [<Test>]
     let ``* finds next word at EOF``() =
         assertText "abc abc$" "*" "a$bc abc"
+
+    [<Test>]
+    let ``# finds previous word at caret``() =
+        assertText "abc abc a$bc" "#" "abc a$bc abc"
+
+    [<Test>]
+    let ``£ wraps to end``() =
+        assertText "a$bc abc" "£" "abc a$bc"
diff --git a/XSVim/XSVim.fs b/XSVim/XSVim.fs
@@ -38,7 +38,7 @@ type CommandType =
     | ReplaceChar of string
     | ResetKeys
     | DoNothing
-    | Star
+    | Star of BeforeOrAfter
 
 type TextObject =
     | Character
@@ -226,6 +226,15 @@ module VimHelpers =
         //bottomVisibleLine - topVisibleLine
         40
 
+    let wordAtCaret (editor:TextEditor) =
+        if isWordChar (editor.GetCharAt editor.CaretOffset) then
+            let start = findCurrentWordStart editor
+            let finish = findWordEnd editor
+            let word = editor.GetTextAt(start, finish - start)
+            Some word
+        else
+            None
+
     let eofOnLine (line: IDocumentLine) =
         line.EndOffset = line.EndOffsetIncludingDelimiter
 
@@ -568,7 +577,7 @@ module Vim =
                     switchToInsertMode editor vimState
                 | SwitchMode mode ->
                     match mode with
-                    | NormalMode -> 
+                    | NormalMode ->
                         editor.ClearSelection()
                         setCaretMode Block
                         vimState.undoGroup |> Option.iter(fun d -> d.Dispose())
@@ -585,20 +594,27 @@ module Vim =
                         newState
                     | InsertMode ->
                         switchToInsertMode editor vimState
-                | Star ->
-                    if isWordChar (editor.GetCharAt editor.CaretOffset) then
-                        let start = findCurrentWordStart editor
-                        let finish = findWordEnd editor
-                        let word = editor.GetTextAt(start, finish - start)
+                | Star After ->
+                    match wordAtCaret editor with
+                    | Some word ->
                         let offset = editor.Text.IndexOf(word, editor.CaretOffset+1)
                         if offset <> -1 then
                             editor.CaretOffset <- offset
                         else
                             editor.CaretOffset <- editor.Text.IndexOf word
                         vimState
-                    else
+                    | None ->
                         processCommands 1 vimState (runOnce Move WordForwards)
-
+                | Star Before ->
+                    match wordAtCaret editor with
+                    | Some word ->
+                        let offset = editor.Text.LastIndexOf(word, editor.CaretOffset)
+                        if offset <> -1 then
+                            editor.CaretOffset <- offset
+                        else
+                            editor.CaretOffset <- editor.Text.LastIndexOf word
+                        vimState
+                    | None -> vimState
                 | _ -> vimState
             if count = 1 then newState else processCommands (count-1) newState command
         let count =
@@ -757,7 +773,9 @@ module Vim =
             | VisualModes, [ "p" ] -> [ run (Put OverSelection) Nothing ]
             | VisualModes, [ "P" ] -> [ run (Put OverSelection) Nothing ]
             | NormalMode, [ "J" ] -> [ run JoinLines Nothing ]
-            | NotInsertMode, [ "*" ] -> [ run Star Nothing ]
+            | NotInsertMode, [ "*" ] -> [ run (Star After) Nothing ]
+            | NotInsertMode, [ "#" ] -> [ run (Star Before) Nothing ]
+            | NotInsertMode, [ "£" ] -> [ run (Star Before) Nothing ]
             | NormalMode, [ "/" ] -> [ dispatch SearchCommands.Find ]
             | NormalMode, [ "n" ] -> [ dispatch SearchCommands.FindNext ]
             | NormalMode, [ "N" ] -> [ dispatch SearchCommands.FindPrevious ]