Merge pull request #1018 from fukamachi/vi-adjust-cursor-position

Adjust cursor position after all commands in NORMAL mode

Author: cxxxr

extensions/vi-mode/tests/motion.lisp

@@ -79,7 +79,7 @@
       (cmd "E")
       (ok (buf= #?"abc-def (ghi jkl) # \n\t [m]"))
       (cmd "E")
-      (ok (buf= #?"abc-def (ghi jkl) # \n\t m[]"))
+      (ok (buf= #?"abc-def (ghi jkl) # \n\t [m]"))
       (cmd "gg")
       (cmd "3E")
       (ok (buf= #?"abc-def (ghi jkl[)] # \n\t m")))
@@ -203,7 +203,7 @@
       (cmd "W")
       (ok (buf= #?"abc-def (ghi jkl) # \n\t [m]"))
       (cmd "W")
-      (ok (buf= #?"abc-def (ghi jkl) # \n\t m[]"))
+      (ok (buf= #?"abc-def (ghi jkl) # \n\t [m]"))
       (cmd "gg")
       (cmd "3W")
       (ok (buf= #?"abc-def (ghi jkl) [#] \n\t m")))

extensions/vi-mode/vi-mode.lisp

@@ -8,6 +8,8 @@
   (:import-from :lem-vi-mode/commands
                 :vi-open-below
                 :vi-open-above)
+  (:import-from :lem-vi-mode/commands/utils
+                :fall-within-line)
   (:import-from :lem-vi-mode/states
                 :normal
                 :insert
@@ -35,7 +37,8 @@
     (let ((command (this-command)))
       (when (and (typep command 'vi-command)
                  (eq (vi-command-repeat command) t))
-        (setf *last-repeat-keys* (vi-this-command-keys))))))
+        (setf *last-repeat-keys* (vi-this-command-keys)))))
+  (fall-within-line (current-point)))
 
 (defmethod post-command-hook ((state insert))
   (let ((command (this-command)))