Mercurial > vim
changeset 23237:033b2a97d59b v8.2.2164
patch 8.2.2164: Vim9: autoload function doesn't work in uppercased script
Commit: https://github.com/vim/vim/commit/17f700ac8b55f27ddb519ecaa8acaa43fc1ae60a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Dec 19 21:23:42 2020 +0100
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 19 Dec 2020 21:30:03 +0100 |
| parents | 1726af77ad66 |
| children | 5945735ad4af |
| files | src/testdir/test_vim9_script.vim src/userfunc.c src/version.c |
| diffstat | 3 files changed, 23 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -2799,6 +2799,16 @@ def Test_vim9_autoload() 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
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -2654,8 +2654,18 @@ trans_function_name( 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.