Mercurial > vim
changeset 27279:6e1b0c4ab668 v8.2.4168
patch 8.2.4168: disallowing empty function name breaks existing plugins
Commit: https://github.com/vim/vim/commit/e6a4200ff47708febcd7cb2b8c3dd3801a975d43
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 21 10:32:58 2022 +0000
patch 8.2.4168: disallowing empty function name breaks existing plugins
Problem: Disallowing empty function name breaks existing plugins.
Solution: Allow empty function name in legacy script.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 21 Jan 2022 11:45:03 +0100 |
| parents | 31aa8d6063dd |
| children | edad578ff530 |
| files | src/testdir/sautest/autoload/foo.vim src/testdir/test_autoload.vim src/userfunc.c src/version.c |
| diffstat | 4 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/sautest/autoload/foo.vim +++ b/src/testdir/sautest/autoload/foo.vim @@ -9,3 +9,7 @@ endfunc func foo#addFoo(head) return a:head .. 'foo' endfunc + +func foo#() + return 'empty' +endfunc
--- a/src/testdir/test_autoload.vim +++ b/src/testdir/test_autoload.vim @@ -10,6 +10,9 @@ func Test_autoload_dict_func() call assert_equal(1, g:called_foo_bar_echo) eval 'bar'->g:foo#addFoo()->assert_equal('barfoo') + + " empty name works in legacy script + call assert_equal('empty', foo#()) endfunc func Test_source_autoload() @@ -23,4 +26,5 @@ func Test_autoload_vim9script() call assert_equal(49, auto9#add42(7)) endfunc + " vim: shiftwidth=2 sts=2 expandtab
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -3693,8 +3693,8 @@ trans_function_name( // Note that TFN_ flags use the same values as GLV_ flags. end = get_lval(start, NULL, &lv, FALSE, skip, flags | GLV_READ_ONLY, lead > 2 ? 0 : FNE_CHECK_START); - if (end == start - || (end != NULL && end[-1] == AUTOLOAD_CHAR && *end == '(')) + if (end == start || (in_vim9script() && end != NULL + && end[-1] == AUTOLOAD_CHAR && *end == '(')) { if (!skip) emsg(_(e_function_name_required));