mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
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.
This commit is contained in:
parent
701cc6ca9e
commit
599410cb3c
@ -230,6 +230,9 @@ EXTERN int did_endif INIT(= FALSE); // just had ":endif"
|
|||||||
EXTERN int did_emsg; // set by emsg() when the message
|
EXTERN int did_emsg; // set by emsg() when the message
|
||||||
// is displayed or thrown
|
// is displayed or thrown
|
||||||
#ifdef FEAT_EVAL
|
#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
|
EXTERN int did_emsg_def; // set by emsg() when emsg_silent
|
||||||
// is set before calling a function
|
// is set before calling a function
|
||||||
EXTERN int did_emsg_cumul; // cumulative did_emsg, increased
|
EXTERN int did_emsg_cumul; // cumulative did_emsg, increased
|
||||||
|
@ -685,6 +685,9 @@ emsg_core(char_u *s)
|
|||||||
*/
|
*/
|
||||||
if (emsg_silent != 0)
|
if (emsg_silent != 0)
|
||||||
{
|
{
|
||||||
|
#ifdef FEAT_EVAL
|
||||||
|
++did_emsg_silent;
|
||||||
|
#endif
|
||||||
if (emsg_noredir == 0)
|
if (emsg_noredir == 0)
|
||||||
{
|
{
|
||||||
msg_start();
|
msg_start();
|
||||||
|
@ -2603,6 +2603,20 @@ def Test_compile_error()
|
|||||||
|
|
||||||
# Second call won't try compiling again
|
# Second call won't try compiling again
|
||||||
assert_fails('call g:Broken()', 'E1091: Function is not compiled: Broken')
|
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
|
enddef
|
||||||
|
|
||||||
|
|
||||||
|
@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2743,
|
||||||
/**/
|
/**/
|
||||||
2742,
|
2742,
|
||||||
/**/
|
/**/
|
||||||
|
@ -8429,6 +8429,7 @@ compile_def_function(
|
|||||||
cctx_T cctx;
|
cctx_T cctx;
|
||||||
garray_T *instr;
|
garray_T *instr;
|
||||||
int did_emsg_before = did_emsg;
|
int did_emsg_before = did_emsg;
|
||||||
|
int did_emsg_silent_before = did_emsg_silent;
|
||||||
int ret = FAIL;
|
int ret = FAIL;
|
||||||
sctx_T save_current_sctx = current_sctx;
|
sctx_T save_current_sctx = current_sctx;
|
||||||
int save_estack_compiling = estack_compiling;
|
int save_estack_compiling = estack_compiling;
|
||||||
@ -8967,6 +8968,9 @@ nextline:
|
|||||||
generate_instr(&cctx, ISN_RETURN_ZERO);
|
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)
|
dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
|
||||||
+ ufunc->uf_dfunc_idx;
|
+ ufunc->uf_dfunc_idx;
|
||||||
@ -8994,7 +8998,7 @@ nextline:
|
|||||||
ret = OK;
|
ret = OK;
|
||||||
|
|
||||||
erret:
|
erret:
|
||||||
if (ret == FAIL)
|
if (ufunc->uf_def_status == UF_COMPILING)
|
||||||
{
|
{
|
||||||
int idx;
|
int idx;
|
||||||
dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
|
dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user