# HG changeset patch # User Bram Moolenaar # Date 1637444703 -3600 # Node ID a968027f8a2ca2b785fc21fbfab32937f2cbaf58 # Parent 72829db3aeaaea11471b571dd63f13a81c1c5de5 patch 8.2.3633: Vim9: line number of lambda is off by one Commit: https://github.com/vim/vim/commit/a755fdbe80bed4897e06028f0044c208e0f9d8cb Author: Bram Moolenaar Date: Sat Nov 20 21:35:41 2021 +0000 patch 8.2.3633: Vim9: line number of lambda is off by one Problem: Vim9: line number of lambda is off by one. Solution: Add one to the line number. (closes https://github.com/vim/vim/issues/9083) diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1052,6 +1052,20 @@ def Test_call_lambda_args() CheckScriptFailure(['vim9script'] + lines, 'E118: Too many arguments for function: ', 2) enddef +def Test_lambda_line_nr() + var lines =<< trim END + vim9script + # comment + # comment + var id = timer_start(1'000, (_) => 0) + var out = execute('verbose ' .. timer_info(id)[0].callback + ->string() + ->substitute("('\\|')", ' ', 'g')) + assert_match('Last set from .* line 4', out) + END + CheckScriptSuccess(lines) +enddef + def FilterWithCond(x: string, Cond: func(string): bool): bool return Cond(x) enddef diff --git a/src/userfunc.c b/src/userfunc.c --- a/src/userfunc.c +++ b/src/userfunc.c @@ -1491,7 +1491,7 @@ get_lambda_tv( fp->uf_flags = flags; fp->uf_calls = 0; fp->uf_script_ctx = current_sctx; - fp->uf_script_ctx.sc_lnum += SOURCING_LNUM - newlines.ga_len; + fp->uf_script_ctx.sc_lnum += SOURCING_LNUM - newlines.ga_len + 1; function_using_block_scopes(fp, evalarg->eval_cstack); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3633, +/**/ 3632, /**/ 3631,