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/perl/tidy.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/perl/tidy.vim')
-rw-r--r-- | vim/after/ftplugin/perl/tidy.vim | 63 |
1 files changed, 36 insertions, 27 deletions
diff --git a/vim/after/ftplugin/perl/tidy.vim b/vim/after/ftplugin/perl/tidy.vim index 18033a42..f6744f3a 100644 --- a/vim/after/ftplugin/perl/tidy.vim +++ b/vim/after/ftplugin/perl/tidy.vim @@ -1,35 +1,44 @@ -" 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 -" Set up a mapping for the tidier, if we're allowed -if !exists('g:no_plugin_maps') && !exists('g:no_perl_maps') +" Flag as loaded +let b:did_ftplugin_perl_tidy = 1 +let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_perl_tidy' + +" Plugin function +function s:PerlTidy() + let l:view = winsaveview() + %!perltidy + call winrestview(l:view) +endfunction - " Define a mapping target - 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 +" Stop here if the user doesn't want ftplugin mappings +if exists('g:no_plugin_maps') || exists('g:no_perl_maps') + finish +endif - " 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 - endif +" Define a mapping target +nnoremap <buffer> <silent> <unique> + \ <Plug>PerlTidy + \ :<C-U>call <SID>PerlTidy()<CR> +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 + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <LocalLeader>t' endif |