patch 8.2.4395: some code lines not covered by tests
Problem: Some code lines not covered by tests.
Solution: Add a few more test cases. Fix getting more than one error for
invalid assignment.
diff --git a/src/errors.h b/src/errors.h
index d6b82bb..8e2b9da 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -2788,7 +2788,8 @@
INIT(= N_("E1077: Missing argument type for %s"));
// E1078 unused
// E1079 unused
-// E1080 unused
+EXTERN char e_invalid_assignment[]
+ INIT(= N_("E1080: Invalid assignment"));
EXTERN char e_cannot_unlet_str[]
INIT(= N_("E1081: Cannot unlet %s"));
#endif
diff --git a/src/evalvars.c b/src/evalvars.c
index 8e862df..4037558 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -1107,7 +1107,8 @@
{
if (*semicolon == 1)
{
- emsg(_(e_double_semicolon_in_list_of_variables));
+ if (!silent)
+ emsg(_(e_double_semicolon_in_list_of_variables));
return NULL;
}
*semicolon = 1;
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 9c988c9..c4a457e 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -1359,7 +1359,8 @@
v9.CheckDefFailure(['var null = 1'], 'E1034:')
v9.CheckDefFailure(['var this = 1'], 'E1034:')
- v9.CheckDefFailure(['[a; b; c] = g:list'], 'E452:')
+ v9.CheckDefFailure(['[a; b; c] = g:list'], 'E1001:')
+ v9.CheckDefFailure(['var [a; b; c] = g:list'], 'E1080:')
v9.CheckDefExecFailure(['var a: number',
'[a] = test_null_list()'], 'E1093:')
v9.CheckDefExecFailure(['var a: number',
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index f80d5a2..10be691 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -1355,6 +1355,13 @@
v9.CheckDefFailure(lines, 'E1146:', 1)
lines =<< trim END
+ if 0
+ d.key = 'asdf'
+ endif
+ END
+ v9.CheckDefSuccess(lines)
+
+ lines =<< trim END
d['key'] = 'asdf'
END
v9.CheckDefFailure(lines, 'E1146:', 1)
@@ -1621,6 +1628,11 @@
s/text/\=['aaa', 'bbb', 'ccc']/
assert_equal(['some aaa', 'bbb', 'ccc', ' here'], getline(1, '$'))
bwipe!
+
+ # inside "if 0" substitute is ignored
+ if 0
+ s/a/\=nothing/ and | some more
+ endif
enddef
def Test_redir_to_var()
@@ -1664,6 +1676,12 @@
v9.CheckDefFailure(lines, 'E1089:')
lines =<< trim END
+ var text: string
+ redir => text
+ END
+ v9.CheckDefFailure(lines, 'E1185:')
+
+ lines =<< trim END
var ls = 'asdf'
redir => ls[1]
redir END
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index ecc9c64..65d6dc8 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -3762,7 +3762,15 @@
v9.CheckScriptFailure(lines, 'E476:')
enddef
+" The following messes up syntax highlight, keep near the end.
if has('python3')
+ def Test_python3_command()
+ py3 import vim
+ py3 vim.command("let g:done = 'yes'")
+ assert_equal('yes', g:done)
+ unlet g:done
+ enddef
+
def Test_python3_heredoc()
py3 << trim EOF
import vim
@@ -3778,7 +3786,6 @@
enddef
endif
-" This messes up syntax highlight, keep near the end.
if has('lua')
def Test_lua_heredoc()
g:d = {}
diff --git a/src/version.c b/src/version.c
index 3510af8..e073086 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4395,
+/**/
4394,
/**/
4393,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 0eb41e4..74dc5e0 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2420,7 +2420,7 @@
if (*eap->cmd == '[')
{
- // [var, var] = expr
+ // might be "[var, var] = expr"
*line = compile_assignment(eap->cmd, eap, CMD_SIZE, cctx);
if (*line == NULL)
return FAIL;
@@ -2958,7 +2958,10 @@
case CMD_decrement:
line = compile_assignment(p, &ea, ea.cmdidx, &cctx);
if (line == p)
+ {
+ emsg(_(e_invalid_assignment));
line = NULL;
+ }
break;
case CMD_unlet: