diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-17 11:53:31 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-17 11:53:31 +1200 |
commit | 670c735799879ae066b9a5249356a4d872514951 (patch) | |
tree | 994ec8145503f6515e83cd6284e1f4bca85b6ad6 /vim/after/ftplugin/sh | |
parent | Add local copy of php.vim compiler (diff) | |
download | dotfiles-670c735799879ae066b9a5249356a4d872514951.tar.gz dotfiles-670c735799879ae066b9a5249356a4d872514951.zip |
Use autoload function for temp-makeprg :lmake
Diffstat (limited to 'vim/after/ftplugin/sh')
-rw-r--r-- | vim/after/ftplugin/sh/check.vim | 36 | ||||
-rw-r--r-- | vim/after/ftplugin/sh/lint.vim | 25 |
2 files changed, 19 insertions, 42 deletions
diff --git a/vim/after/ftplugin/sh/check.vim b/vim/after/ftplugin/sh/check.vim index e92409cf..499926f3 100644 --- a/vim/after/ftplugin/sh/check.vim +++ b/vim/after/ftplugin/sh/check.vim @@ -10,39 +10,29 @@ if exists('b:did_ftplugin_sh_check') finish endif +" Stop here if the user doesn't want ftplugin mappings +if exists('g:no_plugin_maps') || exists('g:no_sh_maps') + finish +endif + " Flag as loaded let b:did_ftplugin_sh_check = 1 let b:undo_ftplugin = b:undo_ftplugin \ . '|unlet b:did_ftplugin_sh_check' -" Build function for checker -function! s:ShCheck() - if exists('b:current_compiler') - let l:save_compiler = b:current_compiler - endif - if exists('b:is_bash') - compiler bash - elseif exists('b:is_kornshell') - compiler ksh - else - compiler sh - endif - lmake! - lwindow - if exists('l:save_compiler') - execute 'compiler ' . l:save_compiler - endif -endfunction - -" Stop here if the user doesn't want ftplugin mappings -if exists('g:no_plugin_maps') || exists('g:no_sh_maps') - finish +" Choose compiler based on file subtype +if exists('b:is_bash') + let b:sh_check_compiler = 'bash' +elseif exists('b:is_kornshell') + let b:sh_check_compiler = 'ksh' +else + let b:sh_check_compiler = 'sh' endif " Define a mapping target nnoremap <buffer> <silent> <unique> \ <Plug>ShCheck - \ :<C-U>call <SID>ShCheck()<CR> + \ :<C-U>call compiler#Make(b:sh_check_compiler)<CR> let b:undo_ftplugin = b:undo_ftplugin \ . '|nunmap <buffer> <Plug>ShCheck' diff --git a/vim/after/ftplugin/sh/lint.vim b/vim/after/ftplugin/sh/lint.vim index 87f1c07e..65fe003d 100644 --- a/vim/after/ftplugin/sh/lint.vim +++ b/vim/after/ftplugin/sh/lint.vim @@ -10,33 +10,20 @@ if exists('b:did_ftplugin_sh_lint') finish endif +" Don't load if the user doesn't want ftplugin mappings +if exists('g:no_plugin_maps') || exists('g:no_sh_maps') + finish +endif + " Flag as loaded let b:did_ftplugin_sh_lint = 1 let b:undo_ftplugin = b:undo_ftplugin \ . '|unlet b:did_ftplugin_sh_lint' -" Build function for linter -function! s:ShLint() - if exists('b:current_compiler') - let l:save_compiler = b:current_compiler - endif - compiler shellcheck - lmake! - lwindow - if exists('l:save_compiler') - execute 'compiler ' . l:save_compiler - endif -endfunction - -" Stop here if the user doesn't want ftplugin mappings -if exists('g:no_plugin_maps') || exists('g:no_sh_maps') - finish -endif - " Define a mapping target nnoremap <buffer> <silent> <unique> \ <Plug>ShLint - \ :<C-U>call <SID>ShLint()<CR> + \ :<C-U>call compiler#Make('shellcheck')<CR> let b:undo_ftplugin = b:undo_ftplugin \ . '|nunmap <buffer> <Plug>ShLint' |