patch 8.2.4886: Vim9: redir in skipped block seen as assignment
Problem: Vim9: redir in skipped block seen as assignment.
Solution: Check for valid assignment.
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index f78e4ed..26acc07 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3683,6 +3683,7 @@
// "&opt = expr"
// "var = expr" where "var" is a variable name or we are skipping
// (variable declaration might have been skipped).
+ // Not "redir => var" (when skipping).
oplen = assignment_len(skipwhite(p), &heredoc);
if (oplen > 0)
{
@@ -3690,7 +3691,8 @@
|| *eap->cmd == '&'
|| *eap->cmd == '$'
|| *eap->cmd == '@'
- || eap->skip
+ || (eap->skip && IS_WHITE_OR_NUL(
+ *(skipwhite(p) + oplen)))
|| lookup(eap->cmd, p - eap->cmd, TRUE, cctx) == OK)
{
eap->cmdidx = CMD_var;
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 97a6970..36a0ba2 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -739,6 +739,14 @@
v9.CheckDefAndScriptSuccess(lines)
enddef
+def Test_redir_is_not_assign()
+ if false
+ redir => res
+ echo var_job
+ redir END
+ endif
+enddef
+
def Test_extend_list()
# using uninitialized list assigns empty list
var lines =<< trim END
diff --git a/src/version.c b/src/version.c
index 2421931..6c4aa52 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4886,
+/**/
4885,
/**/
4884,