summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_docmd.c6
-rw-r--r--src/testdir/test_vim9_cmd.vim6
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c1
4 files changed, 14 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 0573897b7..692192bb1 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2750,6 +2750,10 @@ parse_command_modifiers(exarg_T *eap, char **errormsg, int skip_only)
if (*p == NUL || ends_excmd(*p))
break;
}
+ // Avoid that "filter(arg)" is recognized.
+ if (in_vim9script() && !VIM_ISWHITE(*p))
+ break;
+
if (skip_only)
p = skip_vimgrep_pat(p, NULL, NULL);
else
@@ -2904,7 +2908,7 @@ parse_command_modifiers(exarg_T *eap, char **errormsg, int skip_only)
}
/*
- * Unod and free contents of "cmdmod".
+ * Undo and free contents of "cmdmod".
*/
void
undo_cmdmod(exarg_T *eap, int save_msg_scroll)
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 801404d9c..676e97ceb 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -265,6 +265,12 @@ def Test_bar_after_command()
endif
enddef
+def Test_filter_is_not_modifier()
+ let tags = [{'a': 1, 'b': 2}, {'x': 3, 'y': 4}]
+ filter(tags, { _, v -> has_key(v, 'x') ? 1 : 0 })
+ assert_equal([#{x: 3, y: 4}], tags)
+enddef
+
def Test_eval_command()
let from = 3
let to = 5
diff --git a/src/version.c b/src/version.c
index 4ffa17ffc..c01d1059d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1178,
+/**/
1177,
/**/
1176,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index e7f90e1c7..8905ee374 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -6963,6 +6963,7 @@ compile_def_function(ufunc_T *ufunc, int set_return_type, cctx_T *outer_cctx)
}
// TODO: use modifiers in the command
undo_cmdmod(&ea, save_msg_scroll);
+ CLEAR_FIELD(cmdmod);
// Skip ":call" to get to the function name.
if (checkforcmd(&ea.cmd, "call", 3))