aboutsummaryrefslogtreecommitdiff
path: root/vim/after/ftplugin/sh
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-17 01:01:12 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-17 01:01:12 +1200
commit37ae33b03cb8f7a0ea591c56fae48c5bcb588704 (patch)
tree2ddd07cd9dd348fa4f251d4b83960e24cf75d30f /vim/after/ftplugin/sh
parent3f78aa7247cdcd1d4815f82ff01bcba87f37b6b6 (diff)
parent7271ce11df45a507967c73df23866630a5345cc1 (diff)
downloaddotfiles-37ae33b03cb8f7a0ea591c56fae48c5bcb588704.tar.gz
dotfiles-37ae33b03cb8f7a0ea591c56fae48c5bcb588704.zip
Merge branch 'release/v0.54.0'v0.54.0
* release/v0.54.0: Regenerate dotfiles(7) manual Bump VERSION Add note about compiler scripts Arrange for tidiers to hold window position Update markdown_autoformat.vim Update surround.vim Completely overhaul after/ftplugin files Use short-circuit for no-mapping check Correct g:current_compiler setting Consistently require 'nocompatible' for ftplugins Upgrade insert_suspend_hlsearch.vim Use `function!` consistently in ftplugins Fix comments in vim/filetype.vim Set 'comments' blank by default Add Xresources filenames Add more names to Vim Bash types
Diffstat (limited to 'vim/after/ftplugin/sh')
-rw-r--r--vim/after/ftplugin/sh/bash_han.vim19
-rw-r--r--vim/after/ftplugin/sh/check.vim98
-rw-r--r--vim/after/ftplugin/sh/han.vim26
-rw-r--r--vim/after/ftplugin/sh/lint.vim94
-rw-r--r--vim/after/ftplugin/sh/posix.vim27
5 files changed, 111 insertions, 153 deletions
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 3eaf3f57..e92409cf 100644
--- a/vim/after/ftplugin/sh/check.vim
+++ b/vim/after/ftplugin/sh/check.vim
@@ -1,64 +1,56 @@
-" 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
+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')
+ finish
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>call <SID>ShCheck()<CR>
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <Plug>ShCheck'
- " Define a mapping target
- nnoremap <buffer> <silent> <unique>
+" If there isn't a key mapping already, use a default one
+if !hasmapto('<Plug>ShCheck')
+ nmap <buffer> <unique>
+ \ <LocalLeader>c
\ <Plug>ShCheck
- \ :<C-U>call <SID>ShCheck()<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
-
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <LocalLeader>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 7d6e4d75..87f1c07e 100644
--- a/vim/after/ftplugin/sh/lint.vim
+++ b/vim/after/ftplugin/sh/lint.vim
@@ -1,64 +1,50 @@
-" 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
+" sh/lint.vim: Use appropriate shell binary to lint scripts for errors
-" 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 running compatible or too old
+if &compatible || v:version < 700
+ finish
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
+" Don't load if already loaded
+if exists('b:did_ftplugin_sh_lint')
+ finish
endif
-" Set up a mapping for the linter, if we're allowed
-if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps')
+" Flag as loaded
+let b:did_ftplugin_sh_lint = 1
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_sh_lint'
- " Define a mapping target
- 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'
+" Build function for linter
+function! s:ShLint()
+ if exists('b:current_compiler')
+ let l:save_compiler = b:current_compiler
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
+ 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
+if exists('g:no_plugin_maps') || exists('g:no_sh_maps')
+ finish
+endif
+
+" Define a mapping target
+nnoremap <buffer> <silent> <unique>
+ \ <Plug>ShLint
+ \ :<C-U>call <SID>ShLint()<CR>
+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
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <LocalLeader>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