fixes #8

nosami · May 2, 2017 · ea27f4d · ea27f4d
1 parent a2fe9ca
commit ea27f4d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/XSVim.Tests/Movement.fs b/XSVim.Tests/Movement.fs
@@ -35,6 +35,10 @@ module ``Movement tests`` =
     let ``Move down to desired column``() =
         assertText "12345$6\n123\n123456" "jj" "123456\n123\n12345$6"
 
+    [<Test>]
+    let ``Move down to last column``() =
+        assertText "12345$6\n123\n123456" "j" "123456\n123$\n123456"
+
     [<Test>]
     let ``Move ten right``() =
         assertText "a$bcdefghijkl" "10l" "abcdefghijk$l"
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.16"
+  Version = "0.16.1"
 )>]
 
 [<assembly:AddinName ("Vim")>]

diff --git a/XSVim/XSVim.fs b/XSVim/XSVim.fs
@@ -229,10 +229,11 @@ module VimHelpers =
             editor.CaretOffset,
             if editor.CaretLine > DocumentLocation.MinLine then
                 let column =
-                    if vimState.desiredColumn > editor.CaretColumn && vimState.desiredColumn <= editor.Length then
+                    let line = editor.GetLine (editor.CaretLine - 1)
+                    if vimState.desiredColumn > editor.CaretColumn && vimState.desiredColumn <= line.Length then
                         vimState.desiredColumn
                     else
-                        editor.CaretColumn
+                        line.Length
 
                 editor.LocationToOffset (new DocumentLocation(editor.CaretLine - 1, column))
             else
@@ -241,10 +242,11 @@ module VimHelpers =
             editor.CaretOffset,
             if editor.CaretLine < editor.LineCount then
                 let column =
-                    if vimState.desiredColumn > editor.CaretColumn && vimState.desiredColumn <= editor.Length then
+                    let line = editor.GetLine (editor.CaretLine + 1)
+                    if vimState.desiredColumn > editor.CaretColumn && vimState.desiredColumn <= line.Length then
                         vimState.desiredColumn
                     else
-                        editor.CaretColumn
+                        line.Length
 
                 editor.LocationToOffset (new DocumentLocation(editor.CaretLine + 1, column))
             else