diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-09 01:15:22 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-09 01:15:22 +1200 |
commit | 950f883d89ca0fa7e80cca8f9a0d8cfbade8ebc3 (patch) | |
tree | 4c1cada051a4d3ebe017d9241e471a95e127725e /vim/after/ftplugin/sh.vim | |
parent | Change local leader back to comma (diff) | |
download | dotfiles-950f883d89ca0fa7e80cca8f9a0d8cfbade8ebc3.tar.gz dotfiles-950f883d89ca0fa7e80cca8f9a0d8cfbade8ebc3.zip |
Overhaul ftplugin check, lint, tidy
- Set 'equalprg' for HTML and Perl
- Discard filter#Stable()
- Set default :compiler for all applicable filetypes
- Change local leader mappings for Perl and shell script merely to set
:compiler, rather than running it
- Bind global leader mapping for running :lmake!
- Bind global leader mappings for applying 'equalprg' and 'formatprg' to
the whole buffer, using a new autoloaded helper function
vimrc#Anchor() to avoid the cursor jumping around
Diffstat (limited to 'vim/after/ftplugin/sh.vim')
-rw-r--r-- | vim/after/ftplugin/sh.vim | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/vim/after/ftplugin/sh.vim b/vim/after/ftplugin/sh.vim index 086e23d5..01505a88 100644 --- a/vim/after/ftplugin/sh.vim +++ b/vim/after/ftplugin/sh.vim @@ -17,11 +17,6 @@ if exists('b:is_bash') \ . '|setlocal keywordprg<' endif -" Stop here if the user doesn't want ftplugin mappings -if exists('g:no_plugin_maps') || exists('g:no_sh_maps') - finish -endif - " Choose check compiler based on file subtype if exists('b:is_bash') let b:sh_check_compiler = 'bash' @@ -30,14 +25,22 @@ elseif exists('b:is_kornshell') else let b:sh_check_compiler = 'sh' endif +execute 'compiler '.b:sh_check_compiler let b:undo_ftplugin = b:undo_ftplugin \ . '|unlet b:sh_check_compiler' + \ . '|setlocal errorformat<' + \ . '|setlocal makeprg<' + +" Stop here if the user doesn't want ftplugin mappings +if exists('g:no_plugin_maps') || exists('g:no_sh_maps') + finish +endif -" Set mappings -nnoremap <buffer> <LocalLeader>c - \ :<C-U>call compiler#Make(b:sh_check_compiler)<CR> +" Mappings to choose compiler +nnoremap <buffer> <expr> <LocalLeader>c + \ ':<C-U>compiler '.b:sh_check_compiler.'<CR>' nnoremap <buffer> <LocalLeader>l - \ :<C-U>call compiler#Make('shellcheck')<CR> + \ :<C-U>compiler shellcheck<CR> let b:undo_ftplugin = b:undo_ftplugin \ . '|nunmap <buffer> <LocalLeader>c' \ . '|nunmap <buffer> <LocalLeader>l' |