Mercurial > vim
changeset 23281:5b4db8035d1d v8.2.2186
patch 8.2.2186: Vim9: error when using 'opfunc'
Commit: https://github.com/vim/vim/commit/5b3d1bb0f5180266c4de4d815b3ea856a2fb3519
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Dec 22 12:20:08 2020 +0100
patch 8.2.2186: Vim9: error when using 'opfunc'
Problem: Vim9: error when using 'opfunc'.
Solution: Do not expect a return value from 'opfunc'. (closes https://github.com/vim/vim/issues/7510)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 22 Dec 2020 12:30:04 +0100 |
| parents | a6d48e6961aa |
| children | a92f6e187da5 |
| files | src/eval.c src/ops.c src/proto/eval.pro src/testdir/test_vim9_func.vim src/version.c |
| diffstat | 5 files changed, 39 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -655,10 +655,27 @@ call_func_retnr( } /* + * Call Vim script function like call_func_retnr() and drop the result. + * Returns FAIL when calling the function fails. + */ + int +call_func_noret( + char_u *func, + int argc, + typval_T *argv) +{ + typval_T rettv; + + if (call_vim_function(func, argc, argv, &rettv) == FAIL) + return FAIL; + clear_tv(&rettv); + return OK; +} + +/* * Call Vim script function "func" and return the result as a string. + * Uses "argv" and "argc" as call_func_retnr(). * Returns NULL when calling the function fails. - * Uses argv[0] to argv[argc - 1] for the function arguments. argv[argc] should - * have type VAR_UNKNOWN. */ void * call_func_retstr( @@ -679,8 +696,7 @@ call_func_retstr( /* * Call Vim script function "func" and return the result as a List. - * Uses argv[0] to argv[argc - 1] for the function arguments. argv[argc] should - * have type VAR_UNKNOWN. + * Uses "argv" and "argc" as call_func_retnr(). * Returns NULL when there is something wrong. */ void *
--- a/src/ops.c +++ b/src/ops.c @@ -3299,7 +3299,7 @@ op_function(oparg_T *oap UNUSED) // function. virtual_op = MAYBE; - (void)call_func_retnr(p_opfunc, 1, argv); + (void)call_func_noret(p_opfunc, 1, argv); virtual_op = save_virtual_op; if (cmdmod.cmod_flags & CMOD_LOCKMARKS)
--- a/src/proto/eval.pro +++ b/src/proto/eval.pro @@ -18,6 +18,7 @@ varnumber_T eval_to_number(char_u *expr) typval_T *eval_expr(char_u *arg, exarg_T *eap); int call_vim_function(char_u *func, int argc, typval_T *argv, typval_T *rettv); varnumber_T call_func_retnr(char_u *func, int argc, typval_T *argv); +int call_func_noret(char_u *func, int argc, typval_T *argv); void *call_func_retstr(char_u *func, int argc, typval_T *argv); void *call_func_retlist(char_u *func, int argc, typval_T *argv); int eval_foldexpr(char_u *arg, int *cp);
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1976,5 +1976,20 @@ def Test_dict_member_with_silent() CheckScriptSuccess(lines) enddef +def Test_opfunc() + nnoremap <F3> <cmd>set opfunc=Opfunc<cr>g@ + def g:Opfunc(_: any): string + setline(1, 'ASDF') + return '' + enddef + new + setline(1, 'asdf') + feedkeys("\<F3>$", 'x') + assert_equal('ASDF', getline(1)) + + bwipe! + nunmap <F3> +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker