Merge remote-tracking branch 'upstream/master' into mix_20240309

1 files changed, 20 insertions, 10 deletions

diff --git a/runtime/lua/vim/glob.lua b/runtime/lua/vim/glob.lua
index ad4a915a94..22073b15c8 100644
--- a/runtime/lua/vim/glob.lua
+++ b/runtime/lua/vim/glob.lua
@@ -1,6 +1,6 @@
 local lpeg = vim.lpeg
 local P, S, V, R, B = lpeg.P, lpeg.S, lpeg.V, lpeg.R, lpeg.B
-local C, Cc, Ct, Cf = lpeg.C, lpeg.Cc, lpeg.Ct, lpeg.Cf
+local C, Cc, Ct, Cf, Cmt = lpeg.C, lpeg.Cc, lpeg.Ct, lpeg.Cf, lpeg.Cmt
 
 local M = {}
 
@@ -29,8 +29,10 @@ function M.to_lpeg(pattern)
     return patt
   end
 
-  local function add(acc, a)
-    return acc + a
+  local function condlist(conds, after)
+    return vim.iter(conds):fold(P(false), function(acc, cond)
+      return acc + cond * after
+    end)
   end
 
   local function mul(acc, m)
@@ -45,13 +47,22 @@ function M.to_lpeg(pattern)
     return (-after * P(1)) ^ 0 * after
   end
 
+  -- luacheck: push ignore s
+  local function cut(s, idx, match)
+    return idx, match
+  end
+  -- luacheck: pop
+
   local p = P({
     'Pattern',
     Pattern = V('Elem') ^ -1 * V('End'),
-    Elem = Cf(
-      (V('DStar') + V('Star') + V('Ques') + V('Class') + V('CondList') + V('Literal'))
-        * (V('Elem') + V('End')),
-      mul
+    Elem = Cmt(
+      Cf(
+        (V('DStar') + V('Star') + V('Ques') + V('Class') + V('CondList') + V('Literal'))
+          * (V('Elem') + V('End')),
+        mul
+      ),
+      cut
     ),
     DStar = (B(pathsep) + -B(P(1)))
       * P('**')
@@ -63,15 +74,14 @@ function M.to_lpeg(pattern)
       * C(P('!') ^ -1)
       * Ct(Ct(C(P(1)) * P('-') * C(P(1) - P(']'))) ^ 1 * P(']'))
       / class,
-    CondList = P('{') * Cf(V('Cond') * (P(',') * V('Cond')) ^ 0, add) * P('}'),
+    CondList = P('{') * Ct(V('Cond') * (P(',') * V('Cond')) ^ 0) * P('}') * V('Pattern') / condlist,
     -- TODO: '*' inside a {} condition is interpreted literally but should probably have the same
     -- wildcard semantics it usually has.
     -- Fixing this is non-trivial because '*' should match non-greedily up to "the rest of the
     -- pattern" which in all other cases is the entire succeeding part of the pattern, but at the end of a {}
     -- condition means "everything after the {}" where several other options separated by ',' may
     -- exist in between that should not be matched by '*'.
-    Cond = Cf((V('Ques') + V('Class') + V('CondList') + (V('Literal') - S(',}'))) ^ 1, mul)
-      + Cc(P(0)),
+    Cond = Cmt(Cf((V('Ques') + V('Class') + V('Literal') - S(',}')) ^ 1, mul), cut) + Cc(P(0)),
     Literal = P(1) / P,
     End = P(-1) * Cc(P(-1)),
   })