mirror of
https://github.com/neovim/neovim.git
synced 2025-10-21 17:21:49 +00:00
fix(glob): avoid subcapture nesting too deep
error (#29520)
Use Cmt to evaluate Cond and Elem during match to avoid building the nested capture structure later.
This commit is contained in:
@@ -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 = {}
|
||||
|
||||
@@ -47,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('**')
|
||||
@@ -72,7 +81,7 @@ function M.to_lpeg(pattern)
|
||||
-- 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('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)),
|
||||
})
|
||||
|
Reference in New Issue
Block a user