Mercurial > vim
changeset 25374:7124992f26ef v8.2.3224
patch 8.2.3224: cannot call script-local function after :vim9cmd
Commit: https://github.com/vim/vim/commit/678b207fb111840fec1f0dc43910613ba106b90d
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jul 26 21:10:11 2021 +0200
patch 8.2.3224: cannot call script-local function after :vim9cmd
Problem: Cannot call script-local function after :vim9cmd. (Christian J.
Robinson)
Solution: Skip over "<SNR>123".
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 26 Jul 2021 21:15:06 +0200 |
parents | d5b80262eac9 |
children | 68bfc73d8da6 |
files | src/eval.c src/testdir/test_vim9_cmd.vim src/version.c src/vim9compile.c |
diffstat | 4 files changed, 23 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -3326,7 +3326,8 @@ eval7t( : (evalarg->eval_flags & EVAL_EVALUATE); // Recognize <type> in Vim9 script only. - if (in_vim9script() && **arg == '<' && eval_isnamec1((*arg)[1])) + if (in_vim9script() && **arg == '<' && eval_isnamec1((*arg)[1]) + && STRNCMP(*arg, "<SNR>", 5) != 0) { ++*arg; ga_init2(&type_list, sizeof(type_T *), 10);
--- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -14,6 +14,20 @@ def Test_vim9cmd() END CheckScriptSuccess(lines) assert_fails('vim9cmd', 'E1164:') + + lines =<< trim END + vim9script + def Foo() + g:found_bar = "bar" + enddef + nmap ,; :vim9cmd <SID>Foo()<CR> + END + CheckScriptSuccess(lines) + feedkeys(',;', 'xt') + assert_equal("bar", g:found_bar) + + nunmap ,; + unlet g:found_bar enddef def Test_edit_wildcards()
--- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3224, +/**/ 3223, /**/ 3222,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -3562,14 +3562,18 @@ to_name_end(char_u *arg, int use_namespa /* * Like to_name_end() but also skip over a list or dict constant. + * Also accept "<SNR>123_Func". * This intentionally does not handle line continuation. */ char_u * to_name_const_end(char_u *arg) { - char_u *p = to_name_end(arg, TRUE); + char_u *p = arg; typval_T rettv; + if (STRNCMP(p, "<SNR>", 5) == 0) + p = skipdigits(p + 5); + p = to_name_end(p, TRUE); if (p == arg && *arg == '[') {