w skips over tabs correctly. Fixes #183

nosami · Oct 7, 2017 · 65e0226 · 65e0226
1 parent b6c27e7
commit 65e0226
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/XSVim.Tests/Movement.fs b/XSVim.Tests/Movement.fs
@@ -19,6 +19,10 @@ module ``Movement tests`` =
     let ``Moves to EOF when there is no next word``() =
         assertText "aa$aa" "w" "aaaa$"
 
+    [<Test>]
+    let ``w skips over tabs``() =
+        assertText "\t$\t\taaaa" "w" "\t\t\ta$aaa"
+
     [<Test>]
     let ``Move to word end``() =
         assertText "aa$a bbb" "e" "aaa$ bbb"

diff --git a/XSVim/Properties/AddinInfo.fs b/XSVim/Properties/AddinInfo.fs
@@ -5,7 +5,7 @@ open MonoDevelop
 [<assembly:Addin (
   "XSVim", 
   Namespace = "XSVim",
-  Version = "0.45.9"
+  Version = "0.45.10"
 )>]
 
 [<assembly:AddinName ("Vim")>]

diff --git a/XSVim/XSVim.fs b/XSVim/XSVim.fs
@@ -111,6 +111,7 @@ module VimHelpers =
     let isWORDChar c = not (Char.IsWhiteSpace c)
     let isNonBlankButNotWordChar c = isWORDChar c && not (isWordChar c)
     let isEOLChar c = c = '\r' || c = '\n'
+    let isSpaceOrTab c = c = ' ' || c = '\t' 
 
     let (|WhiteSpace|_|) c =
         if Char.IsWhiteSpace c then Some WhiteSpace else None
@@ -128,7 +129,7 @@ module VimHelpers =
             | WhiteSpace, Move
             | WhiteSpace, Delete ->
                 seq { index+1 .. editor.Length-1 }
-                |> Seq.tryFind(fun index -> not (editor.[index] = ' '))
+                |> Seq.tryFind(fun index -> not (isSpaceOrTab editor.[index]))
                 |> Option.bind(fun newIndex ->
 
                     let findFirstWordOnLine startOffset =