Merge #5062 from blueyed/fix-genvimvim-funcnames

genvimvim.lua: fix matching functions
This commit is contained in:
Justin M. Keyes 2016-07-19 14:03:36 -04:00 committed by GitHub
commit 0595da8d0b
2 changed files with 10 additions and 2 deletions

View File

@ -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

View File

@ -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)