vim-patch:8.2.0502: Vim9: some code is not tested

Problem:    Vim9: some code is not tested.
Solution:   Add more tests.  Fix uncovered problems.

https://github.com/vim/vim/commit/e8c4abbbd711af8fd3ed85ea69e9ac3d63a0d879

Co-authored-by: Bram Moolenaar <Bram@vim.org>

1 files changed, 11 insertions, 1 deletions

diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index d6f207a248..4ae7fc7578 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -484,10 +484,17 @@ static char_u *skip_anyof(char *p)
 /// Stop at end of "startp" or where "dirc" is found ('/', '?', etc).
 /// Take care of characters with a backslash in front of it.
 /// Skip strings inside [ and ].
+char *skip_regexp(char *startp, int dirc, int magic)
+{
+  return skip_regexp_ex(startp, dirc, magic, NULL, NULL);
+}
+
+/// skip_regexp() with extra arguments:
 /// When "newp" is not NULL and "dirc" is '?', make an allocated copy of the
 /// expression and change "\?" to "?".  If "*newp" is not NULL the expression
 /// is changed in-place.
-char *skip_regexp(char *startp, int dirc, int magic, char **newp)
+/// If a "\?" is changed to "?" then "dropped" is incremented, unless NULL.
+char *skip_regexp_ex(char *startp, int dirc, int magic, char **newp, int *dropped)
 {
   int mymagic;
   char *p = startp;
@@ -516,6 +523,9 @@ char *skip_regexp(char *startp, int dirc, int magic, char **newp)
           *newp = xstrdup(startp);
           p = *newp + (p - startp);
         }
+        if (dropped != NULL) {
+          (*dropped)++;
+        }
         STRMOVE(p, p + 1);
       } else {
         p++;            // skip next character