thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1270: Vim9: not skipping over function type declaration

Browse Source 
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:
Bram Moolenaar
2020-07-22 19:30:06 +02:00
parent 054f14bbe5
commit 2f1980f7b7
3 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/vim9compile.c
View File

@@ -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));
}
}