From 0d8a2b3c99df6bc357378962e979b991e3d92256 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 16 Jun 2018 13:16:28 +1200 Subject: Use `function!` consistently in ftplugins --- vim/after/ftplugin/sh/lint.vim | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'vim/after/ftplugin/sh') diff --git a/vim/after/ftplugin/sh/lint.vim b/vim/after/ftplugin/sh/lint.vim index 7d6e4d75..a8d65702 100644 --- a/vim/after/ftplugin/sh/lint.vim +++ b/vim/after/ftplugin/sh/lint.vim @@ -25,18 +25,16 @@ if exists('b:undo_ftplugin') endif " Build function for checker -if !exists('*s:ShLint') - 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 - endfunction -endif +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 +endfunction " Set up a mapping for the linter, if we're allowed if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps') -- cgit v1.2.3 From 88defc4fc528bad2b0664c634d95e4363665472d Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 16 Jun 2018 21:59:31 +1200 Subject: Use short-circuit for no-mapping check --- vim/after/ftplugin/sh/check.vim | 36 ++++++++++++++++++------------------ vim/after/ftplugin/sh/lint.vim | 36 ++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 36 deletions(-) (limited to 'vim/after/ftplugin/sh') diff --git a/vim/after/ftplugin/sh/check.vim b/vim/after/ftplugin/sh/check.vim index 3eaf3f57..dce6552c 100644 --- a/vim/after/ftplugin/sh/check.vim +++ b/vim/after/ftplugin/sh/check.vim @@ -38,27 +38,27 @@ if !exists('*s:ShCheck') endfunction endif -" Set up a mapping for the checker, if we're allowed -if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps') +" 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 +" Define a mapping target +nnoremap + \ ShCheck + \ :call ShCheck() +if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap ShCheck' +endif + +" If there isn't a key mapping already, use a default one +if !hasmapto('ShCheck') + nmap + \ c \ ShCheck - \ :call ShCheck() if exists('b:undo_ftplugin') let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap ShCheck' - endif - - " If there isn't a key mapping already, use a default one - if !hasmapto('ShCheck') - nmap - \ c - \ ShCheck - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap c' - endif + \ . '|nunmap c' endif - endif diff --git a/vim/after/ftplugin/sh/lint.vim b/vim/after/ftplugin/sh/lint.vim index a8d65702..b89645f7 100644 --- a/vim/after/ftplugin/sh/lint.vim +++ b/vim/after/ftplugin/sh/lint.vim @@ -36,27 +36,27 @@ function! s:ShLint() cwindow endfunction -" Set up a mapping for the linter, if we're allowed -if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps') +" 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 +" Define a mapping target +nnoremap + \ ShLint + \ :call ShLint() +if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap ShLint' +endif + +" If there isn't a key mapping already, use a default one +if !hasmapto('ShLint') + nmap + \ l \ ShLint - \ :call ShLint() if exists('b:undo_ftplugin') let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap ShLint' - endif - - " If there isn't a key mapping already, use a default one - if !hasmapto('ShLint') - nmap - \ l - \ ShLint - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap l' - endif + \ . '|nunmap l' endif - endif -- cgit v1.2.3 From 81ff3c0f3ae44bb88a129b7395cb050290a37518 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 17 Jun 2018 00:19:45 +1200 Subject: 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 --- vim/after/ftplugin/sh/bash_han.vim | 19 ---------- vim/after/ftplugin/sh/check.vim | 74 +++++++++++++++++--------------------- vim/after/ftplugin/sh/han.vim | 26 ++++++++++++++ vim/after/ftplugin/sh/lint.vim | 64 ++++++++++++++------------------- vim/after/ftplugin/sh/posix.vim | 27 -------------- 5 files changed, 85 insertions(+), 125 deletions(-) delete mode 100644 vim/after/ftplugin/sh/bash_han.vim create mode 100644 vim/after/ftplugin/sh/han.vim delete mode 100644 vim/after/ftplugin/sh/posix.vim (limited to 'vim/after/ftplugin/sh') diff --git a/vim/after/ftplugin/sh/bash_han.vim b/vim/after/ftplugin/sh/bash_han.vim deleted file mode 100644 index a160165c..00000000 --- a/vim/after/ftplugin/sh/bash_han.vim +++ /dev/null @@ -1,19 +0,0 @@ -" Only do this when not done yet for this buffer -" Also do nothing if 'compatible' enabled -if exists('b:did_ftplugin_sh_bash_han') || &compatible - finish -endif -let b:did_ftplugin_sh_bash_han = 1 -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_sh_bash_han' -endif - -" Use han(1df) as a man(1) wrapper for Bash files if available -if exists('b:is_bash') && executable('han') - setlocal keywordprg=han - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|setlocal keywordprg<' - endif -endif diff --git a/vim/after/ftplugin/sh/check.vim b/vim/after/ftplugin/sh/check.vim index dce6552c..e92409cf 100644 --- a/vim/after/ftplugin/sh/check.vim +++ b/vim/after/ftplugin/sh/check.vim @@ -1,42 +1,38 @@ -" Only do this when not done yet for this buffer -" Also do nothing if 'compatible' enabled -if exists('b:did_ftplugin_sh_check') || &compatible +" sh/check.vim: Use appropriate shell binary to check scripts for errors + +" Don't load if running compatible or too old +if &compatible || v:version < 700 finish endif -let b:did_ftplugin_sh_check = 1 -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_sh_check' -endif -" Choose checker based on shell family -if exists('b:is_bash') - let b:sh_check_makeprg = 'bash -n %:S' -elseif exists('b:is_kornshell') - let b:sh_check_makeprg = 'ksh -n %:S' -else - let b:sh_check_makeprg = 'sh -n %:S' -endif -let b:sh_check_errorformat = '%f: %l: %m' -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:sh_check_makeprg' - \ . '|unlet b:sh_check_errorformat' +" Don't load if already loaded +if exists('b:did_ftplugin_sh_check') + 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 -if !exists('*s:ShCheck') - function s:ShCheck() - let l:save_makeprg = &l:makeprg - let l:save_errorformat = &l:errorformat - let &l:makeprg = b:sh_check_makeprg - let &l:errorformat = b:sh_check_errorformat - make! - let &l:makeprg = l:save_makeprg - let &l:errorformat = l:save_errorformat - cwindow - endfunction -endif +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') @@ -47,18 +43,14 @@ endif nnoremap \ ShCheck \ :call ShCheck() -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap ShCheck' -endif +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap ShCheck' " If there isn't a key mapping already, use a default one if !hasmapto('ShCheck') nmap \ c \ ShCheck - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap c' - endif + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap c' endif diff --git a/vim/after/ftplugin/sh/han.vim b/vim/after/ftplugin/sh/han.vim new file mode 100644 index 00000000..3aacdb7e --- /dev/null +++ b/vim/after/ftplugin/sh/han.vim @@ -0,0 +1,26 @@ +" sh/han.vim: Use han(1df) as 'keywordprg' for Bash scripts + +" Don't load if running compatible or too old +if &compatible || v:version < 700 + finish +endif + +" Don't load if already loaded +if exists('b:did_ftplugin_sh_han') + finish +endif + +" Don't load if this isn't Bash or if han(1df) isn't available +if !exists('b:is_bash') || !executable('han') + finish +endif + +" Flag as loaded +let b:did_ftplugin_sh_han = 1 +let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_sh_han' + +" Set 'keywordprg' to han(1df) +setlocal keywordprg=han +let b:undo_ftplugin = b:undo_ftplugin + \ . '|setlocal keywordprg<' 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 \ ShLint \ :call ShLint() -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap ShLint' -endif +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap ShLint' " If there isn't a key mapping already, use a default one if !hasmapto('ShLint') nmap \ l \ ShLint - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap l' - endif + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap l' endif diff --git a/vim/after/ftplugin/sh/posix.vim b/vim/after/ftplugin/sh/posix.vim deleted file mode 100644 index a1b2c7ff..00000000 --- a/vim/after/ftplugin/sh/posix.vim +++ /dev/null @@ -1,27 +0,0 @@ -" Only do this when not done yet for this buffer -" Also do nothing if 'compatible' enabled -if exists('b:did_ftplugin_sh_posix') || &compatible - finish -endif -let b:did_ftplugin_sh_posix = 1 -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_sh_posix' -endif - -" -" If we have a #!/bin/sh shebang and filetype.vim determined we were neither -" POSIX nor Bash nor Korn shell, we'll guess POSIX, just because it's far more -" likely that's what I want to write than plain Bourne shell. -" -" You're supposed to be able to do this by setting g:is_posix, but if that's -" set, the syntax file ends up setting g:is_kornshell for you too, for reasons -" I don't really understand. This method works though, and is cleaner than -" the other workaround I had been trying. -" -if exists('b:is_sh') - unlet b:is_sh - if !exists('b:is_bash') && !exists('b:is_kornshell') - let b:is_posix = 1 - endif -endif -- cgit v1.2.3