diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-20 09:11:29 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-20 09:11:29 +1300 |
commit | c47ff37c669d51384919178a9b25331d871cc2b1 (patch) | |
tree | 538fbfb8e49ce69161a5dfa57b067cc8d05628ca | |
parent | Merge branch 'release/v0.18.0' into develop (diff) | |
parent | Add `php -l` check binding for PHP filetype (diff) | |
download | dotfiles-c47ff37c669d51384919178a9b25331d871cc2b1.tar.gz dotfiles-c47ff37c669d51384919178a9b25331d871cc2b1.zip |
Merge branch 'feature/vim-php' into develop
* feature/vim-php:
Add `php -l` check binding for PHP filetype
Correct "fi" to "endif" in new compiler files
-rw-r--r-- | vim/after/ftplugin/php/check.vim | 57 | ||||
-rw-r--r-- | vim/compiler/perlcritic.vim | 2 | ||||
-rw-r--r-- | vim/compiler/vint.vim | 2 |
3 files changed, 59 insertions, 2 deletions
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 <buffer> <silent> <unique> + \ <Plug>PhpCheck + \ :<C-U>call <SID>PhpCheck()<CR> + if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <Plug>PhpCheck' + endif + + " If there isn't a key mapping already, use a default one + if !hasmapto('<Plug>PhpCheck') + nmap <buffer> <unique> + \ <LocalLeader>c + \ <Plug>PhpCheck + if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <LocalLeader>c' + endif + endif + +endif 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 |