diff options
| author | w0rp <devw0rp@gmail.com> | 2017-07-06 22:47:07 +0100 |
|---|---|---|
| committer | w0rp <devw0rp@gmail.com> | 2017-07-06 23:08:24 +0100 |
| commit | acda19776ab18a16b4417c53743dbd392c715083 (patch) | |
| tree | cba8c6f03dbac7aed21ba007ea7545bea2466a04 | |
| parent | e9a1cd600a6afbd6ff182dfb6bab910371318a83 (diff) | |
| download | ale-acda19776ab18a16b4417c53743dbd392c715083.zip | |
Initialize rubocop variables in one place
| -rw-r--r-- | ale_linters/ruby/rubocop.vim | 18 | ||||
| -rw-r--r-- | autoload/ale/fixers/rubocop.vim | 16 | ||||
| -rw-r--r-- | autoload/ale/handlers/rubocop.vim | 6 |
3 files changed, 9 insertions, 31 deletions
diff --git a/ale_linters/ruby/rubocop.vim b/ale_linters/ruby/rubocop.vim index f8b07250..9b77f896 100644 --- a/ale_linters/ruby/rubocop.vim +++ b/ale_linters/ruby/rubocop.vim @@ -1,22 +1,8 @@ " Author: ynonp - https://github.com/ynonp " Description: rubocop for Ruby files -" Set this option to change Rubocop options. -if !exists('g:ale_ruby_rubocop_options') - " let g:ale_ruby_rubocop_options = '--lint' - let g:ale_ruby_rubocop_options = '' -endif - -if !exists('g:ale_ruby_rubocop_executable') - let g:ale_ruby_rubocop_executable = 'rubocop' -endif - -function! ale_linters#ruby#rubocop#GetExecutable(buffer) abort - return ale#Var(a:buffer, 'ruby_rubocop_executable') -endfunction - function! ale_linters#ruby#rubocop#GetCommand(buffer) abort - let l:executable = ale#Var(a:buffer, 'ruby_rubocop_executable') + let l:executable = ale#handlers#rubocop#GetExecutable(a:buffer) let l:exec_args = l:executable =~? 'bundle$' \ ? ' exec rubocop' \ : '' @@ -52,7 +38,7 @@ endfunction call ale#linter#Define('ruby', { \ 'name': 'rubocop', -\ 'executable_callback': 'ale_linters#ruby#rubocop#GetExecutable', +\ 'executable_callback': 'ale#handlers#rubocop#GetExecutable', \ 'command_callback': 'ale_linters#ruby#rubocop#GetCommand', \ 'callback': 'ale_linters#ruby#rubocop#Handle', \}) diff --git a/autoload/ale/fixers/rubocop.vim b/autoload/ale/fixers/rubocop.vim index 7bc6c9e6..3f92055f 100644 --- a/autoload/ale/fixers/rubocop.vim +++ b/autoload/ale/fixers/rubocop.vim @@ -1,19 +1,5 @@ -" Set this option to change Rubocop options. -if !exists('g:ale_ruby_rubocop_options') - " let g:ale_ruby_rubocop_options = '--lint' - let g:ale_ruby_rubocop_options = '' -endif - -if !exists('g:ale_ruby_rubocop_executable') - let g:ale_ruby_rubocop_executable = 'rubocop' -endif - -function! ale#fixers#rubocop#GetExecutable(buffer) abort - return ale#Var(a:buffer, 'ruby_rubocop_executable') -endfunction - function! ale#fixers#rubocop#GetCommand(buffer) abort - let l:executable = ale#Var(a:buffer, 'ruby_rubocop_executable') + let l:executable = ale#handlers#rubocop#GetExecutable(a:buffer) let l:exec_args = l:executable =~? 'bundle$' \ ? ' exec rubocop' \ : '' diff --git a/autoload/ale/handlers/rubocop.vim b/autoload/ale/handlers/rubocop.vim new file mode 100644 index 00000000..f6367cf5 --- /dev/null +++ b/autoload/ale/handlers/rubocop.vim @@ -0,0 +1,6 @@ +call ale#Set('ruby_rubocop_options', '') +call ale#Set('ruby_rubocop_executable', 'rubocop') + +function! ale#handlers#rubocop#GetExecutable(buffer) abort + return ale#Var(a:buffer, 'ruby_rubocop_executable') +endfunction |