mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
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".
This commit is contained in:
parent
ff34bee3a2
commit
678b207fb1
@ -3326,7 +3326,8 @@ eval7t(
|
|||||||
: (evalarg->eval_flags & EVAL_EVALUATE);
|
: (evalarg->eval_flags & EVAL_EVALUATE);
|
||||||
|
|
||||||
// Recognize <type> in Vim9 script only.
|
// 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;
|
++*arg;
|
||||||
ga_init2(&type_list, sizeof(type_T *), 10);
|
ga_init2(&type_list, sizeof(type_T *), 10);
|
||||||
|
@ -14,6 +14,20 @@ def Test_vim9cmd()
|
|||||||
END
|
END
|
||||||
CheckScriptSuccess(lines)
|
CheckScriptSuccess(lines)
|
||||||
assert_fails('vim9cmd', 'E1164:')
|
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
|
enddef
|
||||||
|
|
||||||
def Test_edit_wildcards()
|
def Test_edit_wildcards()
|
||||||
|
@ -755,6 +755,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
3224,
|
||||||
/**/
|
/**/
|
||||||
3223,
|
3223,
|
||||||
/**/
|
/**/
|
||||||
|
@ -3562,14 +3562,18 @@ to_name_end(char_u *arg, int use_namespace)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Like to_name_end() but also skip over a list or dict constant.
|
* 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.
|
* This intentionally does not handle line continuation.
|
||||||
*/
|
*/
|
||||||
char_u *
|
char_u *
|
||||||
to_name_const_end(char_u *arg)
|
to_name_const_end(char_u *arg)
|
||||||
{
|
{
|
||||||
char_u *p = to_name_end(arg, TRUE);
|
char_u *p = arg;
|
||||||
typval_T rettv;
|
typval_T rettv;
|
||||||
|
|
||||||
|
if (STRNCMP(p, "<SNR>", 5) == 0)
|
||||||
|
p = skipdigits(p + 5);
|
||||||
|
p = to_name_end(p, TRUE);
|
||||||
if (p == arg && *arg == '[')
|
if (p == arg && *arg == '[')
|
||||||
{
|
{
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user