Fix bad merges

nosami · Apr 16, 2017 · ebb0410 · ebb0410
1 parent 0e33d17
commit ebb0410
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/XSVim/Properties/AddinInfo.fs b/XSVim/Properties/AddinInfo.fs
@@ -7,7 +7,7 @@ open Mono.Addins.Description
 [<assembly:Addin (
   "XSVim", 
   Namespace = "XSVim",
-  Version = "0.13.1"
+  Version = "0.14"
 )>]
 
 [<assembly:AddinName ("Vim")>]

diff --git a/XSVim/XSVim.fs b/XSVim/XSVim.fs
@@ -321,7 +321,7 @@ module Vim =
             editor.SetSelection(startLine.Offset, endLine.EndOffsetIncludingDelimiter)
         | _ -> editor.SetSelection(start, finish)
 
-    let runCommand vimState editor command =
+    let runCommand vimState (editor:TextEditorData) command =
         let delete start finish =
             let finish =
                 match command.textObject with
@@ -347,14 +347,14 @@ module Vim =
                 | VisualModes -> setSelection vimState editor command start finish
                 | _ -> ()
             | Delete -> delete start finish
-            | DeleteLeft -> if editor.CaretColumn > 1 then delete vimState (editor.CaretOffset - 1) editor.CaretOffset
+            | DeleteLeft -> if editor.Caret.Column > 1 then delete (editor.Caret.Offset - 1) editor.Caret.Offset
             | Change -> delete start finish
             | Yank ->
                 let finish =
-                match command.textObject with
-                | ForwardToEndOfWord
-                | ToCharInclusive _
-                | ToCharExclusive _ -> finish + 1
+                    match command.textObject with
+                    | ForwardToEndOfWord
+                    | ToCharInclusive _
+                    | ToCharExclusive _ -> finish + 1
                     | _ -> finish
                 if command.textObject <> Selection then
                     setSelection vimState editor command start finish