Mercurial > vim

diff src/evalvars.c @ 23707:6e8a4a30d94d v8.2.2395

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2395: Vim9: error for wrong type may report wrong line number Commit: https://github.com/vim/vim/commit/9a562c184d98d82bb7506caf2071cfe15a92fa43 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 23 13:39:14 2021 +0100 patch 8.2.2395: Vim9: error for wrong type may report wrong line number Problem: Vim9: error for wrong type may report wrong line number. Solution: Save and restore the line number when evaluating the expression. (closes #7727)
author Bram Moolenaar <Bram@vim.org>
date Sat, 23 Jan 2021 13:45:04 +0100
parents cd06cc37f53f
children 4b417b776b95
line wrap: on
line diff
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -838,6 +838,8 @@ ex_let(exarg_T *eap)
 	i = FAIL;
 	if (has_assign || concat)
 	{
+	    int cur_lnum;
+
 	    op[0] = '=';
 	    op[1] = NUL;
 	    if (*expr != '=')
@@ -882,10 +884,15 @@ ex_let(exarg_T *eap)
 		evalarg.eval_cookie = eap->cookie;
 	    }
 	    expr = skipwhite_and_linebreak(expr, &evalarg);
+	    cur_lnum = SOURCING_LNUM;
 	    i = eval0(expr, &rettv, eap, &evalarg);
 	    if (eap->skip)
 		--emsg_skip;
 	    clear_evalarg(&evalarg, eap);
+
+	    // Restore the line number so that any type error is given for the
+	    // declaration, not the expression.
+	    SOURCING_LNUM = cur_lnum;
 	}
 	if (eap->skip)
 	{