From f6d87c4b66686f9d518c781b0ec49921360ce412 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 20 Nov 2017 09:08:43 +1300 Subject: Correct "fi" to "endif" in new compiler files --- vim/compiler/perlcritic.vim | 2 +- vim/compiler/vint.vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/compiler/perlcritic.vim b/vim/compiler/perlcritic.vim index ec151906..afbb73c7 100644 --- a/vim/compiler/perlcritic.vim +++ b/vim/compiler/perlcritic.vim @@ -13,5 +13,5 @@ if v:version >= 704 || v:version == 704 && has('patch191') CompilerSet makeprg=perlcritic\ --verbose\ 1\ %:S else CompilerSet makeprg=perlcritic\ --verbose\ 1\ % -fi +endif CompilerSet errorformat=%f:%l:%c:%m diff --git a/vim/compiler/vint.vim b/vim/compiler/vint.vim index 0dcd4720..54d0fc4d 100644 --- a/vim/compiler/vint.vim +++ b/vim/compiler/vint.vim @@ -13,5 +13,5 @@ if v:version >= 704 || v:version == 704 && has('patch191') CompilerSet makeprg=vint\ %:S else CompilerSet makeprg=vint\ % -fi +endif CompilerSet errorformat=%f:%l:%c:\ %m -- cgit v1.2.3 From 1fbc3857f9090ece181af7aa95434b919afd5cf9 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 20 Nov 2017 09:08:58 +1300 Subject: Add `php -l` check binding for PHP filetype Interestingly, the :compiler for the "php" filetype doesn't include the % or %:S bit in the `makeprg`, but that's easily worked around by moving that logic into the check script itself. --- vim/after/ftplugin/php/check.vim | 57 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 vim/after/ftplugin/php/check.vim diff --git a/vim/after/ftplugin/php/check.vim b/vim/after/ftplugin/php/check.vim new file mode 100644 index 00000000..33077a72 --- /dev/null +++ b/vim/after/ftplugin/php/check.vim @@ -0,0 +1,57 @@ +" Only do this when not done yet for this buffer +" Also do nothing if 'compatible' enabled +if exists('b:did_ftplugin_php_check') || &compatible + finish +endif +let b:did_ftplugin_php_check = 1 +if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_php_check' +endif + +" Build function for checker +if !exists('*s:PhpCheck') + function s:PhpCheck() + let l:save_makeprg = &l:makeprg + let l:save_errorformat = &l:errorformat + unlet! g:current_compiler + compiler php + + " 7.4.191 is the earliest version with the :S file name modifier, which we + " really should use if we can + if v:version >= 704 || v:version == 704 && has('patch191') + make! %:S + else + make! % + endif + + let &l:makeprg = l:save_makeprg + let &l:errorformat = l:save_errorformat + cwindow + endfunction +endif + +" Set up a mapping for the checker, if we're allowed +if !exists('g:no_plugin_maps') && !exists('g:no_php_maps') + + " Define a mapping target + nnoremap + \ PhpCheck + \ :call PhpCheck() + if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap PhpCheck' + endif + + " If there isn't a key mapping already, use a default one + if !hasmapto('PhpCheck') + nmap + \ c + \ PhpCheck + if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap c' + endif + endif + +endif -- cgit v1.2.3 From 86fa780596e83cfd3fc14560eca3e4b2a534a23f Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 20 Nov 2017 09:12:12 +1300 Subject: Bump version number to 0.19.0 --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index f399cc95..63f6126f 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v0.18.0 -Sun Nov 19 10:42:36 UTC 2017 +tejr dotfiles v0.19.0 +Sun Nov 19 20:12:02 UTC 2017 -- cgit v1.2.3