Mercurial > vim
changeset 21255:4be91a7eafb2 v8.2.1178
patch 8.2.1178: Vim9: filter function recognized as command modifier
Commit: https://github.com/vim/vim/commit/b074e8b8d4d3cefefc675dfaf3982d388ee07772
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 11 13:40:45 2020 +0200
patch 8.2.1178: Vim9: filter function recognized as command modifier
Problem: Vim9: filter function recognized as command modifier, leading to a
crash.
Solution: Clear cmdmod after freeing items. Do not recognize a command
modifier followed by non-white space. (closes #6434)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 11 Jul 2020 13:45:04 +0200 |
parents | 44f3da90b7bc |
children | dbaec6d0ad35 |
files | src/ex_docmd.c src/testdir/test_vim9_cmd.vim src/version.c src/vim9compile.c |
diffstat | 4 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -2750,6 +2750,10 @@ parse_command_modifiers(exarg_T *eap, ch 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, ch } /* - * Unod and free contents of "cmdmod". + * Undo and free contents of "cmdmod". */ void undo_cmdmod(exarg_T *eap, int save_msg_scroll)
--- 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