diff options
| author | w0rp <w0rp@users.noreply.github.com> | 2020-07-21 12:49:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 12:49:55 +0100 |
| commit | 68b484a49fe2f5cc29ebccca0a3da48b31073ada (patch) | |
| tree | e07b01201bd5b0cd0f457638d12b22a040edd6d9 | |
| parent | f31182beeef8b8ba897c22fb62cfb86c0f1a9659 (diff) | |
| parent | 8fbcba0091161fb537adf1dfc87555fd79e52eaf (diff) | |
| download | ale-68b484a49fe2f5cc29ebccca0a3da48b31073ada.zip | |
Merge pull request #2914 from hsanson/2913-fix-checkstyle-config-with-options
Fix 2913 - checkstyle config file ignored.
| -rw-r--r-- | ale_linters/java/checkstyle.vim | 2 | ||||
| -rw-r--r-- | test/command_callback/test_checkstyle_command_callback.vader | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ale_linters/java/checkstyle.vim b/ale_linters/java/checkstyle.vim index 7901ff7e..ec7339d1 100644 --- a/ale_linters/java/checkstyle.vim +++ b/ale_linters/java/checkstyle.vim @@ -52,7 +52,7 @@ endfunction function! ale_linters#java#checkstyle#GetCommand(buffer) abort let l:options = ale#Var(a:buffer, 'java_checkstyle_options') 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) \ : '' diff --git a/test/command_callback/test_checkstyle_command_callback.vader b/test/command_callback/test_checkstyle_command_callback.vader index 7a9f26b3..5824df87 100644 --- a/test/command_callback/test_checkstyle_command_callback.vader +++ b/test/command_callback/test_checkstyle_command_callback.vader @@ -20,11 +20,11 @@ Execute(The checkstyle executable should be configurable): \ . ' %s' 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', \ ale#Escape('checkstyle') - \ . ' --foobar' + \ . ' --foobar -cp -classpath /path/to/checkstyle-8.7-all.jar' \ . ' -c ' . ale#Escape('/google_checks.xml') \ . ' %s' |