marc/ale
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix 2913 - checkstyle config file ignored.

Browse source 
If checkstyle is configured with custom options that contain "-c" then
the checkstyle config file option is ignored. This PR modifies the
regular expression when creating the checkstyle command to avoid this.
This commit is contained in:
Horacio Sanson 2019-11-27 23:19:44 +09:00
parent d8195e9276
commit 8fbcba0091
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ale_linters/java/checkstyle.vim
View file

@ -52,7 +52,7 @@ endfunction
function! ale_linters#java#checkstyle#GetCommand(buffer) abort function! ale_linters#java#checkstyle#GetCommand(buffer) abort
let l:options = ale#Var(a:buffer, 'java_checkstyle_options') let l:options = ale#Var(a:buffer, 'java_checkstyle_options')
let l:config_option = ale#Var(a:buffer, 'java_checkstyle_config') let l:config_option = ale#Var(a:buffer, 'java_checkstyle_config')
let l:config = l:options !~# '\v(^| )-c' && !empty(l:config_option) let l:config = l:options !~# '\v(^| )-c ' && !empty(l:config_option)
\ ? s:GetConfig(a:buffer, l:config_option) \ ? s:GetConfig(a:buffer, l:config_option)
\ : '' \ : ''

4
test/command_callback/test_checkstyle_command_callback.vader
View file

@ -20,11 +20,11 @@ Execute(The checkstyle executable should be configurable):
\ . ' %s' \ . ' %s'
Execute(Custom options should be supported): Execute(Custom options should be supported):
let b:ale_java_checkstyle_options = '--foobar' let b:ale_java_checkstyle_options = '--foobar -cp -classpath /path/to/checkstyle-8.7-all.jar'
AssertLinter 'checkstyle', AssertLinter 'checkstyle',
\ ale#Escape('checkstyle') \ ale#Escape('checkstyle')
\ . ' --foobar' \ . ' --foobar -cp -classpath /path/to/checkstyle-8.7-all.jar'
\ . ' -c ' . ale#Escape('/google_checks.xml') \ . ' -c ' . ale#Escape('/google_checks.xml')
\ . ' %s' \ . ' %s'