aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.0.2161: Vim9: not able to use imported interfaces and classes

Browse Source 
Problem:  Vim9: not able to use imported interfaces and classes
Solution: Detect imported class/interfaces names correclty

fixes:  #13661
closes: #13685

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan
2023-12-14 19:59:45 +01:00
committed by Christian Brabandt
parent 7349c5160a
commit d2e1c83962
3 changed files with 79 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vim9class.c
View File

@@ -1304,6 +1304,24 @@ add_classfuncs_objmethods(
return OK;
}
/*
* Return the end of the class name starting at "arg". Valid characters in a
* class name are alphanumeric characters and "_". Also handles imported class
* names.
*/
static char_u *
find_class_name_end(char_u *arg)
{
char_u *end = arg;
while (ASCII_ISALNUM(*end) || *end == '_'
|| (*end == '.' && (ASCII_ISALNUM(end[1]) || end[1] == '_')))
++end;
return end;
}
/*
* Handle ":class" and ":abstract class" up to ":endclass".
* Handle ":interface" up to ":endinterface".
@@ -1383,7 +1401,8 @@ ex_class(exarg_T *eap)
goto early_ret;
}
arg = skipwhite(arg + 7);
char_u *end = find_name_end(arg, NULL, NULL, FNE_CHECK_START);
char_u *end = find_class_name_end(arg);
if (!IS_WHITE_OR_NUL(*end))
{
semsg(_(e_white_space_required_after_name_str), arg);
@@ -1413,8 +1432,7 @@ ex_class(exarg_T *eap)
for (;;)
{
char_u *impl_end = find_name_end(arg, NULL, NULL,
FNE_CHECK_START);
char_u *impl_end = find_class_name_end(arg);
if ((!IS_WHITE_OR_NUL(*impl_end) && *impl_end != ',')
|| (*impl_end == ','
&& !IS_WHITE_OR_NUL(*(impl_end + 1))))