diff options
| author | w0rp <devw0rp@gmail.com> | 2018-04-08 20:35:06 +0100 |
|---|---|---|
| committer | w0rp <devw0rp@gmail.com> | 2018-04-08 20:35:06 +0100 |
| commit | 2f2dcb84444f440ceb4b35010b861738216525f6 (patch) | |
| tree | 84846332d36a0fac6beb3ede5117933d3ce954c6 /ale_linters | |
| parent | 7cf3ddf6c4354db406a19104f352565d42a827d2 (diff) | |
| download | ale-2f2dcb84444f440ceb4b35010b861738216525f6.zip | |
Close #1476 - Make the javac executable configurable
Diffstat (limited to 'ale_linters')
| -rw-r--r-- | ale_linters/java/javac.vim | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ale_linters/java/javac.vim b/ale_linters/java/javac.vim index 73e84147..b1f74a6d 100644 --- a/ale_linters/java/javac.vim +++ b/ale_linters/java/javac.vim @@ -3,8 +3,9 @@ let s:classpath_sep = has('unix') ? ':' : ';' -let g:ale_java_javac_options = get(g:, 'ale_java_javac_options', '') -let g:ale_java_javac_classpath = get(g:, 'ale_java_javac_classpath', '') +call ale#Set('java_javac_executable', 'javac') +call ale#Set('java_javac_options', '') +call ale#Set('java_javac_classpath', '') function! ale_linters#java#javac#GetImportPaths(buffer) abort let l:pom_path = ale#path#FindNearestFile(a:buffer, 'pom.xml') @@ -35,6 +36,10 @@ function! s:BuildClassPathOption(buffer, import_paths) abort \ : '' endfunction +function! ale_linters#java#javac#GetExecutable(buffer) abort + return ale#Var(a:buffer, 'java_javac_executable') +endfunction + function! ale_linters#java#javac#GetCommand(buffer, import_paths) abort let l:cp_option = s:BuildClassPathOption(a:buffer, a:import_paths) let l:sp_option = '' @@ -72,11 +77,13 @@ function! ale_linters#java#javac#GetCommand(buffer, import_paths) abort " Create .class files in a temporary directory, which we will delete later. let l:class_file_directory = ale#engine#CreateDirectory(a:buffer) + let l:executable = ale_linters#java#javac#GetExecutable(a:buffer) " Always run javac from the directory the file is in, so we can resolve " relative paths correctly. return ale#path#BufferCdString(a:buffer) - \ . 'javac -Xlint' + \ . ale#Escape(l:executable) + \ . ' -Xlint' \ . ' ' . l:cp_option \ . ' ' . l:sp_option \ . ' -d ' . ale#Escape(l:class_file_directory) @@ -119,7 +126,7 @@ endfunction call ale#linter#Define('java', { \ 'name': 'javac', -\ 'executable': 'javac', +\ 'executable_callback': 'ale_linters#java#javac#GetExecutable', \ 'command_chain': [ \ {'callback': 'ale_linters#java#javac#GetImportPaths', 'output_stream': 'stdout'}, \ {'callback': 'ale_linters#java#javac#GetCommand', 'output_stream': 'stderr'}, |