Execute in normal state should cancel insert count

Author: tomdl89

evil-commands.el

@@ -4664,6 +4664,7 @@ This var stores the eol position, so it can be restored when necessary.")
            (setq evil-move-cursor-back ',evil-move-cursor-back
                  evil-move-beyond-eol ',evil-move-beyond-eol)))
     'post-command-hook)
+  (setq evil-insert-count nil)
   (setq evil--execute-normal-eol-pos (when (eolp) (point)))
   (setq evil-move-cursor-back nil)
   (evil-normal-state)

evil-tests.el

@@ -342,7 +342,12 @@ with `M-x evil-tests-run'"))
         :state insert
         "abc[]defg"
         ("\C-oRfoo")
-        "abcfoog"))))
+        "abcfoog"))
+    (ert-info ("Insert count is ignored")
+      (evil-test-buffer
+        "[]"
+        ("2i" "abcdef" "\C-o~" "g" [escape])
+        "abcdeF[g]"))))
 
 (defun evil-test-suppress-keymap (state)
   "Verify that `self-insert-command' is suppressed in STATE"