'A' should put caret at EOF on last line. Fixes #20

nosami · May 3, 2017 · 74deefb · 74deefb
1 parent 0186aa5
commit 74deefb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/XSVim.Tests/MiscTests.fs b/XSVim.Tests/MiscTests.fs
@@ -7,6 +7,10 @@ module ``Miscellaneous tests`` =
     let ``'A' should put caret at end of the line``() =
         assertText "abc$def\n" "A" "abcdef|\n"
 
+    [<Test>]
+    let ``'A' should put caret at EOF``() =
+        assertText "abc$def" "A" "abcdef|"
+
     [<Test>]
     let ``'a' should append after``() =
         assertText "a$bcdef" "a" "a|bcdef"

diff --git a/XSVim/XSVim.fs b/XSVim/XSVim.fs
@@ -264,7 +264,12 @@ module VimHelpers =
             else
                 editor.CaretOffset
         | EndOfLine -> editor.CaretOffset, line.EndOffset-1
-        | EndOfLineIncludingDelimiter -> editor.CaretOffset, line.EndOffsetIncludingDelimiter-1
+        | EndOfLineIncludingDelimiter ->
+            editor.CaretOffset,
+            if line.EndOffset = line.EndOffsetIncludingDelimiter then
+                line.EndOffsetIncludingDelimiter
+            else
+                line.EndOffsetIncludingDelimiter-1
         | StartOfLine -> editor.CaretOffset, line.Offset
         | StartOfLineNumber lineNumber ->
             let line = editor.GetLine lineNumber