From 36a457551c21e8d3e47514698165dd5621b04ff2 Mon Sep 17 00:00:00 2001
From: Eitaro Fukamachi <e.arrows@gmail.com>
Date: Fri, 1 Sep 2023 23:51:05 +0000
Subject: [PATCH] Add 'c' flag to ':s'.

---
 extensions/vi-mode/ex-command.lisp | 50 ++++++++++++++++--------------
 extensions/vi-mode/ex-parser.lisp  |  6 +++-
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/extensions/vi-mode/ex-command.lisp b/extensions/vi-mode/ex-command.lisp
index 2d3788ec0..73bbec489 100644
--- a/extensions/vi-mode/ex-command.lisp
+++ b/extensions/vi-mode/ex-command.lisp
@@ -94,7 +94,7 @@
         ((2)
          (setf start (first range)
                end (second range))))
-      (destructuring-bind (before after flag)
+      (destructuring-bind (before after flags)
           (lem-vi-mode/ex-parser:parse-subst-argument argument)
         (if (not (lem:with-point ((s start)
                                   (e end))
@@ -103,29 +103,31 @@
             (lem:with-point ((last-match (lem:with-point ((s start)
                                                           (e end))
                                            (lem:search-backward-regexp e before s))))
-              (flet ((rep (start end count)
-                       (lem:with-point ((s start)
-                                        (e end))
-                         (lem/isearch::query-replace-internal before
-                                                              after
-                                                              #'lem:search-forward-regexp
-                                                              #'lem:search-backward-regexp
-                                                              :query nil
-                                                              :start s
-                                                              :end e
-                                                              :count count))))
-                (if (equal flag "g")
-                    (rep start end nil)
-                    (progn
-                      (lem:move-point (lem:current-point) start)
-                      (loop until (lem:point< end (lem:current-point))
-                            do (lem:with-point ((replace-start (lem:current-point))
-                                                (replace-end (lem:current-point)))
-                                 (lem:line-start replace-start)
-                                 (lem:line-end replace-end)
-                                 (rep replace-start replace-end 1))
-                               (lem:next-logical-line 1)
-                               (lem:line-start (lem:current-point))))))
+              (let ((query (find "c" flags :test 'string=))
+                    (replace-all-in-line (find "g" flags :test 'string=)))
+                (flet ((rep (start end count)
+                         (lem:with-point ((s start)
+                                          (e end))
+                           (lem/isearch::query-replace-internal before
+                                                                after
+                                                                #'lem:search-forward-regexp
+                                                                #'lem:search-backward-regexp
+                                                                :query query
+                                                                :start s
+                                                                :end e
+                                                                :count count))))
+                  (if replace-all-in-line
+                      (rep start end nil)
+                      (progn
+                        (lem:move-point (lem:current-point) start)
+                        (loop until (lem:point< end (lem:current-point))
+                              do (lem:with-point ((replace-start (lem:current-point))
+                                                  (replace-end (lem:current-point)))
+                                   (lem:line-start replace-start)
+                                   (lem:line-end replace-end)
+                                   (rep replace-start replace-end 1))
+                                 (lem:next-logical-line 1)
+                                 (lem:line-start (lem:current-point)))))))
               (let ((p (lem:current-point)))
                 (lem:move-point p last-match)
                 (lem:line-start p))))))))
diff --git a/extensions/vi-mode/ex-parser.lisp b/extensions/vi-mode/ex-parser.lisp
index 2100de828..36c87724b 100644
--- a/extensions/vi-mode/ex-parser.lisp
+++ b/extensions/vi-mode/ex-parser.lisp
@@ -109,6 +109,10 @@
         #\_
         x)))
 
+;; Other flags are not implemented yet
+;; Full list will be (or #\& #\c #\e #\g #\i #\I #\n #\p #\# #\l #\r)
+(defrule subst-flag (or #\c #\g))
+
 (defrule ex-command (or (+ (or #\~ #\& #\* #\@ #\< #\> #\= #\:))
                         (+ (or command-char #\- #\!)))
   (:lambda (x)
@@ -135,7 +139,7 @@
 
 
 (defrule subst (and #\/ (* forward-pattern-char) #\/ (* forward-pattern-char)
-                    (? #\/) (? #\g))
+                    (? #\/) (* subst-flag))
   (:lambda (list)
     (list (coerce (elt list 1) 'string)
           (coerce (elt list 3) 'string)