diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-06 16:38:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-06 16:38:12 +0200 |
| commit | ae95a3946b012d4e68bcb20b28f691f6d3b9caaf (patch) | |
| tree | 49a18b8dc3145e921b6b5af30c7f78fab9320c6e | |
| parent | bbd3e3c357487f7a5bdc704a819f63a7dd0dd66e (diff) | |
| download | vim-git-ae95a3946b012d4e68bcb20b28f691f6d3b9caaf.tar.gz | |
patch 8.2.1379: curly braces expression ending in " }" does not workv8.2.1379
Problem: Curly braces expression ending in " }" does not work.
Solution: Skip over white space when checking for "}". (closes #6634)
| -rw-r--r-- | src/dict.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_eval_stuff.vim | 22 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 25 insertions, 1 deletions
diff --git a/src/dict.c b/src/dict.c index af1e1e9c8..ad482cddd 100644 --- a/src/dict.c +++ b/src/dict.c @@ -817,7 +817,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal) { if (eval1(&start, &tv, NULL) == FAIL) // recursive! return FAIL; - if (*start == '}') + if (*skipwhite(start) == '}') return NOTDONE; } diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim index 6d95cc033..bca89f7a7 100644 --- a/src/testdir/test_eval_stuff.vim +++ b/src/testdir/test_eval_stuff.vim @@ -532,4 +532,26 @@ func Test_setreg_basic() call assert_fails('call setreg(1, ["", "", [], ""])', 'E730:') endfunc +func Test_curly_assignment() + let s:svar = 'svar' + let g:gvar = 'gvar' + let lname = 'gvar' + let gname = 'gvar' + let {'s:'.lname} = {'g:'.gname} + call assert_equal('gvar', s:gvar) + let s:gvar = '' + let { 's:'.lname } = { 'g:'.gname } + call assert_equal('gvar', s:gvar) + let s:gvar = '' + let { 's:' . lname } = { 'g:' . gname } + call assert_equal('gvar', s:gvar) + let s:gvar = '' + let { 's:' .. lname } = { 'g:' .. gname } + call assert_equal('gvar', s:gvar) + + unlet s:svar + unlet s:gvar + unlet g:gvar +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index ba24f693f..2ae04a974 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1379, +/**/ 1378, /**/ 1377, |