forked from aniani/vim
patch 8.2.3775: Vim9: lambda compiled without outer context when debugging
Problem: Vim9: lambda compiled without outer context when debugging. Solution: When compiling a lambda for debugging also compile it without. (closes #9302)
This commit is contained in:
parent
b711814cb6
commit
9fffef9f35
@ -4634,6 +4634,29 @@ def Test_xxx_echoerr_line_number()
|
|||||||
CheckDefExecAndScriptFailure(lines, 'some error continued', 1)
|
CheckDefExecAndScriptFailure(lines, 'some error continued', 1)
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
|
def Test_debug_with_lambda()
|
||||||
|
CheckRunVimInTerminal
|
||||||
|
|
||||||
|
var lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
def Func()
|
||||||
|
var n = 0
|
||||||
|
echo [0]->filter((_, v) => v == n)
|
||||||
|
enddef
|
||||||
|
breakadd func Func
|
||||||
|
Func()
|
||||||
|
END
|
||||||
|
writefile(lines, 'XdebugFunc')
|
||||||
|
var buf = RunVimInTerminal('-S XdebugFunc', {rows: 6, wait_for_ruler: 0})
|
||||||
|
WaitForAssert(() => assert_match('^>', term_getline(buf, 6)))
|
||||||
|
|
||||||
|
term_sendkeys(buf, "cont\<CR>")
|
||||||
|
WaitForAssert(() => assert_match('\[0\]', term_getline(buf, 5)))
|
||||||
|
|
||||||
|
StopVimInTerminal(buf)
|
||||||
|
delete('XdebugFunc')
|
||||||
|
enddef
|
||||||
|
|
||||||
def ProfiledWithLambda()
|
def ProfiledWithLambda()
|
||||||
var n = 3
|
var n = 3
|
||||||
echo [[1, 2], [3, 4]]->filter((_, l) => l[0] == n)
|
echo [[1, 2], [3, 4]]->filter((_, l) => l[0] == n)
|
||||||
|
@ -753,6 +753,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 */
|
||||||
|
/**/
|
||||||
|
3775,
|
||||||
/**/
|
/**/
|
||||||
3774,
|
3774,
|
||||||
/**/
|
/**/
|
||||||
|
@ -3762,12 +3762,15 @@ compile_lambda(char_u **arg, cctx_T *cctx)
|
|||||||
ufunc->uf_ret_type = &t_unknown;
|
ufunc->uf_ret_type = &t_unknown;
|
||||||
compile_def_function(ufunc, FALSE, cctx->ctx_compile_type, cctx);
|
compile_def_function(ufunc, FALSE, cctx->ctx_compile_type, cctx);
|
||||||
|
|
||||||
|
// When the outer function is compiled for profiling or debugging, the
|
||||||
|
// lambda may be called without profiling or debugging. Compile it here in
|
||||||
|
// the right context.
|
||||||
|
if (cctx->ctx_compile_type == CT_DEBUG
|
||||||
#ifdef FEAT_PROFILE
|
#ifdef FEAT_PROFILE
|
||||||
// When the outer function is compiled for profiling, the lambda may be
|
|| cctx->ctx_compile_type == CT_PROFILE
|
||||||
// called without profiling. Compile it here in the right context.
|
|
||||||
if (cctx->ctx_compile_type == CT_PROFILE)
|
|
||||||
compile_def_function(ufunc, FALSE, CT_NONE, cctx);
|
|
||||||
#endif
|
#endif
|
||||||
|
)
|
||||||
|
compile_def_function(ufunc, FALSE, CT_NONE, cctx);
|
||||||
|
|
||||||
// The last entry in evalarg.eval_tofree_ga is a copy of the last line and
|
// The last entry in evalarg.eval_tofree_ga is a copy of the last line and
|
||||||
// "*arg" may point into it. Point into the original line to avoid a
|
// "*arg" may point into it. Point into the original line to avoid a
|
||||||
|
Loading…
x
Reference in New Issue
Block a user