Add tests for vi-replace-char (r).

lem-project · Sep 1, 2023 · 1c32e5c · 1c32e5c
1 parent 4e126e1
commit 1c32e5c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/extensions/vi-mode/tests/operator.lisp b/extensions/vi-mode/tests/operator.lisp
@@ -101,6 +101,39 @@
       (cmd "J")
       (ok (buf= #?"abcdefgh[ ]ijklmn\n")))))
 
+(deftest vi-replace-char
+  (with-fake-interface ()
+    (with-vi-buffer ("a[n]t")
+      (cmd "rr")
+      (ok (buf= "a[r]t")))
+    (with-vi-buffer ("sh[o]ut")
+      (cmd "2re")
+      (ok (buf= "she[e]t")))
+    (with-vi-buffer ("<[m]>eat")
+      (cmd "rb")
+      (ok (buf= "[b]eat")))
+    (with-vi-buffer ("p<i[n]>k")
+      (cmd "re")
+      (ok (buf= "p[e]ek")))
+    (with-vi-buffer ("p<[i]c>k")
+      (cmd "re")
+      (ok (buf= "p[e]ek")))
+    (with-vi-buffer (#?"em[a]cs\n")
+      (cmd "VrX")
+      (ok (buf= #?"[X]XXXX\n")))
+    (with-vi-buffer (#?"a[b]cd\nefgh\n")
+      (cmd "<C-v>jlrx")
+      (ok (buf= #?"a[x]xd\nexxh\n")))
+    (with-vi-buffer (#?"ab[c]d\nefgh\n")
+      (cmd "<C-v>jhrx")
+      (ok (buf= #?"a[x]xd\nexxh\n")))
+    (with-vi-buffer (#?"abcd\nef[g]h\n")
+      (cmd "<C-v>khrx")
+      (ok (buf= #?"a[x]xd\nexxh\n")))
+    (with-vi-buffer (#?"abcd\ne[f]gh\n")
+      (cmd "<C-v>klrx")
+      (ok (buf= #?"a[x]xd\nexxh\n")))))
+
 (deftest vi-repeat
   (with-fake-interface ()
     (with-vi-buffer (#?"[1]:abc\n2:def\n3:ghi\n4:jkl\n5:mno\n6:opq\n7:rst\n8:uvw")

diff --git a/extensions/vi-mode/text-objects.lisp b/extensions/vi-mode/text-objects.lisp
@@ -73,7 +73,7 @@
 (defmethod a-range-of (object (state visual) count)
   (destructuring-bind (beg end)
       (visual-range)
-    (when (point= beg end)
+    (when (point= beg (current-point))
       (return-from a-range-of
         (call-next-method)))
     (let ((direction (cond
@@ -132,7 +132,7 @@
 (defmethod inner-range-of (object (state visual) count)
   (destructuring-bind (beg end)
       (visual-range)
-    (when (point= beg end)
+    (when (point= beg (current-point))
       (return-from inner-range-of (call-next-method)))
 
     (let ((direction (cond

diff --git a/extensions/vi-mode/visual.lisp b/extensions/vi-mode/visual.lisp
@@ -160,7 +160,7 @@
     ((visual-char-p)
      (with-point ((start *start-point*)
                   (end (current-point)))
-       (cond ((point< start end)
+       (cond ((point<= start end)
               (character-offset end 1))
              ((point< end start)
               (character-offset start 1)))