mirror of
https://github.com/neovim/neovim.git
synced 2025-09-13 14:58:18 +00:00
vim-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 vim/vim#6634)
ae95a3946b
This commit is contained in:
@@ -5365,7 +5365,7 @@ static int dict_get_tv(char_u **arg, typval_T *rettv, int evaluate)
|
|||||||
if (eval1(&start, &tv, false) == FAIL) { // recursive!
|
if (eval1(&start, &tv, false) == FAIL) { // recursive!
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
if (*start == '}') {
|
if (*skipwhite(start) == '}') {
|
||||||
return NOTDONE;
|
return NOTDONE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -108,3 +108,27 @@ func Test_skip_after_throw()
|
|||||||
catch /something/
|
catch /something/
|
||||||
endtry
|
endtry
|
||||||
endfunc
|
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
|
||||||
|
Reference in New Issue
Block a user