vim-patch:9.1.0131: buffer-completion may not always find all matches (#27610)

Problem:  buffer-completion code too complicated and does not always
          find all matches (irisjae)
Solution: do not try to anchor pattern to beginning of line or
          directory-separator, always return all matches

Note: we are considering the non-fuzzy buffer-matching here.

Currently, the buffer-completion code makes 2 attempts to match a
pattern against the list of available patterns. First try is to match
the pattern and anchor it to either the beginning of the file name or
at a directory-separator (// or \\).

When a match is found, Vim returns the matching buffers and does not try
to find a match anywhere within a buffer name. So if you have opened two
buffers like /tmp/Foobar.c and /tmp/MyFoobar.c using `:b Foo` will only
complete to the first filename, but not the second (the same happens
with `getcompletion('Foo', 'buffer')`).

It may make sense, that completion priorities buffer names at directory
boundaries, but it inconsistent, may cause confusion why a certain
buffer name is not completed when typing `:b Foo<C-D>` which returns
only a single file name and then pressing Enter (to switch to that
buffer), Vim will error with 'E93: More than one match for Foo').
Similar things may happen when wiping the /tmp/Foobar.c pattern and
afterwards the completion starts completing other buffers.

So let's simplify the code and always match the pattern anywhere in the
buffer name, do not try to favor matches at directory boundaries. This
is also simplifies the code a bit, we do not need to run over the list
of buffers several times, but only twice.

fixes vim/vim#13894
closes: vim/vim#14082

https://github.com/vim/vim/commit/0dc0bff000fd804c6b0778ccc4554a4e4c82c8c9

Cherry-pick test_cmdline.vim from patch 9.1.0019 as it already passes.

Co-authored-by: Christian Brabandt <cb@256bit.org>

1 files changed, 82 insertions, 94 deletions

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index bf1d2ac6dd..ac6ccf223c 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -2377,10 +2377,8 @@ static int buf_time_compare(const void *s1, const void *s2)
 /// @return  OK if matches found, FAIL otherwise.
 int ExpandBufnames(char *pat, int *num_file, char ***file, int options)
 {
-  int count = 0;
-  int round;
-  char *p;
   bufmatch_T *matches = NULL;
+  bool to_free = false;
 
   *num_file = 0;                    // return values in case of FAIL
   *file = NULL;
@@ -2392,125 +2390,115 @@ int ExpandBufnames(char *pat, int *num_file, char ***file, int options)
   const bool fuzzy = cmdline_fuzzy_complete(pat);
 
   char *patc = NULL;
+  fuzmatch_str_T *fuzmatch = NULL;
+  regmatch_T regmatch;
+
   // Make a copy of "pat" and change "^" to "\(^\|[\/]\)" (if doing regular
   // expression matching)
   if (!fuzzy) {
-    if (*pat == '^') {
-      patc = xmalloc(strlen(pat) + 11);
-      STRCPY(patc, "\\(^\\|[\\/]\\)");
-      STRCPY(patc + 11, pat + 1);
+    if (*pat == '^' && pat[1] != NUL) {
+      patc = xstrdup(pat + 1);
+      to_free = true;
+    } else if (*pat == '^') {
+      patc = "";
     } else {
       patc = pat;
     }
+    regmatch.regprog = vim_regcomp(patc, RE_MAGIC);
   }
 
-  fuzmatch_str_T *fuzmatch = NULL;
-  // attempt == 0: try match with    '\<', match at start of word
-  // attempt == 1: try match without '\<', match anywhere
-  for (int attempt = 0; attempt <= (fuzzy ? 0 : 1); attempt++) {
-    regmatch_T regmatch;
-    if (!fuzzy) {
-      if (attempt > 0 && patc == pat) {
-        break;            // there was no anchor, no need to try again
+  int count = 0;
+  int score = 0;
+  // round == 1: Count the matches.
+  // round == 2: Build the array to keep the matches.
+  for (int round = 1; round <= 2; round++) {
+    count = 0;
+    FOR_ALL_BUFFERS(buf) {
+      if (!buf->b_p_bl) {             // skip unlisted buffers
+        continue;
       }
-      regmatch.regprog = vim_regcomp(patc + attempt * 11, RE_MAGIC);
-    }
-
-    int score = 0;
-    // round == 1: Count the matches.
-    // round == 2: Build the array to keep the matches.
-    for (round = 1; round <= 2; round++) {
-      count = 0;
-      FOR_ALL_BUFFERS(buf) {
-        if (!buf->b_p_bl) {             // skip unlisted buffers
+      if (options & BUF_DIFF_FILTER) {
+        // Skip buffers not suitable for
+        // :diffget or :diffput completion.
+        if (buf == curbuf || !diff_mode_buf(buf)) {
           continue;
         }
-        if (options & BUF_DIFF_FILTER) {
-          // Skip buffers not suitable for
-          // :diffget or :diffput completion.
-          if (buf == curbuf || !diff_mode_buf(buf)) {
-            continue;
-          }
-        }
+      }
 
-        if (!fuzzy) {
-          if (regmatch.regprog == NULL) {
-            // invalid pattern, possibly after recompiling
-            if (patc != pat) {
-              xfree(patc);
-            }
-            return FAIL;
-          }
-          p = buflist_match(&regmatch, buf, p_wic);
-        } else {
-          p = NULL;
-          // first try matching with the short file name
-          if ((score = fuzzy_match_str(buf->b_sfname, pat)) != 0) {
-            p = buf->b_sfname;
+      char *p = NULL;
+      if (!fuzzy) {
+        if (regmatch.regprog == NULL) {
+          // invalid pattern, possibly after recompiling
+          if (to_free) {
+            xfree(patc);
           }
-          if (p == NULL) {
-            // next try matching with the full path file name
-            if ((score = fuzzy_match_str(buf->b_ffname, pat)) != 0) {
-              p = buf->b_ffname;
-            }
-          }
-        }
-
-        if (p == NULL) {
-          continue;
-        }
-
-        if (round == 1) {
-          count++;
-          continue;
+          return FAIL;
         }
-
-        if (options & WILD_HOME_REPLACE) {
-          p = home_replace_save(buf, p);
-        } else {
-          p = xstrdup(p);
+        p = buflist_match(&regmatch, buf, p_wic);
+      } else {
+        p = NULL;
+        // first try matching with the short file name
+        if ((score = fuzzy_match_str(buf->b_sfname, pat)) != 0) {
+          p = buf->b_sfname;
         }
-
-        if (!fuzzy) {
-          if (matches != NULL) {
-            matches[count].buf = buf;
-            matches[count].match = p;
-            count++;
-          } else {
-            (*file)[count++] = p;
+        if (p == NULL) {
+          // next try matching with the full path file name
+          if ((score = fuzzy_match_str(buf->b_ffname, pat)) != 0) {
+            p = buf->b_ffname;
           }
-        } else {
-          fuzmatch[count].idx = count;
-          fuzmatch[count].str = p;
-          fuzmatch[count].score = score;
-          count++;
         }
       }
-      if (count == 0) {         // no match found, break here
-        break;
+
+      if (p == NULL) {
+        continue;
       }
+
       if (round == 1) {
-        if (!fuzzy) {
-          *file = xmalloc((size_t)count * sizeof(**file));
-          if (options & WILD_BUFLASTUSED) {
-            matches = xmalloc((size_t)count * sizeof(*matches));
-          }
+        count++;
+        continue;
+      }
+
+      if (options & WILD_HOME_REPLACE) {
+        p = home_replace_save(buf, p);
+      } else {
+        p = xstrdup(p);
+      }
+
+      if (!fuzzy) {
+        if (matches != NULL) {
+          matches[count].buf = buf;
+          matches[count].match = p;
+          count++;
         } else {
-          fuzmatch = xmalloc((size_t)count * sizeof(fuzmatch_str_T));
+          (*file)[count++] = p;
         }
+      } else {
+        fuzmatch[count].idx = count;
+        fuzmatch[count].str = p;
+        fuzmatch[count].score = score;
+        count++;
       }
     }
-
-    if (!fuzzy) {
-      vim_regfree(regmatch.regprog);
-      if (count) {                // match(es) found, break here
-        break;
+    if (count == 0) {         // no match found, break here
+      break;
+    }
+    if (round == 1) {
+      if (!fuzzy) {
+        *file = xmalloc((size_t)count * sizeof(**file));
+        if (options & WILD_BUFLASTUSED) {
+          matches = xmalloc((size_t)count * sizeof(*matches));
+        }
+      } else {
+        fuzmatch = xmalloc((size_t)count * sizeof(fuzmatch_str_T));
       }
     }
   }
 
-  if (!fuzzy && patc != pat) {
-    xfree(patc);
+  if (!fuzzy) {
+    vim_regfree(regmatch.regprog);
+    if (to_free) {
+      xfree(patc);
+    }
   }
 
   if (!fuzzy) {