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

Merge pull request #949 from TheLocehiliosan/shellcheck-option-order

Browse source 
Move dialect setting before user options (shellcheck)
This commit is contained in:
w0rp 2017-09-23 12:01:33 +01:00 committed by GitHub
commit 2bd352370f
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ale_linters/sh/shellcheck.vim
View file

@ -44,9 +44,9 @@ function! ale_linters#sh#shellcheck#GetCommand(buffer) abort
let l:dialect = ale_linters#sh#shellcheck#GetDialectArgument(a:buffer)
return 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 : '')
\ . (!empty(l:dialect) ? ' -s ' . l:dialect : '')
\ . ' -f gcc -'
endfunction

9
test/command_callback/test_shellcheck_command_callback.vader
View file

@ -45,3 +45,12 @@ Execute(The shellcheck command should include the dialect):
AssertEqual
\ 'shellcheck -s bash -f gcc -',
\ ale_linters#sh#shellcheck#GetCommand(bufnr(''))
Execute(The shellcheck command should include the dialect before options and exclusions):
let b:is_bash = 1
let b:ale_sh_shellcheck_options = '--foobar'
let b:ale_sh_shellcheck_exclusions = 'foo,bar'
AssertEqual
\ 'shellcheck -s bash --foobar -e foo,bar -f gcc -',
\ ale_linters#sh#shellcheck#GetCommand(bufnr(''))