Mercurial > vim
changeset 24988:494112d2aa93 v8.2.3031
patch 8.2.3031: no error if a function name starts with an underscore
Commit: https://github.com/vim/vim/commit/22f17a29cd0b0cc3107dc6cd1d96c62eee52a7d9
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jun 21 20:48:58 2021 +0200
patch 8.2.3031: no error if a function name starts with an underscore
Problem: No error if a function name starts with an underscore. (Naohiro
Ono)
Solution: In Vim9 script disallow a function name starting with an
underscore, as is mentioned in the help. (closes #8414)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 21 Jun 2021 21:00:03 +0200 |
| parents | 5a15a7f25ff2 |
| children | 55f296521ca3 |
| files | src/testdir/test_vim9_func.vim src/userfunc.c src/version.c |
| diffstat | 3 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -90,6 +90,24 @@ def Test_compile_error_in_called_functio CheckScriptFailureList(lines, ['E1012:', 'E1191:']) enddef +def Test_wrong_function_name() + var lines =<< trim END + vim9script + func _Foo() + echo 'foo' + endfunc + END + CheckScriptFailure(lines, 'E128:') + + lines =<< trim END + vim9script + def _Foo() + echo 'foo' + enddef + END + CheckScriptFailure(lines, 'E128:') +enddef + def Test_autoload_name_mismatch() var dir = 'Xdir/autoload' mkdir(dir, 'p')
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -3595,7 +3595,8 @@ trans_function_name( lead += (int)STRLEN(sid_buf); } } - else if (!(flags & TFN_INT) && builtin_function(lv.ll_name, len)) + else if (!(flags & TFN_INT) && (builtin_function(lv.ll_name, len) + || (in_vim9script() && *lv.ll_name == '_'))) { semsg(_("E128: Function name must start with a capital or \"s:\": %s"), start);