forked from aniani/vim
patch 8.2.1270: Vim9: not skipping over function type declaration
Problem: Vim9: not skipping over function type declaration with only a return type. Solution: Skip over the return type. (issue #6507)
This commit is contained in:
parent
054f14bbe5
commit
2f1980f7b7
@ -260,6 +260,16 @@ def Test_call_funcref()
|
||||
assert_equal(3, g:SomeFunc('abc'))
|
||||
assert_fails('NotAFunc()', 'E117:')
|
||||
assert_fails('g:NotAFunc()', 'E117:')
|
||||
|
||||
let lines =<< trim END
|
||||
vim9script
|
||||
def RetNumber(): number
|
||||
return 123
|
||||
enddef
|
||||
let Funcref: func: number = function('RetNumber')
|
||||
assert_equal(123, Funcref())
|
||||
END
|
||||
CheckScriptSuccess(lines)
|
||||
enddef
|
||||
|
||||
let SomeFunc = function('len')
|
||||
|
@ -754,6 +754,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1270,
|
||||
/**/
|
||||
1269,
|
||||
/**/
|
||||
|
@ -1881,26 +1881,35 @@ skip_type(char_u *start)
|
||||
if (*p == '>')
|
||||
++p;
|
||||
}
|
||||
else if (*p == '(' && STRNCMP("func", start, 4) == 0)
|
||||
else if ((*p == '(' || (*p == ':' && VIM_ISWHITE(p[1])))
|
||||
&& STRNCMP("func", start, 4) == 0)
|
||||
{
|
||||
// handle func(args): type
|
||||
++p;
|
||||
while (*p != ')' && *p != NUL)
|
||||
if (*p == '(')
|
||||
{
|
||||
char_u *sp = p;
|
||||
// handle func(args): type
|
||||
++p;
|
||||
while (*p != ')' && *p != NUL)
|
||||
{
|
||||
char_u *sp = p;
|
||||
|
||||
p = skip_type(p);
|
||||
if (p == sp)
|
||||
return p; // syntax error
|
||||
if (*p == ',')
|
||||
p = skipwhite(p + 1);
|
||||
p = skip_type(p);
|
||||
if (p == sp)
|
||||
return p; // syntax error
|
||||
if (*p == ',')
|
||||
p = skipwhite(p + 1);
|
||||
}
|
||||
if (*p == ')')
|
||||
{
|
||||
if (p[1] == ':')
|
||||
p = skip_type(skipwhite(p + 2));
|
||||
else
|
||||
p = skipwhite(p + 1);
|
||||
}
|
||||
}
|
||||
if (*p == ')')
|
||||
else
|
||||
{
|
||||
if (p[1] == ':')
|
||||
p = skip_type(skipwhite(p + 2));
|
||||
else
|
||||
p = skipwhite(p + 1);
|
||||
// handle func: return_type
|
||||
p = skip_type(skipwhite(p + 1));
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user