Updated plugins

sources_non_forked/ale/ale_linters/java/checkstyle.vim

@@ -1,6 +1,10 @@
 " Author: Devon Meunier <devon.meunier@gmail.com>
 " Description: checkstyle for Java files
 
+call ale#Set('java_checkstyle_executable', 'checkstyle')
+call ale#Set('java_checkstyle_config', '/google_checks.xml')
+call ale#Set('java_checkstyle_options', '')
+
 function! ale_linters#java#checkstyle#Handle(buffer, lines) abort
     let l:output = []
 
@@ -17,6 +21,10 @@ function! ale_linters#java#checkstyle#Handle(buffer, lines) abort
         \})
     endfor
 
+    if !empty(l:output)
+        return l:output
+    endif
+
     " old checkstyle versions
     let l:pattern = '\v(.+):(\d+): ([^:]+): (.+)$'
 
@@ -31,19 +39,32 @@ function! ale_linters#java#checkstyle#Handle(buffer, lines) abort
     return l:output
 endfunction
 
+function! s:GetConfig(buffer, config) abort
+    if ale#path#IsAbsolute(a:config)
+        return a:config
+    endif
+
+    let s:file = ale#path#FindNearestFile(a:buffer, a:config)
+
+    return !empty(s:file) ? s:file : a:config
+endfunction
+
 function! ale_linters#java#checkstyle#GetCommand(buffer) abort
