hasufell/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Escape executable

Browse Source
This commit is contained in:
Devon Meunier 2017-05-17 08:46:47 -04:00
parent 9ca51ed035
commit 3f926de76b
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ale_linters/ruby/rubocop.vim
View File

@ -25,14 +25,19 @@ function! ale_linters#ruby#rubocop#Handle(buffer, lines) abort
endfunction endfunction
function! ale_linters#ruby#rubocop#GetCommand(buffer) abort function! ale_linters#ruby#rubocop#GetCommand(buffer) abort
return ale#Var(a:buffer, 'ruby_rubocop_executable') let l:unescaped = ale#Var(a:buffer, 'ruby_rubocop_executable')
let l:executable = ale#Escape(l:unescaped)
if l:unescaped =~? 'bundle$'
let l:executable = l:executable . ' exec rubocop'
endif
return l:executable
\ . ' --format emacs --force-exclusion ' \ . ' --format emacs --force-exclusion '
\ . ale#Var(a:buffer, 'ruby_rubocop_options') \ . ale#Var(a:buffer, 'ruby_rubocop_options')
\ . ' --stdin ' . bufname(a:buffer) \ . ' --stdin ' . bufname(a:buffer)
endfunction endfunction
function! ale_linters#ruby#rubocop#GetExecutable(buffer) abort function! ale_linters#ruby#rubocop#GetExecutable(buffer) abort
let l:executable = split(ale#Var(a:buffer, 'ruby_rubocop_executable'))[0] let l:executable = ale#Var(a:buffer, 'ruby_rubocop_executable')
if executable(l:executable) if executable(l:executable)
return l:executable return l:executable
endif endif

20
test/command_callback/test_rubocop_command_callback.vader
View File

@ -3,27 +3,17 @@ Before:
Execute(Executable should default to rubocop): Execute(Executable should default to rubocop):
AssertEqual AssertEqual
\ 'rubocop --format emacs --force-exclusion --stdin ''dummy.py''', \ '''rubocop'' --format emacs --force-exclusion --stdin ''dummy.py''',
\ ale_linters#ruby#rubocop#GetCommand(bufnr('')) \ ale_linters#ruby#rubocop#GetCommand(bufnr(''))
Execute(Should be able to set a custom executable): Execute(Should be able to set a custom executable):
let g:ale_ruby_rubocop_executable = 'bin/rubocop' let g:ale_ruby_rubocop_executable = 'bin/rubocop'
AssertEqual AssertEqual
\ 'bin/rubocop --format emacs --force-exclusion --stdin ''dummy.py''', \ '''bin/rubocop'' --format emacs --force-exclusion --stdin ''dummy.py''',
\ ale_linters#ruby#rubocop#GetCommand(bufnr('')) \ ale_linters#ruby#rubocop#GetCommand(bufnr(''))
Execute(Custom executables should not be escaped): Execute(Setting bundle appends 'exec rubocop'):
let g:ale_ruby_rubocop_executable = 'bundle exec rubocop' let g:ale_ruby_rubocop_executable = 'path to/bundle'
AssertEqual AssertEqual
\ 'bundle exec rubocop --format emacs --force-exclusion --stdin ''dummy.py''', \ '''path to/bundle'' exec rubocop --format emacs --force-exclusion --stdin ''dummy.py''',
\ ale_linters#ruby#rubocop#GetCommand(bufnr('')) \ ale_linters#ruby#rubocop#GetCommand(bufnr(''))
Execute(Executable callback should return the first token of the executable):
let g:ale_ruby_rubocop_executable = 'bundle exec rubocop'
AssertEqual
\ 'bundle',
\ ale_linters#ruby#rubocop#GetExecutable(bufnr(''))
let g:ale_ruby_rubocop_executable = 'bin/rubocop'
AssertEqual
\ 'bin/rubocop',
\ ale_linters#ruby#rubocop#GetExecutable(bufnr(''))