kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 11:15:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge #5062 from blueyed/fix-genvimvim-funcnames

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.ci/common/test.sh
View File

@ -83,8 +83,9 @@ install_nvim() {
exit 1 exit 1
} }
local genvimsynf=syntax/vim/generated.vim
# Check that all runtime files were installed # 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$' cd runtime ; git ls-files | grep -e '.vim$' -e '.ps$' -e '.dict$' -e '.py$' -e '.tutor$'
) ; do ) ; do
if ! test -e "${INSTALL_PREFIX}/share/nvim/runtime/$file" ; then if ! test -e "${INSTALL_PREFIX}/share/nvim/runtime/$file" ; then
@ -93,6 +94,13 @@ install_nvim() {
fi fi
done 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 $( for file in $(
cd runtime ; git ls-files | grep -e '.awk$' -e '.sh$' -e '.bat$' cd runtime ; git ls-files | grep -e '.awk$' -e '.sh$' -e '.bat$'
) ; do ) ; do

2
scripts/genvimvim.lua
View File

@ -123,7 +123,7 @@ for line in eval_fd:lines() do
if line == '};' then if line == '};' then
break break
end end
local func_name = line:match('^ {"(%w+)",') local func_name = line:match('^ { "([%w_]+)",')
if func_name then if func_name then
if lld.line_length > 850 then if lld.line_length > 850 then
w('\n' .. vimfun_start) w('\n' .. vimfun_start)