diff options
| -rw-r--r-- | ale_linters/javascript/xo.vim | 8 | ||||
| -rw-r--r-- | ale_linters/sh/shellcheck.vim | 11 | ||||
| -rw-r--r-- | ale_linters/sml/smlnj.vim | 2 | ||||
| -rw-r--r-- | doc/ale-sh.txt | 2 |
4 files changed, 10 insertions, 13 deletions
diff --git a/ale_linters/javascript/xo.vim b/ale_linters/javascript/xo.vim index dc71f0d3..0276b551 100644 --- a/ale_linters/javascript/xo.vim +++ b/ale_linters/javascript/xo.vim @@ -11,20 +11,20 @@ let g:ale_javascript_xo_use_global = \ get(g:, 'ale_javascript_xo_use_global', 0) function! ale_linters#javascript#xo#GetExecutable(buffer) abort - if g:ale_javascript_xo_use_global - return g:ale_javascript_xo_executable + if ale#Var(a:buffer, 'javascript_xo_use_global') + return ale#Var(a:buffer, 'javascript_xo_executable') endif return ale#path#ResolveLocalPath( \ a:buffer, \ 'node_modules/.bin/xo', - \ g:ale_javascript_xo_executable + \ ale#Var(a:buffer, 'javascript_xo_executable') \) endfunction function! ale_linters#javascript#xo#GetCommand(buffer) abort return ale_linters#javascript#xo#GetExecutable(a:buffer) - \ . ' ' . g:ale_javascript_xo_options + \ . ' ' . ale#Var(a:buffer, 'javascript_xo_options') \ . ' --reporter unix --stdin --stdin-filename %s' endfunction diff --git a/ale_linters/sh/shellcheck.vim b/ale_linters/sh/shellcheck.vim index 1d9f7b05..b4a622a0 100644 --- a/ale_linters/sh/shellcheck.vim +++ b/ale_linters/sh/shellcheck.vim @@ -20,12 +20,6 @@ function! ale_linters#sh#shellcheck#GetExecutable(buffer) abort return ale#Var(a:buffer, 'sh_shellcheck_executable') endfunction -if g:ale_linters_sh_shellcheck_exclusions !=# '' - let s:exclude_option = '-e ' . g:ale_linters_sh_shellcheck_exclusions -else - let s:exclude_option = '' -endif - function! s:GetDialectArgument() abort if exists('b:is_bash') && b:is_bash return '-s bash' @@ -39,9 +33,12 @@ function! s:GetDialectArgument() abort endfunction function! ale_linters#sh#shellcheck#GetCommand(buffer) abort + let l:exclude_option = ale#Var(a:buffer, 'linters_sh_shellcheck_exclusions') + return ale_linters#sh#shellcheck#GetExecutable(a:buffer) \ . ' ' . ale#Var(a:buffer, 'sh_shellcheck_options') - \ . ' ' . s:exclude_option . ' ' . s:GetDialectArgument() . ' -f gcc -' + \ . ' ' . (!empty(l:exclude_option) ? '-e ' . l:exclude_option : '') + \ . ' ' . s:GetDialectArgument() . ' -f gcc -' endfunction call ale#linter#Define('sh', { diff --git a/ale_linters/sml/smlnj.vim b/ale_linters/sml/smlnj.vim index 48786370..fda1d038 100644 --- a/ale_linters/sml/smlnj.vim +++ b/ale_linters/sml/smlnj.vim @@ -39,7 +39,7 @@ function! ale_linters#sml#smlnj#Handle(buffer, lines) abort return l:out endfunction -call g:ale#linter#Define('sml', { +call ale#linter#Define('sml', { \ 'name': 'smlnj', \ 'executable': 'sml', \ 'command': 'sml', diff --git a/doc/ale-sh.txt b/doc/ale-sh.txt index b35d6f2e..597b75ff 100644 --- a/doc/ale-sh.txt +++ b/doc/ale-sh.txt @@ -53,7 +53,7 @@ g:ale_linters_sh_shellcheck_exclusions *g:ale_linters_sh_shellcheck_exclusions* will be sourced by other scripts, use the buffer-local variant: > autocmd BufEnter PKGBUILD,.env - \ let b:ale_sh_shellcheck_exclusions = 'SC2034,SC2154,SC2164' + \ let b:ale_linters_sh_shellcheck_exclusions = 'SC2034,SC2154,SC2164' < ------------------------------------------------------------------------------- |