diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-12-15 17:22:38 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-12-15 17:22:38 +1300 |
commit | c4dc71a54742e280f2145dcc58c5f5bd471c2b7e (patch) | |
tree | 7650687b84d6c115ec8064e0555691778b25b646 /vim/after/ftplugin | |
parent | Merge branch 'release/v8.3.0' into develop (diff) | |
download | dotfiles-c4dc71a54742e280f2145dcc58c5f5bd471c2b7e.tar.gz dotfiles-c4dc71a54742e280f2145dcc58c5f5bd471c2b7e.zip |
Add mappings to change 'equalprg' in Perl and PHP
Diffstat (limited to 'vim/after/ftplugin')
-rw-r--r-- | vim/after/ftplugin/perl.vim | 15 | ||||
-rw-r--r-- | vim/after/ftplugin/php.vim | 20 |
2 files changed, 31 insertions, 4 deletions
diff --git a/vim/after/ftplugin/perl.vim b/vim/after/ftplugin/perl.vim index 5c9cf8a0..611af62c 100644 --- a/vim/after/ftplugin/perl.vim +++ b/vim/after/ftplugin/perl.vim @@ -1,8 +1,11 @@ " Use Perl itself for checking and Perl::Tidy for tidying compiler perl -setlocal equalprg=perltidy let b:undo_ftplugin .= '|unlet b:current_compiler' - \ . '|setlocal equalprg< errorformat< makeprg<' + \ . '|setlocal errorformat< makeprg<' +if executable('perltidy') + setlocal equalprg=perltidy + let b:undo_ftplugin .= '|setlocal equalprg<' +endif " Fold based on indent level, but start with all folds open setlocal foldmethod=indent @@ -38,6 +41,14 @@ nnoremap <buffer> <LocalLeader>l let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>c' \ . '|nunmap <buffer> <LocalLeader>l' +" Mappings to choose 'equalprg' +nnoremap <buffer> <LocalLeader>t + \ :<C-U>setlocal equalprg=perltidy<CR> +nnoremap <buffer> <LocalLeader>i + \ :<C-U>setlocal equalprg<<CR> +let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>t' + \ . '|nunmap <buffer> <LocalLeader>i' + " Bump version numbers nmap <buffer> <LocalLeader>v \ <Plug>(PerlVersionBumpMinor) diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim index 0ce099a0..20d8d42e 100644 --- a/vim/after/ftplugin/php.vim +++ b/vim/after/ftplugin/php.vim @@ -1,8 +1,11 @@ " Use PHP itself for syntax checking compiler php -setlocal equalprg=phpcsff let b:undo_ftplugin .= '|unlet b:current_compiler' - \ . '|setlocal equalprg< errorformat< makeprg<' + \ . '|setlocal errorformat< makeprg<' +if executable('php-cs-fixer') + setlocal equalprg=phpcsff + let b:undo_ftplugin .= '|setlocal equalprg<' +endif " Set comment formats setlocal comments=s1:/*,m:*,ex:*/,://,:# @@ -26,3 +29,16 @@ let b:undo_ftplugin .= '|unlet b:regex_escape_flavor' if !exists('b:alternate_filetypes') let b:alternate_filetypes = [&filetype, 'html'] endif + +" Stop here if the user doesn't want ftplugin mappings +if exists('no_plugin_maps') || exists('no_php_maps') + finish +endif + +" Mappings to choose 'equalprg' +nnoremap <buffer> <LocalLeader>f + \ :<C-U>setlocal equalprg=phpcsff<CR> +nnoremap <buffer> <LocalLeader>i + \ :<C-U>setlocal equalprg<<CR> +let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>f' + \ . '|nunmap <buffer> <LocalLeader>i' |