From c4dc71a54742e280f2145dcc58c5f5bd471c2b7e Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 15 Dec 2019 17:22:38 +1300 Subject: Add mappings to change 'equalprg' in Perl and PHP --- vim/after/ftplugin/perl.vim | 15 +++++++++++++-- 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 l let b:undo_ftplugin .= '|nunmap c' \ . '|nunmap l' +" Mappings to choose 'equalprg' +nnoremap t + \ :setlocal equalprg=perltidy +nnoremap i + \ :setlocal equalprg< +let b:undo_ftplugin .= '|nunmap t' + \ . '|nunmap i' + " Bump version numbers nmap v \ (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 f + \ :setlocal equalprg=phpcsff +nnoremap i + \ :setlocal equalprg< +let b:undo_ftplugin .= '|nunmap f' + \ . '|nunmap i' -- cgit v1.2.3