kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23188 from zeertzjq/vim-9.0.1462

Browse Source 
vim-patch:9.0.{1462,1468,1469}: :defer fixes
This commit is contained in:
zeertzjq 2023-04-19 08:35:27 +08:00 committed by GitHub
commit dd8781128f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 90 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/eval/userfunc.c
View File

@ -3242,12 +3242,24 @@ static void handle_defer_one(funccall_T *funccal)
{
for (int idx = funccal->fc_defer.ga_len - 1; idx >= 0; idx--) {
defer_T *dr = ((defer_T *)funccal->fc_defer.ga_data) + idx;
if (dr->dr_name == NULL) {
// already being called, can happen if function does ":qa"
continue;
}
funcexe_T funcexe = { .fe_evaluate = true };
typval_T rettv;
rettv.v_type = VAR_UNKNOWN; // tv_clear() uses this
call_func(dr->dr_name, -1, &rettv, dr->dr_argcount, dr->dr_argvars, &funcexe);
char *name = dr->dr_name;
dr->dr_name = NULL;
call_func(name, -1, &rettv, dr->dr_argcount, dr->dr_argvars, &funcexe);
tv_clear(&rettv);
xfree(dr->dr_name);
xfree(name);
for (int i = dr->dr_argcount - 1; i >= 0; i--) {
tv_clear(&dr->dr_argvars[i]);
}
@ -3258,8 +3270,14 @@ static void handle_defer_one(funccall_T *funccal)
/// Called when exiting: call all defer functions.
void invoke_all_defer(void)
{
for (funccall_T *funccal = current_funccal; funccal != NULL; funccal = funccal->fc_caller) {
handle_defer_one(funccal);
for (funccal_entry_T *fce = funccal_stack; fce != NULL; fce = fce->next) {
for (funccall_T *fc = fce->top_funccal; fc != NULL; fc = fc->fc_caller) {
handle_defer_one(fc);
}
}
for (funccall_T *fc = current_funccal; fc != NULL; fc = fc->fc_caller) {
handle_defer_one(fc);
}
}

80
test/old/testdir/test_user_func.vim
View File

@ -609,29 +609,85 @@ func Test_defer_throw()
call assert_false(filereadable('XDeleteTwo'))
endfunc
func Test_defer_quitall()
func Test_defer_quitall_func()
let lines =<< trim END
" vim9script
func DeferLevelTwo()
call writefile(['text'], 'XQuitallTwo', 'D')
call writefile(['text'], 'XQuitallFuncTwo', 'D')
call writefile(['quit'], 'XQuitallFuncThree', 'a')
qa!
endfunc
func DeferLevelOne()
call writefile(['text'], 'XQuitalFunclOne', 'D')
defer DeferLevelTwo()
endfunc
call DeferLevelOne()
END
call writefile(lines, 'XdeferQuitallFunc', 'D')
call system(GetVimCommand() .. ' -X -S XdeferQuitallFunc')
call assert_equal(0, v:shell_error)
call assert_false(filereadable('XQuitallFuncOne'))
call assert_false(filereadable('XQuitallFuncTwo'))
call assert_equal(['quit'], readfile('XQuitallFuncThree'))
call delete('XQuitallFuncThree')
endfunc
func Test_defer_quitall_def()
throw 'Skipped: Vim9 script is N/A'
let lines =<< trim END
vim9script
def DeferLevelTwo()
call writefile(['text'], 'XQuitallDefTwo', 'D')
call writefile(['quit'], 'XQuitallDefThree', 'a')
qa!
enddef
def DeferLevelOne()
call writefile(['text'], 'XQuitallDefOne', 'D')
defer DeferLevelTwo()
enddef
DeferLevelOne()
END
call writefile(lines, 'XdeferQuitallDef', 'D')
call system(GetVimCommand() .. ' -X -S XdeferQuitallDef')
call assert_equal(0, v:shell_error)
call assert_false(filereadable('XQuitallDefOne'))
call assert_false(filereadable('XQuitallDefTwo'))
call assert_equal(['quit'], readfile('XQuitallDefThree'))
call delete('XQuitallDefThree')
endfunc
func Test_defer_quitall_autocmd()
let lines =<< trim END
autocmd User DeferAutocmdThree qa!
func DeferLevelTwo()
call writefile(['text'], 'XQuitallAutocmdTwo', 'D')
doautocmd User DeferAutocmdThree
endfunc
autocmd User DeferAutocmdTwo ++nested call DeferLevelTwo()
" def DeferLevelOne()
func DeferLevelOne()
call writefile(['text'], 'XQuitallOne', 'D')
call DeferLevelTwo()
call writefile(['text'], 'XQuitallAutocmdOne', 'D')
doautocmd User DeferAutocmdTwo
" enddef
endfunc
" DeferLevelOne()
call DeferLevelOne()
autocmd User DeferAutocmdOne ++nested call DeferLevelOne()
doautocmd User DeferAutocmdOne
END
call writefile(lines, 'XdeferQuitall', 'D')
let res = system(GetVimCommand() .. ' -X -S XdeferQuitall')
call writefile(lines, 'XdeferQuitallAutocmd', 'D')
let res = system(GetVimCommand() .. ' -X -S XdeferQuitallAutocmd')
call assert_equal(0, v:shell_error)
call assert_false(filereadable('XQuitallOne'))
call assert_false(filereadable('XQuitallTwo'))
call assert_false(filereadable('XQuitallAutocmdOne'))
call assert_false(filereadable('XQuitallAutocmdTwo'))
endfunc
func Test_defer_quitall_in_expr_func()
@ -651,7 +707,7 @@ func Test_defer_quitall_in_expr_func()
call Test_defer_in_funcref()
END
call writefile(lines, 'XdeferQuitallExpr', 'D')
let res = system(GetVimCommand() .. ' -X -S XdeferQuitallExpr')
call system(GetVimCommand() .. ' -X -S XdeferQuitallExpr')
call assert_equal(0, v:shell_error)
call assert_false(filereadable('Xentry0'))
call assert_false(filereadable('Xentry1'))