'inccommand': Introduce CMDPREVIEW state.

Command "live preview" is fundamentally a non-recursive concept
("preview of a preview" is not useful). Maintaining this as a
global is less awkward and closer to what we actually want to
express, vs adorning exarg_T, CommandLineState, etc.

1 files changed, 21 insertions, 19 deletions

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 40e506e80e..42af5989a1 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -2952,10 +2952,11 @@ void sub_set_replacement(SubReplacementString sub)
 /// @param[in]  pat  Search pattern
 /// @param[in]  sub  Replacement string
 /// @param[in]  cmd  Command from :s_flags
+/// @param[in]  save Save pattern to options, history
 ///
 /// @returns true if :substitute can be replaced with a join command
-static bool sub_joining_lines(exarg_T *eap, char_u *pat,
-                              char_u *sub, char_u *cmd)
+static bool sub_joining_lines(exarg_T *eap, char_u *pat, char_u *sub,
+                              char_u *cmd, bool save)
   FUNC_ATTR_NONNULL_ARG(1, 3, 4)
 {
   // TODO(vim): find a generic solution to make line-joining operations more
@@ -2989,7 +2990,7 @@ static bool sub_joining_lines(exarg_T *eap, char_u *pat,
       ex_may_print(eap);
     }
 
-    if (!eap->is_live) {
+    if (save) {
       if (!cmdmod.keeppatterns) {
         save_re_pat(RE_SUBST, pat, p_magic);
       }
@@ -3108,7 +3109,7 @@ static char_u *sub_parse_flags(char_u *cmd, subflags_T *subflags,
 /// The usual escapes are supported as described in the regexp docs.
 ///
 /// @return buffer used for 'inccommand' preview
-static buf_T *do_sub(exarg_T *eap)
+static buf_T *do_sub(exarg_T *eap, proftime_T timeout)
 {
   long i = 0;
   regmmatch_T regmatch;
@@ -3137,10 +3138,10 @@ static buf_T *do_sub(exarg_T *eap)
   bool endcolumn = false;   // cursor in last column when done
   MatchedLineVec matched_lines = KV_INITIAL_VALUE;
   pos_T old_cursor = curwin->w_cursor;
-  proftime_T timeout = eap->is_live ? profile_setlimit(p_rdt) : profile_zero();
   int start_nsubs;
   int save_ma = 0;
   int save_b_changed = curbuf->b_changed;
+  bool preview = (State & CMDPREVIEW);
 
   if (!global_busy) {
     sub_nsubs = 0;
@@ -3208,7 +3209,7 @@ static buf_T *do_sub(exarg_T *eap)
       mb_ptr_adv(cmd);
     }
 
-    if (!eap->skip && !eap->is_live) {
+    if (!eap->skip && !preview) {
       sub_set_replacement((SubReplacementString) {
         .sub = xstrdup((char *) sub),
         .timestamp = os_time(),
@@ -3228,7 +3229,7 @@ static buf_T *do_sub(exarg_T *eap)
     endcolumn = (curwin->w_curswant == MAXCOL);
   }
 
-  if (sub_joining_lines(eap, pat, sub, cmd)) {
+  if (sub_joining_lines(eap, pat, sub, cmd, !preview)) {
     return NULL;
   }
 
@@ -3273,7 +3274,7 @@ static buf_T *do_sub(exarg_T *eap)
     return NULL;
   }
 
-  if (search_regcomp(pat, RE_SUBST, which_pat, (eap->is_live ? 0 : SEARCH_HIS),
+  if (search_regcomp(pat, RE_SUBST, which_pat, (preview ? 0 : SEARCH_HIS),
                      &regmatch) == FAIL) {
     if (subflags.do_error) {
       EMSG(_(e_invcmd));
@@ -3403,7 +3404,7 @@ static buf_T *do_sub(exarg_T *eap)
         curwin->w_cursor.lnum = lnum;
         do_again = FALSE;
 
-        if (eap->is_live) {
+        if (preview) {
           // Increment the in-line match count and store the column.
           matched_line.nmatch++;
           kv_push(matched_line.cols, regmatch.startpos[0].col);
@@ -3456,7 +3457,7 @@ static buf_T *do_sub(exarg_T *eap)
             goto skip;
         }
 
-        if (subflags.do_ask && !eap->is_live) {
+        if (subflags.do_ask && !preview) {
           int typed = 0;
 
           /* change State to CONFIRM, so that the mouse works
@@ -3627,9 +3628,9 @@ static buf_T *do_sub(exarg_T *eap)
          * use "\=col("."). */
         curwin->w_cursor.col = regmatch.startpos[0].col;
 
-        // 3. Substitute the string. During 'inccommand' only do this if there
-        //    is a replace pattern.
-        if (!eap->is_live || has_second_delim) {
+        // 3. Substitute the string. During 'inccommand' preview only do this if
+        //    there is a replace pattern.
+        if (!preview || has_second_delim) {
           if (subflags.do_count) {
             // prevent accidentally changing the buffer by a function
             save_ma = curbuf->b_p_ma;
@@ -3873,7 +3874,7 @@ skip:
       xfree(sub_firstline);          /* free the copy of the original line */
       sub_firstline = NULL;
 
-      if (eap->is_live) {
+      if (preview) {
         matched_line.lnum = lnum;
         matched_line.line = vim_strsave(ml_get(lnum));
         kv_push(matched_lines, matched_line);
@@ -3917,7 +3918,7 @@ skip:
           beginline(BL_WHITE | BL_FIX);
         }
       }
-      if (!eap->is_live && !do_sub_msg(subflags.do_count) && subflags.do_ask) {
+      if (!preview && !do_sub_msg(subflags.do_count) && subflags.do_ask) {
         MSG("");
       }
     } else {
@@ -3952,7 +3953,7 @@ skip:
 
   // Show 'inccommand' preview if there are matched lines.
   buf_T *preview_buf = NULL;
-  if (eap->is_live && !aborting()) {
+  if (preview && !aborting()) {
     if (got_quit) {  // Substitution is too slow, disable 'inccommand'.
       set_string_option_direct((char_u *)"icm", -1, (char_u *)"", OPT_FREE,
                                SID_NONE);
@@ -6122,8 +6123,9 @@ static buf_T *show_sub(exarg_T *eap, pos_T old_cusr, char_u *pat, char_u *sub,
 /// from undo history.
 void ex_substitute(exarg_T *eap)
 {
-  if (*p_icm == NUL || !eap->is_live) {  // 'inccommand' is disabled
-    (void)do_sub(eap);
+  bool preview = (State & CMDPREVIEW);
+  if (*p_icm == NUL || !preview) {  // 'inccommand' is disabled
+    (void)do_sub(eap, profile_zero());
     return;
   }
 
@@ -6145,7 +6147,7 @@ void ex_substitute(exarg_T *eap)
   curwin->w_p_cul = false;    // Disable 'cursorline'
   curwin->w_p_cuc = false;    // Disable 'cursorcolumn'
 
-  buf_T *preview_buf = do_sub(eap);
+  buf_T *preview_buf = do_sub(eap, profile_setlimit(p_rdt));
 
   if (save_changedtick != curbuf->b_changedtick) {
     // Undo invisibly. This also moves the cursor!