patch 8.2.4888: line number of lambda ignores line continuation
Problem: Line number of lambda ignores line continuation.
Solution: Use the line number of where the arguments are. Avoid outputting
"..." twice. (closes #10364)
diff --git a/src/userfunc.c b/src/userfunc.c
index f3ba771..081bac1 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -1373,6 +1373,7 @@
int white_error = FALSE;
int called_emsg_start = called_emsg;
int vim9script = in_vim9script();
+ long start_lnum = SOURCING_LNUM;
if (equal_arrow && !vim9script)
return NOTDONE;
@@ -1433,6 +1434,7 @@
if (evalarg == NULL)
// cannot happen?
goto theend;
+ SOURCING_LNUM = start_lnum; // used for where lambda is defined
if (lambda_function_body(arg, rettv, evalarg, pnewargs,
types_optional ? &argtypes : NULL, varargs,
&default_args, ret_type) == FAIL)
@@ -1563,7 +1565,8 @@
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 + 1;
+ // Use the line number of the arguments.
+ fp->uf_script_ctx.sc_lnum += start_lnum;
function_using_block_scopes(fp, evalarg->eval_cstack);
@@ -3707,9 +3710,12 @@
}
if (fp->uf_va_name != NULL)
{
- if (j)
- msg_puts(", ");
- msg_puts("...");
+ if (!fp->uf_varargs)
+ {
+ if (j)
+ msg_puts(", ");
+ msg_puts("...");
+ }
msg_puts((char *)fp->uf_va_name);
if (fp->uf_va_type != NULL)
{