diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-11-06 15:11:48 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-11-06 15:13:49 +0800 |
| commit | ed01ef7fa5c2611748f90acfdc2145b22629dc36 (patch) | |
| tree | 790ab58f00b2c00656639d8228edf35aff1d850c | |
| parent | 7404c6010dd7abd4339a4ffd6961f2a420fe7ddb (diff) | |
| download | rneovim-ed01ef7fa5c2611748f90acfdc2145b22629dc36.tar.gz rneovim-ed01ef7fa5c2611748f90acfdc2145b22629dc36.tar.bz2 rneovim-ed01ef7fa5c2611748f90acfdc2145b22629dc36.zip | |
vim-patch:9.0.0355: check for uppercase char in autoload name is wrong
Problem: Check for uppercase char in autoload name is wrong, it checks the
name of the script.
Solution: Remove the check. (closes vim/vim#11031)
https://github.com/vim/vim/commit/6c667bdc9489963102bd6c46b1b73e4d43c034ce
Co-authored-by: thinca <thinca@gmail.com>
| -rw-r--r-- | src/nvim/eval/vars.c | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_let.vim | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c index a0877deaf7..139e7ed66b 100644 --- a/src/nvim/eval/vars.c +++ b/src/nvim/eval/vars.c @@ -1453,9 +1453,10 @@ bool var_wrong_func_name(const char *const name, const bool new_var) FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT { // Allow for w: b: s: and t:. + // Allow autoload variable. if (!(vim_strchr("wbst", name[0]) != NULL && name[1] == ':') - && !ASCII_ISUPPER((name[0] != NUL && name[1] == ':') - ? name[2] : name[0])) { + && !ASCII_ISUPPER((name[0] != NUL && name[1] == ':') ? name[2] : name[0]) + && vim_strchr(name, '#') == NULL) { semsg(_("E704: Funcref variable name must start with a capital: %s"), name); return true; } diff --git a/src/nvim/testdir/test_let.vim b/src/nvim/testdir/test_let.vim index 49f656c787..35745e9c6a 100644 --- a/src/nvim/testdir/test_let.vim +++ b/src/nvim/testdir/test_let.vim @@ -6,6 +6,10 @@ func Test_let() let Test104#numvar = function('tr') call assert_equal("function('tr')", string(Test104#numvar)) + let foo#tr = function('tr') + call assert_equal("function('tr')", string(foo#tr)) + unlet foo#tr + let a = 1 let b = 2 |