diff options
| -rw-r--r-- | .ci/common/test.sh | 10 | ||||
| -rw-r--r-- | scripts/genvimvim.lua | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/.ci/common/test.sh b/.ci/common/test.sh index 225d88e072..1e66ecb239 100644 --- a/.ci/common/test.sh +++ b/.ci/common/test.sh @@ -83,8 +83,9 @@ install_nvim() { exit 1 } + local genvimsynf=syntax/vim/generated.vim # Check that all runtime files were installed - for file in doc/tags syntax/vim/generated.vim $( + for file in doc/tags $genvimsynf $( cd runtime ; git ls-files | grep -e '.vim$' -e '.ps$' -e '.dict$' -e '.py$' -e '.tutor$' ) ; do if ! test -e "${INSTALL_PREFIX}/share/nvim/runtime/$file" ; then @@ -93,6 +94,13 @@ install_nvim() { fi done + # Check that generated syntax file has function names, #5060. + local gpat='syn keyword vimFuncName .*eval' + if ! grep -q "$gpat" "${INSTALL_PREFIX}/share/nvim/runtime/$genvimsynf"; then + echo "It appears that $genvimsynf does not contain $gpat." + exit 1 + fi + for file in $( cd runtime ; git ls-files | grep -e '.awk$' -e '.sh$' -e '.bat$' ) ; do diff --git a/scripts/genvimvim.lua b/scripts/genvimvim.lua index 9135c8e3ab..2a82181841 100644 --- a/scripts/genvimvim.lua +++ b/scripts/genvimvim.lua @@ -123,7 +123,7 @@ for line in eval_fd:lines() do if line == '};' then break end - local func_name = line:match('^ {"(%w+)",') + local func_name = line:match('^ { "([%w_]+)",') if func_name then if lld.line_length > 850 then w('\n' .. vimfun_start) |