Treat modifications while in INSERT mode as a single undo stack

extensions/vi-mode/lem-vi-mode.asd

@@ -41,7 +41,8 @@
     :components
     ((:file "motion")
      (:file "operator")
-     (:file "visual")))
+     (:file "visual")
+     (:file "commands")))
    (:file "utils"
     :pathname "tests/utils"))
   :perform (test-op (op c) (symbol-call :rove '#:run c)))

extensions/vi-mode/tests/commands.lisp

@@ -0,0 +1,27 @@
+(defpackage :lem-vi-mode/tests/commands
+  (:use :cl
+        :lem
+        :rove
+        :lem-vi-mode/tests/utils)
+  (:import-from :lem-fake-interface
+                :with-fake-interface)
+  (:import-from :named-readtables
+                :in-readtable))
+(in-package :lem-vi-mode/tests/commands)
+
+(in-readtable :interpol-syntax)
+
+(deftest vi-undo
+  (with-fake-interface ()
+    (with-vi-buffer (#?"[1]\n2\n3\n")
+      (cmd "a: Hello!<Esc>")
+      (ok (buf= #?"1: Hello[!]\n2\n3\n"))
+      (ok (state= :normal))
+      (cmd "u")
+      (ok (buf= #?"[1]\n2\n3\n"))
+      (cmd "<C-r>")
+      (ok (buf= #?"1: Hello[!]\n2\n3\n"))
+      (cmd "o4: World!<Esc>")
+      (ok (buf= #?"1: Hello!\n4: World[!]\n2\n3\n"))
+      (cmd "2u")
+      (ok (buf= #?"[1]\n2\n3\n")))))

extensions/vi-mode/tests/utils.lisp

@@ -168,7 +168,9 @@
                   (appendf key-args '(:shift t)))))
              (let ((sym-str (ppcre:scan-to-strings "[^<-]+(?=>$)" key-str)))
                (apply #'make-key :sym (if-let (char (name-char sym-str))
-                                        (string char)
+                                        (if (char= char #\Esc)
+                                            "Escape"
+                                            (string char))
                                         sym-str)
                       key-args))))
        keys))
@@ -187,7 +189,9 @@
       (multiple-value-bind (buffer-text position visual-regions)
           (parse-buffer-string content)
         (let ((point (buffer-point buffer)))
-          (insert-string point buffer-text)
+          (lem:insert-string point buffer-text)
+          (setf (lem-base::buffer-edit-history buffer)
+                (make-array 0 :adjustable t :fill-pointer 0))
           (when position
             (move-to-position point position))
           (dolist (region visual-regions)
@@ -329,10 +333,10 @@
                     :negative negative))
 
 (defmethod form-description ((function (eql 'text=)) args values &key negative)
+  (declare (ignore args))
   (let ((expected-text (first values))
         (actual-text (buffer-text (current-buffer))))
-    (format nil "Expect ~W~:[~; not~] to be ~S (actual: ~S)"
-            (first args)
+    (format nil "Expect the buffer text~:[~; not~] to be ~S (actual: ~S)"
             negative
             (text-backslashed expected-text)
             (text-backslashed actual-text))))

extensions/vi-mode/vi-mode.lisp

@@ -21,3 +21,11 @@
     (when (and (typep command 'vi-command)
                (eq (vi-command-repeat command) t))
       (setf *last-repeat-keys* (vi-this-command-keys)))))
+
+(defmethod post-command-hook ((state insert))
+  (when (eq :separator (lem-base::last-edit-history (current-buffer)))
+    (vector-pop (lem-base::buffer-edit-history (current-buffer)))))
+
+(defmethod state-disabled-hook ((state insert))
+  (unless (eq :separator (lem-base::last-edit-history (current-buffer)))
+    (buffer-undo-boundary)))