diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-11-19 21:47:56 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-11-19 21:47:56 +0100 |
commit | 2ea95b61f4bec9b71cf916eebe8d11abc76617a0 (patch) | |
tree | 0bf9914214c629f0dfb7e749c931e0cc2159f8d4 | |
parent | 67d1c68f095eb6cbb6355b04972e384d23065c2c (diff) | |
download | vim-git-2ea95b61f4bec9b71cf916eebe8d11abc76617a0.tar.gz |
patch 8.2.2018: Vim9: script variable not found from lambdav8.2.2018
Problem: Vim9: script variable not found from lambda.
Solution: In a lambda also check the script hashtab for a variable without a
scope. (closes #7329)
-rw-r--r-- | src/evalvars.c | 23 | ||||
-rw-r--r-- | src/testdir/test_vim9_func.vim | 9 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 33 insertions, 1 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index 9c05c57a0..75893bb27 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -2628,7 +2628,28 @@ find_var(char_u *name, hashtab_T **htp, int no_autoload) return ret; // Search in parent scope for lambda - return find_var_in_scoped_ht(name, no_autoload || htp != NULL); + ret = find_var_in_scoped_ht(name, no_autoload || htp != NULL); + if (ret != NULL) + return ret; + + // in Vim9 script items without a scope can be script-local + if (in_vim9script() && name[0] != NUL && name[1] != ':') + { + ht = get_script_local_ht(); + if (ht != NULL) + { + ret = find_var_in_ht(ht, *name, varname, + no_autoload || htp != NULL); + if (ret != NULL) + { + if (htp != NULL) + *htp = ht; + return ret; + } + } + } + + return NULL; } /* diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 8d67b6f0b..5c937b657 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1476,6 +1476,15 @@ def Test_line_continuation_in_def() Line_continuation_in_def('.')->assert_equal('full') enddef +def Test_script_var_in_lambda() + var lines =<< trim END + vim9script + var script = 'test' + assert_equal(['test'], map(['one'], {-> script})) + END + CheckScriptSuccess(lines) +enddef + def Line_continuation_in_lambda(): list<string> var x = range(97, 100) ->map({_, v -> nr2char(v) diff --git a/src/version.c b/src/version.c index 03f8a3f70..ebfe94c6d 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 */ /**/ + 2018, +/**/ 2017, /**/ 2016, |