aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.2.4888: line number of lambda ignores line continuation

Browse Source 
Problem:    Line number of lambda ignores line continuation.
Solution:   Use the line number of where the arguments are. Avoid outputting
            "..." twice. (closes #10364)
This commit is contained in:
Bram Moolenaar
2022-05-06 15:47:07 +01:00
parent 9b334d5912
commit 521bf32bb4
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/userfunc.c
View File

@@ -1373,6 +1373,7 @@ get_lambda_tv(
int white_error = FALSE; int white_error = FALSE;
int called_emsg_start = called_emsg; int called_emsg_start = called_emsg;
int vim9script = in_vim9script(); int vim9script = in_vim9script();
long start_lnum = SOURCING_LNUM;
if (equal_arrow && !vim9script) if (equal_arrow && !vim9script)
return NOTDONE; return NOTDONE;
@@ -1433,6 +1434,7 @@ get_lambda_tv(
if (evalarg == NULL) if (evalarg == NULL)
// cannot happen? // cannot happen?
goto theend; goto theend;
SOURCING_LNUM = start_lnum; // used for where lambda is defined
if (lambda_function_body(arg, rettv, evalarg, pnewargs, if (lambda_function_body(arg, rettv, evalarg, pnewargs,
types_optional ? &argtypes : NULL, varargs, types_optional ? &argtypes : NULL, varargs,
&default_args, ret_type) == FAIL) &default_args, ret_type) == FAIL)
@@ -1563,7 +1565,8 @@ get_lambda_tv(
fp->uf_flags = flags; fp->uf_flags = flags;
fp->uf_calls = 0; fp->uf_calls = 0;
fp->uf_script_ctx = current_sctx; fp->uf_script_ctx = current_sctx;
fp->uf_script_ctx.sc_lnum += SOURCING_LNUM - newlines.ga_len + 1; // Use the line number of the arguments.
fp->uf_script_ctx.sc_lnum += start_lnum;
function_using_block_scopes(fp, evalarg->eval_cstack); function_using_block_scopes(fp, evalarg->eval_cstack);
@@ -3707,9 +3710,12 @@ list_func_head(ufunc_T *fp, int indent)
} }
if (fp->uf_va_name != NULL) if (fp->uf_va_name != NULL)
{ {
if (j) if (!fp->uf_varargs)
msg_puts(", "); {
msg_puts("..."); if (j)
msg_puts(", ");
msg_puts("...");
}
msg_puts((char *)fp->uf_va_name); msg_puts((char *)fp->uf_va_name);
if (fp->uf_va_type != NULL) if (fp->uf_va_type != NULL)
{ {

2
src/version.c
View File

@@ -746,6 +746,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 */
/**/
4888,
/**/ /**/
4887, 4887,
/**/ /**/