aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1175: Vim9: cannot split a line before ".member"

Browse Source 
Problem:    Vim9: Cannot split a line before ".member".
Solution:   Check for ".member" after line break.
This commit is contained in:
Bram Moolenaar 2020-07-10 21:50:41 +02:00
parent 11a5b19a8c
commit a7eedf317a
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/test_vim9_expr.vim
View File

@ -1016,7 +1016,8 @@ def Test_expr7_list()
call CheckDefFailure(["let x = g:list_mixed[xxx]"], 'E1001:') call CheckDefFailure(["let x = g:list_mixed[xxx]"], 'E1001:')
call CheckDefFailure(["let x = [1,2,3]"], 'E1069:') call CheckDefFailure(["let x = [1,2,3]"], 'E1069:')
call CheckDefExecFailure(["let x = g:list_mixed['xx']"], 'E39:') call CheckDefExecFailure(["let x = g:list_mixed['xx']"], 'E39:')
call CheckDefFailure(["let x = g:list_mixed[0"], 'E111:') call CheckDefFailure(["let x = g:list_mixed["], 'E1097:')
call CheckDefFailure(["let x = g:list_mixed[0"], 'E1097:')
call CheckDefExecFailure(["let x = g:list_empty[3]"], 'E684:') call CheckDefExecFailure(["let x = g:list_empty[3]"], 'E684:')
enddef enddef
@ -1135,6 +1136,11 @@ def Test_expr_member()
assert_equal(1, g:dict_one.one) assert_equal(1, g:dict_one.one)
let d: dict<number> = g:dict_one let d: dict<number> = g:dict_one
assert_equal(1, d['one']) assert_equal(1, d['one'])
assert_equal(1, d[
'one'
])
assert_equal(1, d
.one)
# getting the one member should clear the dict after getting the item # getting the one member should clear the dict after getting the item
assert_equal('one', #{one: 'one'}.one) assert_equal('one', #{one: 'one'}.one)

2
src/version.c
View File

@ -754,6 +754,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 */
/**/
1175,
/**/ /**/
1174, 1174,
/**/ /**/

24
src/vim9compile.c
View File

@ -2501,6 +2501,21 @@ may_get_next_line(char_u *whitep, char_u **arg, cctx_T *cctx)
return OK; return OK;
} }
/*
* Idem, and give an error when failed.
*/
static int
may_get_next_line_error(char_u *whitep, char_u **arg, cctx_T *cctx)
{
if (may_get_next_line(whitep, arg, cctx) == FAIL)
{
emsg(_("E1097: line incomplete"));
return FAIL;
}
return OK;
}
// Structure passed between the compile_expr* functions to keep track of // Structure passed between the compile_expr* functions to keep track of
// constants that have been parsed but for which no code was produced yet. If // constants that have been parsed but for which no code was produced yet. If
// possible expressions on these constants are applied at compile time. If // possible expressions on these constants are applied at compile time. If
@ -3588,8 +3603,11 @@ compile_subscript(
// If a following line starts with "->{" or "->X" advance to that // If a following line starts with "->{" or "->X" advance to that
// line, so that a line break before "->" is allowed. // line, so that a line break before "->" is allowed.
if (next != NULL && next[0] == '-' && next[1] == '>' // Also if a following line starts with ".x".
if (next != NULL &&
((next[0] == '-' && next[1] == '>'
&& (next[2] == '{' || ASCII_ISALPHA(next[2]))) && (next[2] == '{' || ASCII_ISALPHA(next[2])))
|| (next[0] == '.' && ASCII_ISALPHA(next[1]))))
{ {
next = next_line_from_context(cctx, TRUE); next = next_line_from_context(cctx, TRUE);
if (next == NULL) if (next == NULL)
@ -3672,11 +3690,13 @@ compile_subscript(
++p; ++p;
*arg = skipwhite(p); *arg = skipwhite(p);
if (may_get_next_line(p, arg, cctx) == FAIL) if (may_get_next_line_error(p, arg, cctx) == FAIL)
return FAIL; return FAIL;
if (compile_expr0(arg, cctx) == FAIL) if (compile_expr0(arg, cctx) == FAIL)
return FAIL; return FAIL;
if (may_get_next_line_error(p, arg, cctx) == FAIL)
return FAIL;
if (**arg != ']') if (**arg != ']')
{ {
emsg(_(e_missbrac)); emsg(_(e_missbrac));