From c9c89a1853c01f3451edd7105814d123023ddbd8 Mon Sep 17 00:00:00 2001 From: Yuto Ito Date: Thu, 23 Sep 2021 18:46:16 +0900 Subject: [PATCH] Fix: Failed to execute rubocop fixer on other machine (#3916) --- autoload/ale/fixers/rubocop.vim | 2 -- test/fixers/test_rubocop_fixer_callback.vader | 14 -------------- 2 files changed, 16 deletions(-) diff --git a/autoload/ale/fixers/rubocop.vim b/autoload/ale/fixers/rubocop.vim index cdfb014a..5a1b7959 100644 --- a/autoload/ale/fixers/rubocop.vim +++ b/autoload/ale/fixers/rubocop.vim @@ -21,12 +21,10 @@ endfunction function! ale#fixers#rubocop#GetCommand(buffer) abort let l:executable = ale#Var(a:buffer, 'ruby_rubocop_executable') - let l:config = ale#path#FindNearestFile(a:buffer, '.rubocop.yml') let l:options = ale#Var(a:buffer, 'ruby_rubocop_options') let l:auto_correct_all = ale#Var(a:buffer, 'ruby_rubocop_auto_correct_all') return ale#ruby#EscapeExecutable(l:executable, 'rubocop') - \ . (!empty(l:config) ? ' --config ' . ale#Escape(l:config) : '') \ . (!empty(l:options) ? ' ' . l:options : '') \ . (l:auto_correct_all ? ' --auto-correct-all' : ' --auto-correct') \ . ' --force-exclusion --stdin %s' diff --git a/test/fixers/test_rubocop_fixer_callback.vader b/test/fixers/test_rubocop_fixer_callback.vader index 5b5375ae..f7b0eb60 100644 --- a/test/fixers/test_rubocop_fixer_callback.vader +++ b/test/fixers/test_rubocop_fixer_callback.vader @@ -24,18 +24,6 @@ Execute(The rubocop callback should return the correct default values): \ }, \ ale#fixers#rubocop#Fix(bufnr('')) -Execute(The rubocop callback should include configuration files): - call ale#test#SetFilename('../test-files/ruby/with_config/dummy.rb') - - AssertEqual - \ { - \ 'process_with': 'ale#fixers#rubocop#PostProcess', - \ 'command': ale#Escape(g:ale_ruby_rubocop_executable) - \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ruby/with_config/.rubocop.yml')) - \ . ' --auto-correct --force-exclusion --stdin %s', - \ }, - \ ale#fixers#rubocop#Fix(bufnr('')) - Execute(The rubocop callback should include custom rubocop options): let g:ale_ruby_rubocop_options = '--except Lint/Debugger' call ale#test#SetFilename('../test-files/ruby/with_config/dummy.rb') @@ -44,7 +32,6 @@ Execute(The rubocop callback should include custom rubocop options): \ { \ 'process_with': 'ale#fixers#rubocop#PostProcess', \ 'command': ale#Escape(g:ale_ruby_rubocop_executable) - \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ruby/with_config/.rubocop.yml')) \ . ' --except Lint/Debugger' \ . ' --auto-correct --force-exclusion --stdin %s', \ }, @@ -58,7 +45,6 @@ Execute(The rubocop callback should use auto-correct-all option when set): \ { \ 'process_with': 'ale#fixers#rubocop#PostProcess', \ 'command': ale#Escape(g:ale_ruby_rubocop_executable) - \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ruby/with_config/.rubocop.yml')) \ . ' --auto-correct-all --force-exclusion --stdin %s' \ }, \ ale#fixers#rubocop#Fix(bufnr(''))