mirror of
https://github.com/vim/vim.git
synced 2025-08-27 20:13:38 -04:00
patch 9.1.1588: Vim9: cannot split dict inside command block
Problem: Vim9: cannot split dict inside command block (lacygoill) Solution: Remove the current restriction (Yegappan Lakshmanan). fixes: #17841 closes: #17845 Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
parent
0bda7830ac
commit
a566a78029
@ -1075,12 +1075,12 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
|
|||||||
had_comma = **arg == ',';
|
had_comma = **arg == ',';
|
||||||
if (had_comma)
|
if (had_comma)
|
||||||
{
|
{
|
||||||
if (vim9script && (*arg)[1] != NUL && !VIM_ISWHITE((*arg)[1]))
|
if (vim9script && !IS_WHITE_NL_OR_NUL((*arg)[1]))
|
||||||
{
|
{
|
||||||
semsg(_(e_white_space_required_after_str_str), ",", *arg);
|
semsg(_(e_white_space_required_after_str_str), ",", *arg);
|
||||||
goto failret;
|
goto failret;
|
||||||
}
|
}
|
||||||
*arg = skipwhite(*arg + 1);
|
*arg = skipwhite_and_nl(*arg + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
// the "}" can be on the next line
|
// the "}" can be on the next line
|
||||||
|
@ -5457,6 +5457,22 @@ def Test_if_cond_shortcircuit_skip_indexing()
|
|||||||
v9.CheckSourceSuccess(lines)
|
v9.CheckSourceSuccess(lines)
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
|
" Test for defining a dict with multiple keys in a command-block
|
||||||
|
def Test_multikey_dict_in_block()
|
||||||
|
var lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
command NewCommand {
|
||||||
|
g:TestDict = {
|
||||||
|
'key': 'v1',
|
||||||
|
'other_key': 'v2' }
|
||||||
|
}
|
||||||
|
NewCommand
|
||||||
|
END
|
||||||
|
v9.CheckSourceSuccess(lines)
|
||||||
|
assert_equal({key: 'v1', other_key: 'v2'}, g:TestDict)
|
||||||
|
unlet g:TestDict
|
||||||
|
enddef
|
||||||
|
|
||||||
" Keep this last, it messes up highlighting.
|
" Keep this last, it messes up highlighting.
|
||||||
def Test_substitute_cmd()
|
def Test_substitute_cmd()
|
||||||
new
|
new
|
||||||
|
@ -719,6 +719,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1588,
|
||||||
/**/
|
/**/
|
||||||
1587,
|
1587,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user