Fix the custom-checks script, and check for more problems

This commit is contained in:
w0rp 2017-04-15 12:52:25 +01:00
parent cab68cba25
commit 2f009690c3
2 changed files with 8 additions and 6 deletions

View File

@ -45,7 +45,7 @@ test: test-setup
echo 'Custom warnings/errors follow:'; \
echo; \
set -o pipefail; \
docker run -a stdout $(DOCKER_FLAGS) /testplugin/custom-checks /testplugin | sed s:^/testplugin/:: || EXIT=$$?; \
docker run -v $(PWD):/testplugin "$(IMAGE)" /testplugin/custom-checks /testplugin | sed s:^/testplugin/:: || EXIT=$$?; \
set +o pipefail; \
echo; \
exit $$EXIT;

View File

@ -51,8 +51,8 @@ check_errors() {
message="$2"
for match in $(
grep --color=never -Pn "$regex" "$directory"/**/*.vim \
| grep --color=never -Po '^[^:]+:[0-9]+' \
grep -n "$regex" "$directory"/**/*.vim \
| grep -o '^[^:]\+:[0-9]\+' \
| sed 's:^\./::'
); do
RETURN_CODE=1
@ -65,9 +65,11 @@ if (( FIX_ERRORS )); then
fi
check_errors \
'^function.*\) *$' \
'^function.*) *$' \
'Function without abort keyword (See :help except-compat)'
check_errors ' +$' 'Trailing whitespace'
check_errors '^ * end?i? *$' 'Write endif, not en, end, or endi'
check_errors ' \+$' 'Trailing whitespace'
check_errors '^ * end\?i\? *$' 'Write endif, not en, end, or endi'
check_errors '^ [^ ]' 'Use four spaces, not two spaces'
check_errors $'\t' 'Use four spaces, not tabs'
exit $RETURN_CODE