diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-17 01:01:12 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-17 01:01:12 +1200 |
commit | 37ae33b03cb8f7a0ea591c56fae48c5bcb588704 (patch) | |
tree | 2ddd07cd9dd348fa4f251d4b83960e24cf75d30f /vim/after/ftplugin/php/check.vim | |
parent | Merge branch 'release/v0.53.0' (diff) | |
parent | Regenerate dotfiles(7) manual (diff) | |
download | dotfiles-37ae33b03cb8f7a0ea591c56fae48c5bcb588704.tar.gz dotfiles-37ae33b03cb8f7a0ea591c56fae48c5bcb588704.zip |
Merge branch 'release/v0.54.0'v0.54.0
* release/v0.54.0:
Regenerate dotfiles(7) manual
Bump VERSION
Add note about compiler scripts
Arrange for tidiers to hold window position
Update markdown_autoformat.vim
Update surround.vim
Completely overhaul after/ftplugin files
Use short-circuit for no-mapping check
Correct g:current_compiler setting
Consistently require 'nocompatible' for ftplugins
Upgrade insert_suspend_hlsearch.vim
Use `function!` consistently in ftplugins
Fix comments in vim/filetype.vim
Set 'comments' blank by default
Add Xresources filenames
Add more names to Vim Bash types
Diffstat (limited to 'vim/after/ftplugin/php/check.vim')
-rw-r--r-- | vim/after/ftplugin/php/check.vim | 94 |
1 files changed, 48 insertions, 46 deletions
diff --git a/vim/after/ftplugin/php/check.vim b/vim/after/ftplugin/php/check.vim index 33077a72..f211a642 100644 --- a/vim/after/ftplugin/php/check.vim +++ b/vim/after/ftplugin/php/check.vim @@ -1,57 +1,59 @@ -" Only do this when not done yet for this buffer -" Also do nothing if 'compatible' enabled -if exists('b:did_ftplugin_php_check') || &compatible +" php/check.vim: Use PHP binary to check scripts for errors + +" Don't load if running compatible or too old +if &compatible || v:version < 700 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 +" Don't load if already loaded +if exists('b:did_ftplugin_php_check') + finish endif -" Set up a mapping for the checker, if we're allowed -if !exists('g:no_plugin_maps') && !exists('g:no_php_maps') +" Flag as loaded +let b:did_ftplugin_php_check = 1 +let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_php_check' - " 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' +" Build function for checker +function! s:PhpCheck() + if exists('b:current_compiler') + let l:save_compiler = b:current_compiler endif + compiler php - " 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 + " The PHP compiler is unusual: it gets us to provide the filename argument + " ourselves. 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') + lmake! %:S + else + lmake! % endif + lwindow + if exists('l:save_compiler') + execute 'compiler ' . l:save_compiler + endif +endfunction + +" Stop here if the user doesn't want ftplugin mappings +if exists('g:no_plugin_maps') || exists('g:no_php_maps') + finish +endif + +" Define a mapping target +nnoremap <buffer> <silent> <unique> + \ <Plug>PhpCheck + \ :<C-U>call <SID>PhpCheck()<CR> +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <Plug>PhpCheck' + +" If there isn't a key mapping already, use a default one +if !hasmapto('<Plug>PhpCheck') + nmap <buffer> <unique> + \ <LocalLeader>c + \ <Plug>PhpCheck + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <LocalLeader>c' endif |