diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-12 20:48:57 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-12 20:48:57 +1300 |
commit | d4cbf3994178061dad4a4e2d345f8cf0466bec39 (patch) | |
tree | 67bfede247336b6601529627730e6049621653dc /vim/after/ftplugin/sh | |
parent | Merge branch 'release/v0.13.0' (diff) | |
parent | Regenerate dotfiles(7) manual from README.md (diff) | |
download | dotfiles-d4cbf3994178061dad4a4e2d345f8cf0466bec39.tar.gz dotfiles-d4cbf3994178061dad4a4e2d345f8cf0466bec39.zip |
Merge branch 'release/v0.14.0'v0.14.0
* release/v0.14.0:
Regenerate dotfiles(7) manual from README.md
Bump version number to 0.14.0
Mention Vim restructuring in README
Add guards for presence of b:undo_* var
Exclude SC1090 (failed source) shellcheck error
Move lots of local Vim config into vim/after
Add author/license boilerplate to all plugins
Diffstat (limited to 'vim/after/ftplugin/sh')
-rw-r--r-- | vim/after/ftplugin/sh/bash_han.vim | 19 | ||||
-rw-r--r-- | vim/after/ftplugin/sh/check.vim | 48 | ||||
-rw-r--r-- | vim/after/ftplugin/sh/lint.vim | 48 | ||||
-rw-r--r-- | vim/after/ftplugin/sh/posix.vim | 27 |
4 files changed, 142 insertions, 0 deletions
diff --git a/vim/after/ftplugin/sh/bash_han.vim b/vim/after/ftplugin/sh/bash_han.vim new file mode 100644 index 00000000..a160165c --- /dev/null +++ b/vim/after/ftplugin/sh/bash_han.vim @@ -0,0 +1,19 @@ +" 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 new file mode 100644 index 00000000..334ec1db --- /dev/null +++ b/vim/after/ftplugin/sh/check.vim @@ -0,0 +1,48 @@ +" Only do this when not done yet for this buffer +" Also do nothing if 'compatible' enabled +if exists('b:did_ftplugin_sh_check') || &compatible + 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 = 'write !bash -n' +elseif exists('b:is_kornshell') + let b:sh_check = 'write !ksh -n' +else + let b:sh_check = 'write !sh -n' +endif +if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:sh_check' +endif + +" Set up a mapping for the checker, if we're allowed +if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps') + + " Define a mapping target + nnoremap <buffer> <silent> <unique> + \ <Plug>ShCheck + \ :<C-U>execute b:sh_check<CR> + if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <Plug>ShCheck' + endif + + " If there isn't a key mapping already, use a default one + if !hasmapto('<Plug>ShCheck') + nmap <buffer> <unique> + \ <LocalLeader>c + \ <Plug>ShCheck + if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <LocalLeader>c' + endif + endif + +endif diff --git a/vim/after/ftplugin/sh/lint.vim b/vim/after/ftplugin/sh/lint.vim new file mode 100644 index 00000000..8745a31e --- /dev/null +++ b/vim/after/ftplugin/sh/lint.vim @@ -0,0 +1,48 @@ +" Only do this when not done yet for this buffer +" Also do nothing if 'compatible' enabled +if exists('b:did_ftplugin_sh_lint') || &compatible + 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 = 'write !shellcheck -e SC1090 -s bash -' +elseif exists('b:is_kornshell') + let b:sh_lint = 'write !shellcheck -e SC1090 -s ksh -' +else + let b:sh_lint = 'write !shellcheck -e SC1090 -s sh -' +endif +if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:sh_lint' +endif + +" Set up a mapping for the linter, if we're allowed +if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps') + + " Define a mapping target + nnoremap <buffer> <silent> <unique> + \ <Plug>ShLint + \ :<C-U>execute b:sh_lint<CR> + if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap <buffer> <Plug>ShLint' + endif + + " 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 + endif + +endif diff --git a/vim/after/ftplugin/sh/posix.vim b/vim/after/ftplugin/sh/posix.vim new file mode 100644 index 00000000..a1b2c7ff --- /dev/null +++ b/vim/after/ftplugin/sh/posix.vim @@ -0,0 +1,27 @@ +" 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 |