From 9931e0888b2419326ae10ebbfae532261c5c125f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 30 Jun 2016 16:11:56 +0200 Subject: Fix submodules --- vim/bundle/syntastic | 1 + .../syntastic/syntax_checkers/sh/bashate.vim | 48 ----------- .../syntastic/syntax_checkers/sh/checkbashisms.vim | 42 ---------- vim/bundle/syntastic/syntax_checkers/sh/sh.vim | 93 ---------------------- .../syntastic/syntax_checkers/sh/shellcheck.vim | 66 --------------- 5 files changed, 1 insertion(+), 249 deletions(-) create mode 160000 vim/bundle/syntastic delete mode 100644 vim/bundle/syntastic/syntax_checkers/sh/bashate.vim delete mode 100644 vim/bundle/syntastic/syntax_checkers/sh/checkbashisms.vim delete mode 100644 vim/bundle/syntastic/syntax_checkers/sh/sh.vim delete mode 100644 vim/bundle/syntastic/syntax_checkers/sh/shellcheck.vim (limited to 'vim/bundle/syntastic/syntax_checkers/sh') diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic new file mode 160000 index 0000000..cee74e0 --- /dev/null +++ b/vim/bundle/syntastic @@ -0,0 +1 @@ +Subproject commit cee74e0c1af934065fd1b3046e53cda76574f703 diff --git a/vim/bundle/syntastic/syntax_checkers/sh/bashate.vim b/vim/bundle/syntastic/syntax_checkers/sh/bashate.vim deleted file mode 100644 index c7888ad..0000000 --- a/vim/bundle/syntastic/syntax_checkers/sh/bashate.vim +++ /dev/null @@ -1,48 +0,0 @@ -"============================================================================ -"File: bashate.vim -"Description: Bash script style checking plugin for syntastic.vim -"License: This program is free software. It comes without any warranty, -" to the extent permitted by applicable law. You can redistribute -" it and/or modify it under the terms of the Do What The Fuck You -" Want To Public License, Version 2, as published by Sam Hocevar. -" See http://sam.zoy.org/wtfpl/COPYING for more details. -" -"============================================================================ - -if exists('g:loaded_syntastic_sh_bashate_checker') - finish -endif -let g:loaded_syntastic_sh_bashate_checker = 1 - -let s:save_cpo = &cpo -set cpo&vim - -function! SyntaxCheckers_sh_bashate_GetLocList() dict - let makeprg = self.makeprgBuild({}) - - let errorformat = - \ '%EE%n: %m,' . - \ '%Z - %f%\s%\+: L%l,' . - \ '%-G%.%#' - - let loclist = SyntasticMake({ - \ 'makeprg': makeprg, - \ 'errorformat': errorformat, - \ 'subtype': 'Style', - \ 'returns': [0, 1] }) - - for e in loclist - let e['text'] = substitute(e['text'], "\\m: '.*", '', '') - endfor - - return loclist -endfunction - -call g:SyntasticRegistry.CreateAndRegisterChecker({ - \ 'filetype': 'sh', - \ 'name': 'bashate' }) - -let &cpo = s:save_cpo -unlet s:save_cpo - -" vim: set sw=4 sts=4 et fdm=marker: diff --git a/vim/bundle/syntastic/syntax_checkers/sh/checkbashisms.vim b/vim/bundle/syntastic/syntax_checkers/sh/checkbashisms.vim deleted file mode 100644 index 2ed0717..0000000 --- a/vim/bundle/syntastic/syntax_checkers/sh/checkbashisms.vim +++ /dev/null @@ -1,42 +0,0 @@ -"============================================================================ -"File: checkbashisms.vim -"Description: Shell script syntax/style checking plugin for syntastic.vim -"Notes: checkbashisms.pl can be downloaded from -" http://debian.inode.at/debian/pool/main/d/devscripts/ -" as part of the devscripts package. -"============================================================================ - -if exists('g:loaded_syntastic_sh_checkbashisms_checker') - finish -endif -let g:loaded_syntastic_sh_checkbashisms_checker = 1 - -let s:save_cpo = &cpo -set cpo&vim - -function! SyntaxCheckers_sh_checkbashisms_GetLocList() dict - let makeprg = self.makeprgBuild({ 'args': '-fx' }) - - let errorformat = - \ '%-Gscript %f is already a bash script; skipping,' . - \ '%Eerror: %f: %m\, opened in line %l,' . - \ '%Eerror: %f: %m,' . - \ '%Ecannot open script %f for reading: %m,' . - \ '%Wscript %f %m,%C%.# lines,' . - \ '%Wpossible bashism in %f line %l (%m):,%C%.%#,%Z.%#,' . - \ '%-G%.%#' - - return SyntasticMake({ - \ 'makeprg': makeprg, - \ 'errorformat': errorformat, - \ 'subtype': 'Style' }) -endfunction - -call g:SyntasticRegistry.CreateAndRegisterChecker({ - \ 'filetype': 'sh', - \ 'name': 'checkbashisms' }) - -let &cpo = s:save_cpo -unlet s:save_cpo - -" vim: set sw=4 sts=4 et fdm=marker: diff --git a/vim/bundle/syntastic/syntax_checkers/sh/sh.vim b/vim/bundle/syntastic/syntax_checkers/sh/sh.vim deleted file mode 100644 index 395b81b..0000000 --- a/vim/bundle/syntastic/syntax_checkers/sh/sh.vim +++ /dev/null @@ -1,93 +0,0 @@ -"============================================================================ -"File: sh.vim -"Description: Syntax checking plugin for syntastic.vim -"Maintainer: Gregor Uhlenheuer -"License: This program is free software. It comes without any warranty, -" to the extent permitted by applicable law. You can redistribute -" it and/or modify it under the terms of the Do What The Fuck You -" Want To Public License, Version 2, as published by Sam Hocevar. -" See http://sam.zoy.org/wtfpl/COPYING for more details. -" -"============================================================================ - -if exists('g:loaded_syntastic_sh_sh_checker') - finish -endif -let g:loaded_syntastic_sh_sh_checker = 1 - -let s:save_cpo = &cpo -set cpo&vim - -function! SyntaxCheckers_sh_sh_IsAvailable() dict " {{{1 - call self.log('shell =', s:GetShell()) - return s:IsShellValid() -endfunction " }}}1 - -function! SyntaxCheckers_sh_sh_GetLocList() dict " {{{1 - if s:GetShell() ==# 'zsh' - return s:ForwardToZshChecker() - endif - - if !s:IsShellValid() - return [] - endif - - let makeprg = self.makeprgBuild({ - \ 'exe': s:GetShell(), - \ 'args_after': '-n' }) - - let errorformat = '%f: line %l: %m' - - return SyntasticMake({ - \ 'makeprg': makeprg, - \ 'errorformat': errorformat }) -endfunction " }}}1 - -" Utilities {{{1 - -function! s:GetShell() " {{{2 - if !exists('b:shell') || b:shell ==# '' - let b:shell = '' - let shebang = syntastic#util#parseShebang()['exe'] - if shebang !=# '' - if shebang[-strlen('bash'):-1] ==# 'bash' - let b:shell = 'bash' - elseif shebang[-strlen('zsh'):-1] ==# 'zsh' - let b:shell = 'zsh' - elseif shebang[-strlen('sh'):-1] ==# 'sh' - let b:shell = 'sh' - endif - endif - " try to use env variable in case no shebang could be found - if b:shell ==# '' - let b:shell = fnamemodify($SHELL, ':t') - endif - endif - return b:shell -endfunction " }}}2 - -function! s:IsShellValid() " {{{2 - let shell = s:GetShell() - return shell !=# '' && executable(shell) -endfunction " }}}2 - -function! s:ForwardToZshChecker() " {{{2 - let registry = g:SyntasticRegistry.Instance() - let zsh_checkers = registry.getCheckersAvailable('zsh', ['zsh']) - if !empty(zsh_checkers) - return zsh_checkers[0].getLocListRaw() - else - return [] - endif -endfunction " }}}2 - -" }}}1 - -call g:SyntasticRegistry.CreateAndRegisterChecker({ - \ 'filetype': 'sh', - \ 'name': 'sh' }) - -let &cpo = s:save_cpo -unlet s:save_cpo - -" vim: set sw=4 sts=4 et fdm=marker: diff --git a/vim/bundle/syntastic/syntax_checkers/sh/shellcheck.vim b/vim/bundle/syntastic/syntax_checkers/sh/shellcheck.vim deleted file mode 100644 index 5189e19..0000000 --- a/vim/bundle/syntastic/syntax_checkers/sh/shellcheck.vim +++ /dev/null @@ -1,66 +0,0 @@ -"============================================================================ -"File: shellcheck.vim -"Description: Shell script syntax/style checking plugin for syntastic.vim -"============================================================================ - -if exists('g:loaded_syntastic_sh_shellcheck_checker') - finish -endif -let g:loaded_syntastic_sh_shellcheck_checker = 1 - -let s:save_cpo = &cpo -set cpo&vim - -function! SyntaxCheckers_sh_shellcheck_GetLocList() dict " {{{1 - let makeprg = self.makeprgBuild({ - \ 'args': s:GetShell(), - \ 'args_after': '-f gcc' }) - - let errorformat = - \ '%f:%l:%c: %trror: %m,' . - \ '%f:%l:%c: %tarning: %m,' . - \ '%f:%l:%c: %tote: %m' - - let loclist = SyntasticMake({ - \ 'makeprg': makeprg, - \ 'errorformat': errorformat, - \ 'returns': [0, 1] }) - - for e in loclist - if e['type'] ==? 'n' - let e['type'] = 'w' - let e['subtype'] = 'Style' - endif - endfor - - return loclist -endfunction " }}}1 - -" Utilities {{{1 - -function! s:GetShell() " {{{2 - let sh = '' - - if syntastic#util#parseShebang()['exe'] ==# '' - if syntastic#util#rawVar('is_kornshell', 0) || syntastic#util#rawVar('is_posix', 0) - let sh = 'ksh' - elseif syntastic#util#rawVar('is_bash', 0) - let sh = 'bash' - elseif syntastic#util#rawVar('is_sh', 0) - let sh = 'sh' - endif - endif - - return sh !=# '' ? '-s ' . sh : '' -endfunction " }}}2 - -" }}}1 - -call g:SyntasticRegistry.CreateAndRegisterChecker({ - \ 'filetype': 'sh', - \ 'name': 'shellcheck' }) - -let &cpo = s:save_cpo -unlet s:save_cpo - -" vim: set sw=4 sts=4 et fdm=marker: -- cgit v1.2.3