Merge pull request #1372 from gos-k/main

Bugfix out-of-range substitution of vi visual mode

Author: cxxxr

extensions/vi-mode/ex-command.lisp

@@ -148,7 +148,8 @@
                   (cond
                     (replace-all-in-line
                      (lem:line-start start)
-                     (lem:line-end end)
+                     (unless (lem:start-line-p end)
+                       (lem:line-end end))
                      (rep start end nil))
                     (t
                      (lem:move-point (lem:current-point) start)

extensions/vi-mode/tests/ex.lisp

@@ -25,4 +25,14 @@
     (testing "'g' flag"
       (with-vi-buffer (#?"pen pineapple <apple pen\nap[p]>le juice\npineapple cake\n")
         (ex-cmd "'<,'>s/apple/grape/g")
-        (ok (text= #?"pen pinegrape grape pen\ngrape juice\npineapple cake\n"))))))
+        (ok (text= #?"pen pinegrape grape pen\ngrape juice\npineapple cake\n")))
+
+      (with-vi-buffer (#?"apple apple\n[a]pple apple\napple apple\napple apple\n")
+        (cmd "Vj")
+        (ex-cmd "'<,'>s/apple/grape/g")
+        (ok (text= #?"apple apple\ngrape grape\ngrape grape\napple apple\n")))
+
+      (with-vi-buffer (#?"apple apple\napple apple\n[a]pple apple\napple apple\n")
+        (cmd "Vk")
+        (ex-cmd "'<,'>s/apple/grape/g")
+        (ok (text= #?"apple apple\ngrape grape\ngrape grape\napple apple\n"))))))