diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-17 00:19:45 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-17 00:19:45 +1200 |
commit | 81ff3c0f3ae44bb88a129b7395cb050290a37518 (patch) | |
tree | d0cf48de5513c8bfff929ff24473dc6bc441f9e9 /vim/after/ftplugin/sh/lint.vim | |
parent | Use short-circuit for no-mapping check (diff) | |
download | dotfiles-81ff3c0f3ae44bb88a129b7395cb050290a37518.tar.gz dotfiles-81ff3c0f3ae44bb88a129b7395cb050290a37518.zip |
Completely overhaul after/ftplugin files
Should have done some of this in separate commits; oh well.
* Rewrite headers for each ftplugin
* Require Vim version >= 7.0, and thereby:
* Switch back to location list
* Don't check for b:undo_ftplugin existence, assume it
* Save and restore compiler instead of internal options
* Add bash, ksh, sh, and shellcheck compilers
* Rename mail/format_flowed.vim to mail/flowed.vim
* Rename sh/bash_han.vim to sh/han.vim
Diffstat (limited to 'vim/after/ftplugin/sh/lint.vim')
-rw-r--r-- | vim/after/ftplugin/sh/lint.vim | 64 |
1 files changed, 26 insertions, 38 deletions
diff --git a/vim/after/ftplugin/sh/lint.vim b/vim/after/ftplugin/sh/lint.vim index b89645f7..87f1c07e 100644 --- a/vim/after/ftplugin/sh/lint.vim +++ b/vim/after/ftplugin/sh/lint.vim @@ -1,39 +1,31 @@ -" Only do this when not done yet for this buffer -" Also do nothing if 'compatible' enabled -if exists('b:did_ftplugin_sh_lint') || &compatible +" sh/lint.vim: Use appropriate shell binary to lint scripts for errors + +" Don't load if running compatible or too old +if &compatible || v:version < 700 finish endif -let b:did_ftplugin_sh_lint = 1 -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_sh_lint' -endif -" Choose linter based on shell family -if exists('b:is_bash') - let b:sh_lint_makeprg = 'shellcheck -e SC1090 -f gcc -s bash %:S' -elseif exists('b:is_kornshell') - let b:sh_lint_makeprg = 'shellcheck -e SC1090 -f gcc -s ksh %:S' -else - let b:sh_lint_makeprg = 'shellcheck -e SC1090 -f gcc -s sh %:S' -endif -let b:sh_lint_errorformat = '%f:%l:%c: %m [SC%n]' -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:sh_lint_makeprg' - \ . '|unlet b:sh_lint_errorformat' +" Don't load if already loaded +if exists('b:did_ftplugin_sh_lint') + finish endif -" Build function for checker +" 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() - let l:save_makeprg = &l:makeprg - let l:save_errorformat = &l:errorformat - let &l:makeprg = b:sh_lint_makeprg - let &l:errorformat = b:sh_lint_errorformat - make! - let &l:makeprg = l:save_makeprg - let &l:errorformat = l:save_errorformat - cwindow + 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 @@ -45,18 +37,14 @@ endif nnoremap <buffer> <silent> <unique> \ <Plug>ShLint \ :<C-U>call <SID>ShLint()<CR> -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <Plug>ShLint' -endif +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <Plug>ShLint' " If there isn't a key mapping already, use a default one if !hasmapto('<Plug>ShLint') nmap <buffer> <unique> \ <LocalLeader>l \ <Plug>ShLint - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <LocalLeader>l' - endif + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <LocalLeader>l' endif |