diff options
| -rw-r--r-- | src/nvim/autocmd.c | 38 | ||||
| -rw-r--r-- | test/functional/autocmd/autocmd_spec.lua | 24 |
2 files changed, 46 insertions, 16 deletions
diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c index eb7c8c2880..6a7cf1c9a3 100644 --- a/src/nvim/autocmd.c +++ b/src/nvim/autocmd.c @@ -2025,7 +2025,8 @@ static void aucmd_next(AutoPatCmd *apc) apc->auidx = SIZE_MAX; } -static bool call_autocmd_callback(const AutoCmd *ac, const AutoPatCmd *apc) +/// Executes an autocmd callback function (as opposed to an Ex command). +static bool au_callback(const AutoCmd *ac, const AutoPatCmd *apc) { Callback callback = ac->exec.callable.cb; if (callback.type == kCallbackLua) { @@ -2106,16 +2107,24 @@ char *getnextac(int c, void *cookie, int indent, bool do_concat) apc->script_ctx = current_sctx; char *retval; - if (ac->exec.type == CALLABLE_CB) { - // Can potentially reallocate kvec_t data and invalidate the ac pointer - if (call_autocmd_callback(ac, apc)) { - // If an autocommand callback returns true, delete the autocommand - oneshot = true; - } - - // TODO(tjdevries): - // - // Major Hack Alert: + switch (ac->exec.type) { + case CALLABLE_EX: + retval = xstrdup(ac->exec.callable.cmd); + break; + case CALLABLE_CB: { + AutoCmd ac_copy = *ac; + // Mark oneshot handler as "removed" now, to prevent recursion by e.g. `:doautocmd`. #25526 + ac->pat = oneshot ? NULL : ac->pat; + // May reallocate `acs` kvec_t data and invalidate the `ac` pointer. + bool rv = au_callback(&ac_copy, apc); + if (oneshot) { + // Restore `pat`. Use `acs` because `ac` may have been invalidated by the callback. + kv_A(*acs, apc->auidx).pat = ac_copy.pat; + } + // If an autocommand callback returns true, delete the autocommand + oneshot = oneshot || rv; + + // HACK(tjdevries): // We just return "not-null" and continue going. // This would be a good candidate for a refactor. You would need to refactor: // 1. do_cmdline to accept something besides a string @@ -2124,8 +2133,11 @@ char *getnextac(int c, void *cookie, int indent, bool do_concat) // and instead we loop over all the matches and just execute one-by-one. // However, my expectation would be that could be expensive. retval = xcalloc(1, 1); - } else { - retval = xstrdup(ac->exec.callable.cmd); + break; + } + case CALLABLE_NONE: + default: + abort(); } // Remove one-shot ("once") autocmd in anticipation of its execution. diff --git a/test/functional/autocmd/autocmd_spec.lua b/test/functional/autocmd/autocmd_spec.lua index c62e4752e0..1b7275ebf6 100644 --- a/test/functional/autocmd/autocmd_spec.lua +++ b/test/functional/autocmd/autocmd_spec.lua @@ -160,7 +160,7 @@ describe('autocmd', function() it('++once', function() -- :help autocmd-once -- - -- ":autocmd ... ++once" executes its handler once, then removes the handler. + -- ":autocmd … ++once" executes its handler once, then removes the handler. -- local expected = { 'Many1', @@ -206,7 +206,7 @@ describe('autocmd', function() ) -- - -- ":autocmd ... ++once" handlers can be deleted. + -- ":autocmd … ++once" handlers can be deleted. -- expected = {} command('let g:foo = []') @@ -216,7 +216,7 @@ describe('autocmd', function() eq(expected, eval('g:foo')) -- - -- ":autocmd ... <buffer> ++once ++nested" + -- ":autocmd … <buffer> ++once ++nested" -- expected = { 'OptionSet-Once', @@ -250,6 +250,24 @@ describe('autocmd', function() --- Autocommands ---]]), fn.execute('autocmd Tabnew') ) + + -- + -- :autocmd does not recursively call ++once Lua handlers. + -- + exec_lua [[vim.g.count = 0]] + eq(0, eval('g:count')) + exec_lua [[ + vim.api.nvim_create_autocmd('User', { + once = true, + pattern = nil, + callback = function() + vim.g.count = vim.g.count + 1 + vim.api.nvim_exec_autocmds('User', { pattern = nil }) + end, + }) + vim.api.nvim_exec_autocmds('User', { pattern = nil }) + ]] + eq(1, eval('g:count')) end) it('internal `aucmd_win` window', function() |