patch 8.2.2164: Vim9: autoload function doesn't work in uppercased script
Problem: Vim9: autoload function doesn't work in script that starts with
an upper case letter.
Solution: Check for the autoload character. (closes #7502)
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 5949acb..47ea43d 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -2799,6 +2799,16 @@
g:some#other = 'other'
assert_equal('other', g:some#other)
+ # upper case script name works
+ lines =<< trim END
+ vim9script
+ def Other#getOther(): string
+ return 'other'
+ enddef
+ END
+ writefile(lines, 'Xdir/autoload/Other.vim')
+ assert_equal('other', g:Other#getOther())
+
delete('Xdir', 'rf')
&rtp = save_rtp
enddef
diff --git a/src/userfunc.c b/src/userfunc.c
index 50088e6..31c7af3 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2654,8 +2654,18 @@
goto theend;
}
- // In Vim9 script a user function is script-local by default.
+ // In Vim9 script a user function is script-local by default, unless it
+ // starts with a lower case character: dict.func().
vim9script = ASCII_ISUPPER(*start) && in_vim9script();
+ if (vim9script)
+ {
+ char_u *p;
+
+ // SomeScript#func() is a global function.
+ for (p = start; *p != NUL && *p != '('; ++p)
+ if (*p == AUTOLOAD_CHAR)
+ vim9script = FALSE;
+ }
/*
* Copy the function name to allocated memory.
diff --git a/src/version.c b/src/version.c
index 8f2c50a..a97037d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2164,
+/**/
2163,
/**/
2162,