Merge pull request #1131 from fukamachi/fix/vi-block-deletion

Fix the region to delete with `x`, `X`, `S` in visual block state.

extensions/vi-mode/commands.lisp

@@ -277,18 +277,18 @@
   (indent-points start end))
 
 ;; FIXME: support block
-(define-operator vi-substitute (beg end) ("<r>")
+(define-operator vi-substitute (beg end type) ("<R>")
     (:motion vi-forward-char)
-  (vi-delete beg end :inclusive)
+  (vi-delete beg end type)
   (change-state 'insert))
 
-(define-operator vi-delete-next-char (beg end) ("<r>")
+(define-operator vi-delete-next-char (beg end type) ("<R>")
     (:motion vi-forward-char)
-  (vi-delete beg end :inclusive))
+  (vi-delete beg end type))
 
-(define-operator vi-delete-previous-char (beg end) ("<r>")
+(define-operator vi-delete-previous-char (beg end type) ("<R>")
     (:motion vi-backward-char)
-  (vi-delete beg end :exclusive))
+  (vi-delete beg end type))
 
 (define-operator vi-delete (start end type) ("<R>")
     (:move-point nil)

extensions/vi-mode/tests/operator.lisp

@@ -189,7 +189,22 @@
 (deftest vi-delete-next-char
   (with-fake-interface ()
     (with-vi-buffer ("")
-      (ok (not (signals (cmd "x")))))))
+      (ok (not (signals (cmd "x")))))
+    (with-vi-buffer (#?"[g]et-param\nget-option\n")
+      (cmd "<C-v>f-jx")
+      (ok (buf= #?"[p]aram\noption\n")))))
+
+(deftest vi-delete-previous-char
+  (with-fake-interface ()
+    (with-vi-buffer (#?"[g]et-param\nget-option\n")
+      (cmd "<C-v>f-jX")
+      (ok (buf= #?"[p]aram\noption\n")))))
+
+(deftest vi-substitute
+  (with-fake-interface ()
+    (with-vi-buffer (#?"[g]et-param\nget-option\n")
+      (cmd "<C-v>f-js")
+      (ok (buf= #?"[p]aram\noption\n")))))
 
 (deftest vi-replace-char
   (with-fake-interface ()