mirror of
https://github.com/vim/vim.git
synced 2025-09-28 04:24:06 -04:00
patch 8.2.1379: curly braces expression ending in " }" does not work
Problem: Curly braces expression ending in " }" does not work. Solution: Skip over white space when checking for "}". (closes #6634)
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -754,6 +754,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1379,
|
||||
/**/
|
||||
1378,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user