Mercurial > vim
changeset 24406:a26f0fa12845 v8.2.2743
patch 8.2.2743: Vim9: function state stuck when compiling with ":silent!"
Commit: https://github.com/vim/vim/commit/599410cb3cb19946cd6df22441da5de003e114bb
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Apr 10 14:03:43 2021 +0200
patch 8.2.2743: Vim9: function state stuck when compiling with ":silent!"
Problem: Vim9: function state stuck when compiling with ":silent!".
Solution: Check for uf_def_status to be UF_COMPILING.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 10 Apr 2021 14:15:03 +0200 |
| parents | 2831ce589a7d |
| children | 31c7a2a80f9c |
| files | src/globals.h src/message.c src/testdir/test_vim9_func.vim src/version.c src/vim9compile.c |
| diffstat | 5 files changed, 27 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/globals.h +++ b/src/globals.h @@ -230,6 +230,9 @@ EXTERN int did_endif INIT(= FALSE); / EXTERN int did_emsg; // set by emsg() when the message // is displayed or thrown #ifdef FEAT_EVAL +EXTERN int did_emsg_silent INIT(= 0); // incremented by emsg() when + // emsg_silent was set and did_emsg + // is not incremented EXTERN int did_emsg_def; // set by emsg() when emsg_silent // is set before calling a function EXTERN int did_emsg_cumul; // cumulative did_emsg, increased
--- a/src/message.c +++ b/src/message.c @@ -685,6 +685,9 @@ emsg_core(char_u *s) */ if (emsg_silent != 0) { +#ifdef FEAT_EVAL + ++did_emsg_silent; +#endif if (emsg_noredir == 0) { msg_start();
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -2603,6 +2603,20 @@ def Test_compile_error() # Second call won't try compiling again assert_fails('call g:Broken()', 'E1091: Function is not compiled: Broken') + delfunc g:Broken + + # No error when compiling with :silent! + lines =<< trim END + def g:Broken() + echo 'a' + [] + enddef + silent! defcompile + END + CheckScriptSuccess(lines) + + # Calling the function won't try compiling again + assert_fails('call g:Broken()', 'E1091: Function is not compiled: Broken') + delfunc g:Broken enddef
--- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2743, +/**/ 2742, /**/ 2741,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -8429,6 +8429,7 @@ compile_def_function( cctx_T cctx; garray_T *instr; int did_emsg_before = did_emsg; + int did_emsg_silent_before = did_emsg_silent; int ret = FAIL; sctx_T save_current_sctx = current_sctx; int save_estack_compiling = estack_compiling; @@ -8967,6 +8968,9 @@ nextline: generate_instr(&cctx, ISN_RETURN_ZERO); } + // When compiled with ":silent!" and there was an error don't consider the + // function compiled. + if (emsg_silent == 0 || did_emsg_silent == did_emsg_silent_before) { dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) + ufunc->uf_dfunc_idx; @@ -8994,7 +8998,7 @@ nextline: ret = OK; erret: - if (ret == FAIL) + if (ufunc->uf_def_status == UF_COMPILING) { int idx; dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)