diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-01-23 13:39:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-01-23 13:39:14 +0100 |
| commit | 9a562c184d98d82bb7506caf2071cfe15a92fa43 (patch) | |
| tree | a88dbd515d2b8dca397912fc230573b0ed0f5c5f | |
| parent | 9ae3705b6ebd45086ca13c0f93a93f943559bd15 (diff) | |
patch 8.2.2395: Vim9: error for wrong type may report wrong line numberv8.2.2395
Problem: Vim9: error for wrong type may report wrong line number.
Solution: Save and restore the line number when evaluating the expression.
(closes #7727)
| -rw-r--r-- | src/evalvars.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_vim9_assign.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index dfc8e63f5a..b6a6927d60 100644 --- 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) { diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index 992eeaa655..55beffa958 100644 --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -55,6 +55,8 @@ def Test_assignment_bool() CheckDefAndScriptFailure(['var x: bool = [1]'], 'E1012:') CheckDefAndScriptFailure(['var x: bool = {}'], 'E1012:') CheckDefAndScriptFailure(['var x: bool = "x"'], 'E1012:') + + CheckDefAndScriptFailure(['var x: bool = "x"', '', 'eval 0'], 'E1012:', 1) enddef def Test_syntax() diff --git a/src/version.c b/src/version.c index 63fc0b33bc..7942e743f2 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2395, +/**/ 2394, /**/ 2393, |