#732 - Use the configuration files when fixing files with rubocop
This commit is contained in:
parent
b43413916d
commit
854066e849
@ -3,8 +3,10 @@ function! ale#fixers#rubocop#GetCommand(buffer) abort
|
|||||||
let l:exec_args = l:executable =~? 'bundle$'
|
let l:exec_args = l:executable =~? 'bundle$'
|
||||||
\ ? ' exec rubocop'
|
\ ? ' exec rubocop'
|
||||||
\ : ''
|
\ : ''
|
||||||
|
let l:config = ale#path#FindNearestFile(a:buffer, '.rubocop.yml')
|
||||||
|
|
||||||
return ale#Escape(l:executable) . l:exec_args
|
return ale#Escape(l:executable) . l:exec_args
|
||||||
|
\ . (!empty(l:config) ? ' --config ' . ale#Escape(l:config) : '')
|
||||||
\ . ' --auto-correct %t'
|
\ . ' --auto-correct %t'
|
||||||
|
|
||||||
endfunction
|
endfunction
|
||||||
|
@ -19,10 +19,24 @@ After:
|
|||||||
unlet! g:dir
|
unlet! g:dir
|
||||||
|
|
||||||
Execute(The rubocop callback should return the correct default values):
|
Execute(The rubocop callback should return the correct default values):
|
||||||
silent execute 'file ' . fnameescape(g:dir . '/ruby_paths/dummy.rb')
|
call ale#test#SetFilename('ruby_paths/dummy.rb')
|
||||||
|
|
||||||
AssertEqual
|
AssertEqual
|
||||||
\ {'read_temporary_file': 1,
|
\ {
|
||||||
\ 'command': "'" . g:ale_ruby_rubocop_executable . "' "
|
\ 'read_temporary_file': 1,
|
||||||
\ . '--auto-correct %t' },
|
\ 'command': ale#Escape(g:ale_ruby_rubocop_executable)
|
||||||
|
\ . ' --auto-correct %t',
|
||||||
|
\ },
|
||||||
|
\ ale#fixers#rubocop#Fix(bufnr(''))
|
||||||
|
|
||||||
|
Execute(The rubocop callback should include configuration files):
|
||||||
|
call ale#test#SetFilename('ruby_paths/with_config/dummy.rb')
|
||||||
|
|
||||||
|
AssertEqual
|
||||||
|
\ {
|
||||||
|
\ 'read_temporary_file': 1,
|
||||||
|
\ 'command': ale#Escape(g:ale_ruby_rubocop_executable)
|
||||||
|
\ . ' --config ' . ale#Escape(g:dir . '/ruby_paths/with_config/.rubocop.yml')
|
||||||
|
\ . ' --auto-correct %t',
|
||||||
|
\ },
|
||||||
\ ale#fixers#rubocop#Fix(bufnr(''))
|
\ ale#fixers#rubocop#Fix(bufnr(''))
|
||||||
|
Loading…
Reference in New Issue
Block a user