mirror of
https://github.com/dense-analysis/ale
synced 2025-02-16 12:16:56 +00:00
Allow shfmt
fixer to use .editorconfig
(#4244)
* fix: added support for local solhint executable * feat: added support for matching parse errors * test: added test for solhint command callback and handler * chore: removed command callback test * refactor: made solhint handler structure closer to eslint * refactor(shfmt-fixer): remove derivation of default CLI arguments
This commit is contained in:
parent
16cca1413f
commit
d6f3d4976d
@ -5,27 +5,13 @@ scriptencoding utf-8
|
|||||||
call ale#Set('sh_shfmt_executable', 'shfmt')
|
call ale#Set('sh_shfmt_executable', 'shfmt')
|
||||||
call ale#Set('sh_shfmt_options', '')
|
call ale#Set('sh_shfmt_options', '')
|
||||||
|
|
||||||
function! s:DefaultOption(buffer) abort
|
|
||||||
if getbufvar(a:buffer, '&expandtab') == 0
|
|
||||||
" Tab is used by default
|
|
||||||
return ''
|
|
||||||
endif
|
|
||||||
|
|
||||||
let l:tabsize = getbufvar(a:buffer, '&shiftwidth')
|
|
||||||
|
|
||||||
if l:tabsize == 0
|
|
||||||
let l:tabsize = getbufvar(a:buffer, '&tabstop')
|
|
||||||
endif
|
|
||||||
|
|
||||||
return ' -i ' . l:tabsize
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! ale#fixers#shfmt#Fix(buffer) abort
|
function! ale#fixers#shfmt#Fix(buffer) abort
|
||||||
let l:executable = ale#Var(a:buffer, 'sh_shfmt_executable')
|
let l:executable = ale#Var(a:buffer, 'sh_shfmt_executable')
|
||||||
let l:options = ale#Var(a:buffer, 'sh_shfmt_options')
|
let l:options = ale#Var(a:buffer, 'sh_shfmt_options')
|
||||||
|
|
||||||
return {
|
return {
|
||||||
\ 'command': ale#Escape(l:executable)
|
\ 'command': ale#Escape(l:executable)
|
||||||
\ . (empty(l:options) ? s:DefaultOption(a:buffer) : ' ' . l:options)
|
\ . ' -filename=%s'
|
||||||
|
\ . (empty(l:options) ? '' : ' ' . l:options)
|
||||||
\}
|
\}
|
||||||
endfunction
|
endfunction
|
||||||
|
@ -14,39 +14,6 @@ Execute(The shfmt callback should return 'shfmt' as default command):
|
|||||||
\ ale#fixers#shfmt#Fix(bufnr('')).command =~# '^' . ale#Escape('shfmt'),
|
\ ale#fixers#shfmt#Fix(bufnr('')).command =~# '^' . ale#Escape('shfmt'),
|
||||||
\ "Default command name is expected to be 'shfmt'"
|
\ "Default command name is expected to be 'shfmt'"
|
||||||
|
|
||||||
Execute(The shfmt callback should return the command with no option as default when noexpandtab is set):
|
|
||||||
let g:ale_sh_shfmt_executable = 'shfmt'
|
|
||||||
let g:ale_sh_shfmt_options = ''
|
|
||||||
setlocal noexpandtab
|
|
||||||
AssertEqual
|
|
||||||
\ {
|
|
||||||
\ 'command': ale#Escape('shfmt'),
|
|
||||||
\ },
|
|
||||||
\ ale#fixers#shfmt#Fix(bufnr(''))
|
|
||||||
|
|
||||||
Execute(The shfmt callback should return the command specifying indent width by looking shiftwidth as default):
|
|
||||||
let g:ale_sh_shfmt_executable = 'shfmt'
|
|
||||||
let g:ale_sh_shfmt_options = ''
|
|
||||||
setlocal expandtab
|
|
||||||
setlocal shiftwidth=4
|
|
||||||
AssertEqual
|
|
||||||
\ {
|
|
||||||
\ 'command': ale#Escape('shfmt') . ' -i 4',
|
|
||||||
\ },
|
|
||||||
\ ale#fixers#shfmt#Fix(bufnr(''))
|
|
||||||
|
|
||||||
Execute(The shfmt callback should return the command specifying indent width by looking tabstop when shiftwidth is 0 as default):
|
|
||||||
let g:ale_sh_shfmt_executable = 'shfmt'
|
|
||||||
let g:ale_sh_shfmt_options = ''
|
|
||||||
setlocal expandtab
|
|
||||||
setlocal shiftwidth=0
|
|
||||||
setlocal tabstop=8
|
|
||||||
AssertEqual
|
|
||||||
\ {
|
|
||||||
\ 'command': ale#Escape('shfmt') . ' -i 8',
|
|
||||||
\ },
|
|
||||||
\ ale#fixers#shfmt#Fix(bufnr(''))
|
|
||||||
|
|
||||||
Execute(The shfmt executable and options should be configurable):
|
Execute(The shfmt executable and options should be configurable):
|
||||||
let g:ale_sh_shfmt_executable = 'foobar'
|
let g:ale_sh_shfmt_executable = 'foobar'
|
||||||
let g:ale_sh_shfmt_options = '--some-option'
|
let g:ale_sh_shfmt_options = '--some-option'
|
||||||
@ -54,6 +21,7 @@ Execute(The shfmt executable and options should be configurable):
|
|||||||
AssertEqual
|
AssertEqual
|
||||||
\ {
|
\ {
|
||||||
\ 'command': ale#Escape('foobar')
|
\ 'command': ale#Escape('foobar')
|
||||||
|
\ . ' -filename=%s'
|
||||||
\ . ' --some-option',
|
\ . ' --some-option',
|
||||||
\ },
|
\ },
|
||||||
\ ale#fixers#shfmt#Fix(bufnr(''))
|
\ ale#fixers#shfmt#Fix(bufnr(''))
|
||||||
|
Loading…
Reference in New Issue
Block a user