marc/ale
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #491 - Use -x for shellcheck for checking files with sourced files

Browse source
This commit is contained in:
w0rp 2017-10-26 00:48:51 +01:00
parent 2f5b94e07d
commit 5917de565d
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ale_linters/sh/shellcheck.vim
View file

@ -43,11 +43,12 @@ function! ale_linters#sh#shellcheck#GetCommand(buffer) abort
let l:exclude_option = ale#Var(a:buffer, 'sh_shellcheck_exclusions')
let l:dialect = ale_linters#sh#shellcheck#GetDialectArgument(a:buffer)
return ale_linters#sh#shellcheck#GetExecutable(a:buffer)
return ale#path#BufferCdString(a:buffer)
\ . ale#Escape(ale_linters#sh#shellcheck#GetExecutable(a:buffer))
\ . (!empty(l:dialect) ? ' -s ' . l:dialect : '')
\ . (!empty(l:options) ? ' ' . l:options : '')
\ . (!empty(l:exclude_option) ? ' -e ' . l:exclude_option : '')
\ . ' -f gcc -'
\ . ' -x -f gcc -'
endfunction
call ale#linter#Define('sh', {

22
test/command_callback/test_shellcheck_command_callback.vader
View file

@ -9,6 +9,12 @@ Before:
runtime ale_linters/sh/shellcheck.vim
call ale#test#SetDirectory('/testplugin/test/command_callback')
call ale#test#SetFilename('test.sh')
let b:prefix = 'cd ' . ale#Escape(ale#path#Winify(g:dir)) . ' && '
let b:suffix = ' -x -f gcc -'
After:
Restore
@ -16,19 +22,22 @@ After:
unlet! b:ale_sh_shellcheck_executable
unlet! b:ale_sh_shellcheck_options
unlet! b:is_bash
unlet! b:prefix
call ale#test#RestoreDirectory()
call ale#linter#Reset()
Execute(The default shellcheck command should be correct):
AssertEqual
\ 'shellcheck -f gcc -',
\ b:prefix . ale#Escape('shellcheck') . b:suffix,
\ ale_linters#sh#shellcheck#GetCommand(bufnr(''))
Execute(The shellcheck command should accept options):
let b:ale_sh_shellcheck_options = '--foobar'
AssertEqual
\ 'shellcheck --foobar -f gcc -',
\ b:prefix . ale#Escape('shellcheck') . ' --foobar' . b:suffix,
\ ale_linters#sh#shellcheck#GetCommand(bufnr(''))
Execute(The shellcheck command should accept options and exclusions):
@ -36,14 +45,14 @@ Execute(The shellcheck command should accept options and exclusions):
let b:ale_sh_shellcheck_exclusions = 'foo,bar'
AssertEqual
\ 'shellcheck --foobar -e foo,bar -f gcc -',
\ b:prefix . ale#Escape('shellcheck') . ' --foobar -e foo,bar' . b:suffix,
\ ale_linters#sh#shellcheck#GetCommand(bufnr(''))
Execute(The shellcheck command should include the dialect):
let b:is_bash = 1
AssertEqual
\ 'shellcheck -s bash -f gcc -',
\ b:prefix . ale#Escape('shellcheck') . ' -s bash' . b:suffix,
\ ale_linters#sh#shellcheck#GetCommand(bufnr(''))
Execute(The shellcheck command should include the dialect before options and exclusions):
@ -52,5 +61,8 @@ Execute(The shellcheck command should include the dialect before options and exc
let b:ale_sh_shellcheck_exclusions = 'foo,bar'
AssertEqual
\ 'shellcheck -s bash --foobar -e foo,bar -f gcc -',
\ b:prefix
\ . ale#Escape('shellcheck')
\ . ' -s bash --foobar -e foo,bar'
\ . b:suffix,
\ ale_linters#sh#shellcheck#GetCommand(bufnr(''))