evil-maybe-remove-spaces works for cc<escape> (#1493)

Author: tomdl89

evil-commands.el

@@ -1673,6 +1673,7 @@ of the block."
     (funcall delete-func beg end type register yank-handler)
     (cond
      ((eq type 'line)
+      (setq this-command 'evil-change-whole-line) ; for evil-maybe-remove-spaces
       (if (= opoint (point))
           (evil-open-above 1)
         (evil-open-below 1)))

evil-states.el

@@ -99,6 +99,7 @@ commands opening a new line."
                  evil-open-below
                  evil-append
                  evil-append-line
+                 evil-change-whole-line
                  newline
                  newline-and-indent
                  indent-and-newline)))

evil-tests.el

@@ -2114,6 +2114,28 @@ for this test."))
 ABCIf you want to create a file, visit that file with C-x C-f,
 ABCthen enter the text in that file's own buffer.")))
 
+(ert-deftest evil-maybe-remove-spaces-test ()
+  "Test maybe removing (indentation) spaces after some commands when making a clear line."
+  :tags '(evil operator)
+  (ert-info ("changing the line and returning to normal mode removes spaces")
+    (evil-test-buffer
+      (emacs-lisp-mode)
+      ("i(one two" [return] "three" [return] "four" [return] "five" [escape] "?three" [return])
+      "(one two
+     [t]hree
+     four
+     five"
+      ("cc" "new line" [escape] "+")
+      "(one two
+     new line
+     [f]our
+     five"
+      ("cc" [escape])
+      "(one two
+     new line
+[]
+     five")))
+
 (ert-deftest evil-test-change-word ()
   "Test changing words"
   :tags '(evil operator)