diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2024-12-29 15:40:07 +0100 |
|---|---|---|
| committer | Christian Clason <ch.clason+github@icloud.com> | 2024-12-29 16:06:59 +0100 |
| commit | 76abe6bab5bc6c876c3a9697ec7d8c847c20010e (patch) | |
| tree | d0e8e96e4f5b327d33ad76f8be4cc75551deabeb | |
| parent | d7784225bc4add13aa5fa36be565f7db375d381e (diff) | |
| download | rneovim-76abe6bab5bc6c876c3a9697ec7d8c847c20010e.tar.gz rneovim-76abe6bab5bc6c876c3a9697ec7d8c847c20010e.tar.bz2 rneovim-76abe6bab5bc6c876c3a9697ec7d8c847c20010e.zip | |
vim-patch:df67fc0: runtime(sh): set shellcheck as the compiler for supported shells
closes: vim/vim#16311
https://github.com/vim/vim/commit/df67fc0e6994bc92f3d82edc6269e158875defad
Co-authored-by: Luca Saccarola <github.e41mv@aleeas.com>
| -rw-r--r-- | runtime/ftplugin/sh.vim | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim index 4c7695dcc6..54ae73b675 100644 --- a/runtime/ftplugin/sh.vim +++ b/runtime/ftplugin/sh.vim @@ -5,6 +5,7 @@ " Contributor: Enno Nagel <ennonagel+vim@gmail.com> " Eisuke Kawashima " Last Change: 2024 Sep 19 by Vim Project (compiler shellcheck) +" 2024 Dec 29 by Vim Project (improve setting shellcheck compiler) if exists("b:did_ftplugin") finish @@ -44,7 +45,11 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") let b:undo_ftplugin ..= " | unlet! b:browsefilter" endif -if get(b:, "is_bash", 0) +let s:is_sh = get(b:, "is_sh", get(g:, "is_sh", 0)) +let s:is_bash = get(b:, "is_bash", get(g:, "is_bash", 0)) +let s:is_kornshell = get(b:, "is_kornshell", get(g:, "is_kornshell", 0)) + +if s:is_bash if exists(':terminal') == 2 command! -buffer -nargs=1 ShKeywordPrg silent exe ':term bash -c "help "<args>" 2>/dev/null || man "<args>""' else @@ -52,14 +57,21 @@ if get(b:, "is_bash", 0) endif setlocal keywordprg=:ShKeywordPrg let b:undo_ftplugin ..= " | setl kp< | sil! delc -buffer ShKeywordPrg" +endif +if (s:is_sh || s:is_bash || s:is_kornshell) && executable('shellcheck') if !exists('current_compiler') compiler shellcheck + let b:undo_ftplugin ..= ' | compiler make' + endif +elseif s:is_bash + if !exists('current_compiler') + compiler bash + let b:undo_ftplugin ..= ' | compiler make' endif - let b:undo_ftplugin .= ' | compiler make' endif let &cpo = s:save_cpo -unlet s:save_cpo +unlet s:save_cpo s:is_sh s:is_bash s:is_kornshell " vim: nowrap sw=2 sts=2 ts=8 noet: |