-    return 'checkstyle '
-    \ . 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 = l:options !~# '\v(^| )-c' && !empty(l:config_option)
+    \   ? s:GetConfig(a:buffer, l:config_option)
+    \   : ''
+
+    return '%e'
+    \ . ale#Pad(l:options)
+    \ . (!empty(l:config) ? ' -c ' . ale#Escape(l:config) : '')
     \ . ' %s'
 endfunction
 
-if !exists('g:ale_java_checkstyle_options')
-    let g:ale_java_checkstyle_options = '-c /google_checks.xml'
-endif
-
 call ale#linter#Define('java', {
 \   'name': 'checkstyle',
-\   'executable': 'checkstyle',
+\   'executable': {b -> ale#Var(b, 'java_checkstyle_executable')},
 \   'command': function('ale_linters#java#checkstyle#GetCommand'),
 \   'callback': 'ale_linters#java#checkstyle#Handle',
 \   'lint_file': 1,

sources_non_forked/ale/ale_linters/java/eclipselsp.vim

@@ -4,6 +4,8 @@
 let s:version_cache = {}
 
 call ale#Set('java_eclipselsp_path', ale#path#Simplify($HOME . '/eclipse.jdt.ls'))
+call ale#Set('java_eclipselsp_config_path', '')
+call ale#Set('java_eclipselsp_workspace_path', '')
 call ale#Set('java_eclipselsp_executable', 'java')
 
 function! ale_linters#java#eclipselsp#Executable(buffer) abort
@@ -32,11 +34,23 @@ function! ale_linters#java#eclipselsp#JarPath(buffer) abort
         return l:files[0]
     endif
 
+    " Search jar file within system package path
+    let l:files = globpath('/usr/share/java/jdtls/plugins', 'org.eclipse.equinox.launcher_\d\.\d\.\d\d\d\.*\.jar', 1, 1)
+
+    if len(l:files) == 1
+        return l:files[0]
+    endif
+
     return ''
 endfunction
 
 function! ale_linters#java#eclipselsp#ConfigurationPath(buffer) abort
     let l:path = fnamemodify(ale_linters#java#eclipselsp#JarPath(a:buffer), ':p:h:h')
+    let l:config_path = ale#Var(a:buffer, 'java_eclipselsp_config_path')
+
+    if !empty(l:config_path)
+        return ale#path#Simplify(l:config_path)
+    endif
 
     if has('win32')
         let l:path = l:path . '/config_win'
@@ -76,6 +90,16 @@ function! ale_linters#java#eclipselsp#CommandWithVersion(buffer, version_lines,
     return ale_linters#java#eclipselsp#Command(a:buffer, l:version)
 endfunction
 
+function! ale_linters#java#eclipselsp#WorkspacePath(buffer) abort
+    let l:wspath = ale#Var(a:buffer, 'java_eclipselsp_workspace_path')
+
+    if !empty(l:wspath)
+        return l:wspath
+    endif
+
+    return ale#path#Dirname(ale#java#FindProjectRoot(a:buffer))
+endfunction
+
 function! ale_linters#java#eclipselsp#Command(buffer, version) abort
     let l:path = ale#Var(a:buffer, 'java_eclipselsp_path')
 
@@ -89,11 +113,11 @@ function! ale_linters#java#eclipselsp#Command(buffer, version) abort
     \ '-noverify',
     \ '-Xmx1G',
     \ '-jar',
-    \ ale_linters#java#eclipselsp#JarPath(a:buffer),
+    \ ale#Escape(ale_linters#java#eclipselsp#JarPath(a:buffer)),
     \ '-configuration',
-    \ ale_linters#java#eclipselsp#ConfigurationPath(a:buffer),
+    \ ale#Escape(ale_linters#java#eclipselsp#ConfigurationPath(a:buffer)),
     \ '-data',
-    \ ale#java#FindProjectRoot(a:buffer)
+    \ ale#Escape(ale_linters#java#eclipselsp#WorkspacePath(a:buffer))
     \ ]
 
     if ale#semver#GTE(a:version, [1, 9])

sources_non_forked/ale/ale_linters/java/javac.vim

@@ -21,6 +21,11 @@ function! ale_linters#java#javac#RunWithImportPaths(buffer) abort
         let l:command = ale#gradle#BuildClasspathCommand(a:buffer)
     endif
 
+    " Try to use Ant if Gradle and Maven aren't available
+    if empty(l:command)
+        let l:command = ale#ant#BuildClasspathCommand(a:buffer)
+    endif
+
     if empty(l:command)
         return ale_linters#java#javac#GetCommand(a:buffer, [], {})
     endif

sources_non_forked/ale/ale_linters/java/javalsp.vim

@@ -1,16 +1,47 @@
 " Author: Horacio Sanson <https://github.com/hsanson>
 " Description: Support for the Java language server https://github.com/georgewfraser/vscode-javac
 
-call ale#Set('java_javalsp_executable', 'java')
+call ale#Set('java_javalsp_executable', '')
+call ale#Set('java_javalsp_config', {})
 
 function! ale_linters#java#javalsp#Executable(buffer) abort
     return ale#Var(a:buffer, 'java_javalsp_executable')
 endfunction
 
+function! ale_linters#java#javalsp#Config(buffer) abort
+    let l:defaults = { 'java': { 'classPath': [], 'externalDependencies': [] } }
+    let l:config = ale#Var(a:buffer, 'java_javalsp_config')
+
+    " Ensure the config dictionary contains both classPath and
+    " externalDependencies keys to avoid a NPE crash on Java Language Server.
+    call extend(l:config, l:defaults, 'keep')
+    call extend(l:config['java'], l:defaults['java'], 'keep')
+
+    return l:config
+endfunction
+
 function! ale_linters#java#javalsp#Command(buffer) abort
     let l:executable = ale_linters#java#javalsp#Executable(a:buffer)
 
-    return ale#Escape(l:executable) . ' -Xverify:none -m javacs/org.javacs.Main'
+    if fnamemodify(l:executable, ':t') is# 'java'
+        " For backward compatibility.
+        let l:cmd = [
+        \ ale#Escape(l:executable),
+        \ '--add-exports jdk.compiler/com.sun.tools.javac.api=javacs',
+        \ '--add-exports jdk.compiler/com.sun.tools.javac.code=javacs',
+        \ '--add-exports jdk.compiler/com.sun.tools.javac.comp=javacs',
+        \ '--add-exports jdk.compiler/com.sun.tools.javac.main=javacs',
+        \ '--add-exports jdk.compiler/com.sun.tools.javac.tree=javacs',
+        \ '--add-exports jdk.compiler/com.sun.tools.javac.model=javacs',
+        \ '--add-exports jdk.compiler/com.sun.tools.javac.util=javacs',
+        \ '--add-opens jdk.compiler/com.sun.tools.javac.api=javacs',
+        \ '-m javacs/org.javacs.Main',
+        \]
+
+        return join(l:cmd, ' ')
+    else
+        return ale#Escape(l:executable)
+    endif
 endfunction
 
 call ale#linter#Define('java', {
@@ -20,4 +51,5 @@ call ale#linter#Define('java', {
 \   'command': function('ale_linters#java#javalsp#Command'),
 \   'language': 'java',
 \   'project_root': function('ale#java#FindProjectRoot'),
+\   'lsp_config': function('ale_linters#java#javalsp#Config')
 \})