diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-17 00:19:45 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-17 00:19:45 +1200 |
commit | 81ff3c0f3ae44bb88a129b7395cb050290a37518 (patch) | |
tree | d0cf48de5513c8bfff929ff24473dc6bc441f9e9 /vim/after/ftplugin/perl | |
parent | Use short-circuit for no-mapping check (diff) | |
download | dotfiles-81ff3c0f3ae44bb88a129b7395cb050290a37518.tar.gz dotfiles-81ff3c0f3ae44bb88a129b7395cb050290a37518.zip |
Completely overhaul after/ftplugin files
Should have done some of this in separate commits; oh well.
* Rewrite headers for each ftplugin
* Require Vim version >= 7.0, and thereby:
* Switch back to location list
* Don't check for b:undo_ftplugin existence, assume it
* Save and restore compiler instead of internal options
* Add bash, ksh, sh, and shellcheck compilers
* Rename mail/format_flowed.vim to mail/flowed.vim
* Rename sh/bash_han.vim to sh/han.vim
Diffstat (limited to 'vim/after/ftplugin/perl')
-rw-r--r-- | vim/after/ftplugin/perl/check.vim | 47 | ||||
-rw-r--r-- | vim/after/ftplugin/perl/lint.vim | 47 | ||||
-rw-r--r-- | vim/after/ftplugin/perl/tidy.vim | 32 |
3 files changed, 67 insertions, 59 deletions
diff --git a/vim/after/ftplugin/perl/check.vim b/vim/after/ftplugin/perl/check.vim index e5eaf44a..e115b37f 100644 --- a/vim/after/ftplugin/perl/check.vim +++ b/vim/after/ftplugin/perl/check.vim @@ -1,24 +1,31 @@ -" Only do this when not done yet for this buffer -" Also do nothing if 'compatible' enabled -if exists('b:did_ftplugin_perl_check') || &compatible +" perl/check.vim: Use Perl binary to check for errors + +" Don't load if running compatible or too old +if &compatible || v:version < 700 finish endif -let b:did_ftplugin_perl_check = 1 -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_perl_check' + +" Don't load if already loaded +if exists('b:did_ftplugin_perl_check') + finish endif +" Flag as loaded +let b:did_ftplugin_perl_check = 1 +let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_perl_check' + " Build function for checker function! s:PerlCheck() - let l:save_makeprg = &l:makeprg - let l:save_errorformat = &l:errorformat - unlet! g:current_compiler + if exists('b:current_compiler') + let l:save_compiler = b:current_compiler + endif compiler perl - make! - let &l:makeprg = l:save_makeprg - let &l:errorformat = l:save_errorformat - cwindow + lmake! + lwindow + if exists('l:save_compiler') + execute 'compiler ' . l:save_compiler + endif endfunction " Stop here if the user doesn't want ftplugin mappings @@ -30,18 +37,14 @@ endif nnoremap <buffer> <silent> <unique> \ <Plug>PerlCheck \ :<C-U>call <SID>PerlCheck()<CR> -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <Plug>PerlCheck' -endif +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <Plug>PerlCheck' " If there isn't a key mapping already, use a default one if !hasmapto('<Plug>PerlCheck') nmap <buffer> <unique> \ <LocalLeader>c \ <Plug>PerlCheck - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <LocalLeader>c' - endif + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <LocalLeader>c' endif diff --git a/vim/after/ftplugin/perl/lint.vim b/vim/after/ftplugin/perl/lint.vim index 50770a13..3e73ac9a 100644 --- a/vim/after/ftplugin/perl/lint.vim +++ b/vim/after/ftplugin/perl/lint.vim @@ -1,24 +1,31 @@ -" Only do this when not done yet for this buffer -" Also do nothing if 'compatible' enabled -if exists('b:did_ftplugin_perl_lint') || &compatible +" perl/lint.vim: Use Perl::Critic to lint scripts + +" Don't load if running compatible or too old +if &compatible || v:version < 700 finish endif -let b:did_ftplugin_perl_lint = 1 -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_perl_lint' + +" Don't load if already loaded +if exists('b:did_ftplugin_perl_lint') + finish endif +" Flag as loaded +let b:did_ftplugin_perl_lint = 1 +let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_perl_lint' + " Build function for linter function! s:PerlLint() - let l:save_makeprg = &l:makeprg - let l:save_errorformat = &l:errorformat - unlet! g:current_compiler + if exists('b:current_compiler') + let l:save_compiler = b:current_compiler + endif compiler perlcritic - make! - let &l:makeprg = l:save_makeprg - let &l:errorformat = l:save_errorformat - cwindow + lmake! + lwindow + if exists('l:save_compiler') + execute 'compiler ' . l:save_compiler + endif endfunction " Stop here if the user doesn't want ftplugin mappings @@ -30,18 +37,14 @@ endif nnoremap <buffer> <silent> <unique> \ <Plug>PerlLint \ :<C-U>call <SID>PerlLint()<CR> -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <Plug>PerlLint' -endif +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <Plug>PerlLint' " If there isn't a key mapping already, use a default one if !hasmapto('<Plug>PerlLint') nmap <buffer> <unique> \ <LocalLeader>l \ <Plug>PerlLint - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <LocalLeader>l' - endif + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <LocalLeader>l' endif diff --git a/vim/after/ftplugin/perl/tidy.vim b/vim/after/ftplugin/perl/tidy.vim index bd3e73a1..01ca0210 100644 --- a/vim/after/ftplugin/perl/tidy.vim +++ b/vim/after/ftplugin/perl/tidy.vim @@ -1,14 +1,20 @@ -" Only do this when not done yet for this buffer -" Also do nothing if 'compatible' enabled -if exists('b:did_ftplugin_perl_tidy') || &compatible +" perl/tidy.vim: Use Perl::Tidy to format and filter scripts + +" Don't load if running compatible or too old +if &compatible || v:version < 700 finish endif -let b:did_ftplugin_perl_tidy = 1 -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_perl_tidy' + +" Don't load if already loaded +if exists('b:did_ftplugin_perl_tidy') + finish endif +" Flag as loaded +let b:did_ftplugin_perl_tidy = 1 +let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_perl_tidy' + " Stop here if the user doesn't want ftplugin mappings if exists('g:no_plugin_maps') || exists('g:no_perl_maps') finish @@ -18,18 +24,14 @@ endif nnoremap <buffer> <silent> <unique> \ <Plug>PerlTidy \ :<C-U>%!perltidy<CR> -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <Plug>PerlTidy' -endif +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <Plug>PerlTidy' " If there isn't a key mapping already, use a default one if !hasmapto('<Plug>PerlTidy') nmap <buffer> <unique> \ <LocalLeader>t \ <Plug>PerlTidy - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <LocalLeader>t' - endif + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <LocalLeader>t' endif |