Merge pull request #3077 from puritys/javaagent

To support javaagent on eclipselsp

3 files changed, 36 insertions, 1 deletions

diff --git a/ale_linters/java/eclipselsp.vim b/ale_linters/java/eclipselsp.vim
index 2648893b..2bfec043 100644
--- a/ale_linters/java/eclipselsp.vim
+++ b/ale_linters/java/eclipselsp.vim
@@ -7,6 +7,7 @@ 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')
+call ale#Set('java_eclipselsp_javaagent', '')
 
 function! ale_linters#java#eclipselsp#Executable(buffer) abort
     return ale#Var(a:buffer, 'java_eclipselsp_executable')
@@ -100,12 +101,30 @@ function! ale_linters#java#eclipselsp#WorkspacePath(buffer) abort
     return ale#path#Dirname(ale#java#FindProjectRoot(a:buffer))
 endfunction
 
+function! ale_linters#java#eclipselsp#Javaagent(buffer) abort
+    let l:rets = []
+    let l:raw = ale#Var(a:buffer, 'java_eclipselsp_javaagent')
+
+    if empty(l:raw)
+        return ''
+    endif
+
+    let l:jars = split(l:raw)
+
+    for l:jar in l:jars
+        call add(l:rets, ale#Escape('-javaagent:' . l:jar))
+    endfor
+
+    return join(l:rets, ' ')
+endfunction
+
 function! ale_linters#java#eclipselsp#Command(buffer, version) abort
     let l:path = ale#Var(a:buffer, 'java_eclipselsp_path')
 
     let l:executable = ale_linters#java#eclipselsp#Executable(a:buffer)
 
     let l:cmd = [ ale#Escape(l:executable),
+    \ ale_linters#java#eclipselsp#Javaagent(a:buffer),
     \ '-Declipse.application=org.eclipse.jdt.ls.core.id1',
     \ '-Dosgi.bundles.defaultStartLevel=4',
     \ '-Declipse.product=org.eclipse.jdt.ls.core.product',
diff --git a/doc/ale-java.txt b/doc/ale-java.txt
index 32f0e6eb..15e9e679 100644
--- a/doc/ale-java.txt
+++ b/doc/ale-java.txt
@@ -222,6 +222,17 @@ g:ale_java_eclipselsp_workspace_path     *g:ale_java_eclipselsp_workspace_path*
   absolute path of the Eclipse workspace. If not set this value will be set to
   the parent folder of the project root.
 
+g:ale_java_eclipselsp_javaagent               *g:ale_java_eclipselsp_javaagent*
+                                              *b:ale_java_eclipselsp_javaagent*
+
+  Type: |String|
+  Default: `''`
+
+  A variable to add java agent for annotation processing such as Lombok.
+  If you have multiple java agent files, use space to separate them. For example:
+>
+  let g:ale_java_eclipselsp_javaagent='/eclipse/lombok.jar /eclipse/jacoco.jar'
+<
 
 ===============================================================================
 uncrustify                                                *ale-java-uncrustify*
diff --git a/test/command_callback/test_eclipselsp_command_callback.vader b/test/command_callback/test_eclipselsp_command_callback.vader
index f25ed5fc..6bbc4053 100644
--- a/test/command_callback/test_eclipselsp_command_callback.vader
+++ b/test/command_callback/test_eclipselsp_command_callback.vader
@@ -54,6 +54,7 @@ Execute(VersionCheck should return correct version):
 
 Execute(The eclipselsp callback should return the correct default value):
   let cmd = [ ale#Escape('java'),
+    \ '',
     \ '-Declipse.application=org.eclipse.jdt.ls.core.id1',
     \ '-Dosgi.bundles.defaultStartLevel=4',
     \ '-Declipse.product=org.eclipse.jdt.ls.core.product',
@@ -72,6 +73,7 @@ Execute(The eclipselsp callback should return the correct default value):
 Execute(The eclipselsp callback should allow custom executable):
   let b:ale_java_eclipselsp_executable='/bin/foobar'
   let cmd = [ ale#Escape('/bin/foobar'),
+    \ '',
     \ '-Declipse.application=org.eclipse.jdt.ls.core.id1',
     \ '-Dosgi.bundles.defaultStartLevel=4',
     \ '-Declipse.product=org.eclipse.jdt.ls.core.product',
@@ -87,9 +89,12 @@ Execute(The eclipselsp callback should allow custom executable):
     \]
   AssertLinter '/bin/foobar', join(cmd, ' ')
 
-Execute(The eclipselsp callback should allow custom configuration path):
+Execute(The eclipselsp callback should allow custom configuration path and javaagent):
   let b:ale_java_eclipselsp_config_path = '/home/config'
+  let b:ale_java_eclipselsp_javaagent = '/home/lombok.jar /home/lombok2.jar'
   let cmd = [ ale#Escape('java'),
+    \ ale#Escape('-javaagent:/home/lombok.jar'),
+    \ ale#Escape('-javaagent:/home/lombok2.jar'),
     \ '-Declipse.application=org.eclipse.jdt.ls.core.id1',
     \ '-Dosgi.bundles.defaultStartLevel=4',
     \ '-Declipse.product=org.eclipse.jdt.ls.core.product',