diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-08 13:41:51 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-08 13:41:51 +1300 |
commit | f855ec0a7e76223d318ee4f0924d131643133e78 (patch) | |
tree | c16e358fc863cfaaa511d954df54187f9942a4f5 /vim/ftplugin/sh.vim | |
parent | Merge branch 'feature/spelling' into develop (diff) | |
parent | Use consistent/thorough ftplugin/indent unloading (diff) | |
download | dotfiles-f855ec0a7e76223d318ee4f0924d131643133e78.tar.gz dotfiles-f855ec0a7e76223d318ee4f0924d131643133e78.zip |
Merge branch 'feature/vim-review' into develop
* feature/vim-review:
Use consistent/thorough ftplugin/indent unloading
Add clustering for POSIX shell syntax groups
Add `kill` as shStatement
Add `break`, `continue`, `return` as shStatement
Override commands and variables for syntax/sh.vim
Disable unwanted shell error syntax for any shell
Break a long conditional in vim/ftdetect/sh.vim
Rename b:check and b:lint with sh_ prefix
Remove overkill defined-and-false check of sh vars
Clear b:check/lint in ftdetect/sh.vim b:undo
Move ftplugin/sh.vim b:undo def to end of file
Use correct undo variable name in ftplugin/sh.vim
Remove superfluous augroups around ftdetect defs
Use sh.vim local vars not global POSIX hacks
Diffstat (limited to 'vim/ftplugin/sh.vim')
-rw-r--r-- | vim/ftplugin/sh.vim | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/vim/ftplugin/sh.vim b/vim/ftplugin/sh.vim index 21d494e3..a8c94445 100644 --- a/vim/ftplugin/sh.vim +++ b/vim/ftplugin/sh.vim @@ -1,52 +1,53 @@ -" Default to POSIX shell, as I never write Bourne, and if I write Bash or Ksh -" it'll be denoted with either a shebang or an appropriate extension. -let g:is_posix = 1 - -" -" Setting g:is_posix above also prompts Vim's core syntax/sh.vim script to -" set g:is_kornshell and thereby b:is_kornshell to the same value as g:is_posix. " -" That's very confusing, so before it happens we'll copy b:is_kornshell's -" value as determined by filetype.vim and ~/.vim/ftdetect/sh.vim into a custom -" variable b:is_ksh, before its meaning gets confused. +" 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. " -" b:is_ksh as a name is more inline with b:is_bash and b:is_sh, anyway, so -" we'll just treat b:is_kornshell like it's both misnamed and broken. +" 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. " -" We can then switch on our custom variable in ~/.vim/after/syntax/sh.vim to -" apply settings that actually *are* unique to Korn shell and its derivatives. -" -if exists('b:is_kornshell') - let b:is_ksh = b:is_kornshell +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 " Use han(1df) as a man(1) wrapper for Bash files if available -if exists('b:is_bash') && executable('han') +if exists('b:is_bash') + \ && executable('han') setlocal keywordprg=han - let b:undo_user_indent - \ = 'setlocal keywordprg<' endif " Map checker based on shell family -if exists('b:is_bash') && b:is_bash - let b:check = 'write !bash -n' -elseif exists('b:is_ksh') && b:is_ksh - let b:check = 'write !ksh -n' +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:check = 'write !sh -n' + let b:sh_check = 'write !sh -n' endif nnoremap <buffer> <silent> \ <LocalLeader>c - \ :<C-U>execute b:check<CR> + \ :<C-U>execute b:sh_check<CR> " Map linter based on shell family -if exists('b:is_bash') && b:is_bash - let b:lint = 'write !shellcheck -s bash -' -elseif exists('b:is_ksh') && b:is_ksh - let b:lint = 'write !shellcheck -s ksh -' +if exists('b:is_bash') + let b:sh_lint = 'write !shellcheck -s bash -' +elseif exists('b:is_kornshell') + let b:sh_lint = 'write !shellcheck -s ksh -' else - let b:lint = 'write !shellcheck -s sh -' + let b:sh_lint = 'write !shellcheck -s sh -' endif nnoremap <buffer> <silent> \ <LocalLeader>l - \ :<C-U>execute b:lint<CR> + \ :<C-U>execute b:sh_lint<CR> + +" Unload this filetype plugin +let b:undo_user_ftplugin = '' + \ . '|setlocal keywordprg<' + \ . '|unlet! b:sh_check b:sh_lint' + \ . '|silent! unmap <LocalLeader>c' + \ . '|silent! unmap <LocalLeader>l' |