Skip to content

Commit ae25448

Browse files
committed
Revert "fix(event): dont use autocmd pattern to detect event retriggering. Fixes #858"
This reverts commit bc89502.
1 parent 27c12ff commit ae25448

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

lua/lazy/core/handler/event.lua

+8-6
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ function M:_add(value)
2828
return
2929
end
3030
Util.track({ [self.type] = value })
31-
local groups = M.get_augroups(event)
31+
local groups = M.get_augroups(event, pattern)
3232
-- load the plugins
3333
Loader.load(self.active[value], { [self.type] = value })
3434
-- check if any plugin created an event handler for this event and fire the group
35-
self:trigger(event, groups)
35+
self:trigger(event, pattern, groups)
3636
Util.track()
3737
end,
3838
})
@@ -45,11 +45,12 @@ end
4545

4646
-- Get all augroups for the events
4747
---@param event string
48-
function M.get_augroups(event)
48+
---@param pattern? string
49+
function M.get_augroups(event, pattern)
4950
local events = M.trigger_events[event] or { event }
5051
---@type table<string,true>
5152
local groups = {}
52-
for _, autocmd in ipairs(vim.api.nvim_get_autocmds({ event = events })) do
53+
for _, autocmd in ipairs(vim.api.nvim_get_autocmds({ event = events, pattern = pattern })) do
5354
if autocmd.group then
5455
groups[autocmd.group] = true
5556
end
@@ -60,17 +61,18 @@ end
6061
---@param event string|string[]
6162
---@param pattern? string
6263
---@param groups table<string,true>
63-
function M:trigger(event, groups)
64+
function M:trigger(event, pattern, groups)
6465
local events = M.trigger_events[event] or { event }
6566
---@cast events string[]
6667
for _, e in ipairs(events) do
67-
for _, autocmd in ipairs(vim.api.nvim_get_autocmds({ event = e })) do
68+
for _, autocmd in ipairs(vim.api.nvim_get_autocmds({ event = e, pattern = pattern })) do
6869
if autocmd.event == e and autocmd.group and not groups[autocmd.group] then
6970
if Config.options.debug then
7071
Util.info({
7172
"# Firing Events",
7273
" - **group:** `" .. autocmd.group_name .. "`",
7374
" - **event:** " .. autocmd.event,
75+
pattern and (" - **pattern:** " .. pattern),
7476
})
7577
end
7678
Util.track({ event = autocmd.group_name })

0 commit comments

Comments
 (0)