Fix c-o at eol for cursor-forward commands, replace state, add tests (#1464)

Properly fixes #1463 

* Fix c-o at eol for cursor-forward commands, replace state, add tests

Author: tomdl89

evil-commands.el

@@ -4635,11 +4635,16 @@ if the previous state was Emacs state."
       (when (evil-emacs-state-p)
         (evil-normal-state (and message 1))))))
 
+(evil-define-local-var evil--execute-normal-eol-pos nil
+  "Vim has special behaviour for executing in normal state at eol.
+This var stores the eol position, so it can be restored when necessary.")
+
 (defun evil-execute-in-normal-state ()
   "Execute the next command in Normal state."
   (interactive)
   (evil-delay '(not (memq this-command
                           '(evil-execute-in-normal-state
+                            evil-replace-state
                             evil-use-register
                             digit-argument
                             negative-argument
@@ -4649,10 +4654,17 @@ if the previous state was Emacs state."
                             universal-argument-other-key)))
       `(progn
          (with-current-buffer ,(current-buffer)
-           (evil-change-state ',evil-state)
+           (when (and evil--execute-normal-eol-pos
+                      (= (point) (1- evil--execute-normal-eol-pos))
+                      (not (memq this-command '(evil-insert
+                                                evil-goto-mark))))
+             (forward-char))
+           (unless (eq 'replace evil-state)
+             (evil-change-state ',evil-state))
            (setq evil-move-cursor-back ',evil-move-cursor-back
                  evil-move-beyond-eol ',evil-move-beyond-eol)))
     'post-command-hook)
+  (setq evil--execute-normal-eol-pos (when (eolp) (point)))
   (setq evil-move-cursor-back nil)
   (evil-normal-state)
   (setq evil-move-beyond-eol t)

evil-tests.el

@@ -309,10 +309,40 @@ with `M-x evil-tests-run'"))
       ("bcdef[]\n"))
     (ert-info ("Cursor is placed correctly afterwards")
       (evil-test-buffer
-       :state insert
-       "abcdefg[]"
-       ("\C-o~")
-       "abcdefG[]"))))
+        :state insert
+        "abcdefg[]"
+        ("\C-o~")
+        "abcdefG[]")
+      (evil-test-buffer
+        :state insert
+        "abcdefg[]"
+        ("\C-ozz")
+        "abcdefg[]")
+      (evil-test-buffer
+        :state insert
+        "abc[]defg"
+        ("\C-o$")
+        "abcdefg[]")
+      (evil-test-buffer
+        :state insert
+        "abcdefg[]"
+        ("\C-o^")
+        "[]abcdefg")
+      (evil-test-buffer
+        :state insert
+        "abcdefg[]"
+        ("\C-oi")
+        "abcdef[]g")
+      (evil-test-buffer
+        "line1\nli[n]e2"
+        ("ma" "kA" "\C-o`a")
+        "line1\nli[]ne2"))
+    (ert-info ("Can enter replace state and stay in it")
+      (evil-test-buffer
+        :state insert
+        "abc[]defg"
+        ("\C-oRfoo")
+        "abcfoog"))))
 
 (defun evil-test-suppress-keymap (state)
   "Verify that `self-insert-command' is suppressed in STATE"