Merge pull request #2600 from hsanson/add-javalsp-lsp-options-2

Add support for javalsp configuration options.
This commit is contained in:
w0rp 2019-06-19 23:32:06 +01:00 committed by GitHub
commit d2c3141f26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 90 additions and 0 deletions

View File

@ -2,11 +2,24 @@
" Description: Support for the Java language server https://github.com/georgewfraser/vscode-javac
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)
@ -38,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')
\})

View File

@ -131,6 +131,33 @@ executable. For example:
let g:ale_java_javalsp_executable=/java-language-server/dist/mac/bin/launcher
<
g:ale_java_javalsp_config *g:ale_java_javalsp_config*
*b:ale_java_javalsp_config*
Type: |Dictionary|
Default: `{}`
The javalsp linter automatically detects external depenencies for Maven and
Gradle projects. In case the javalsp fails to detect some of them, you can
specify them setting a dictionary to |g:ale_java_javalsp_config| variable.
>
let g:ale_java_javalsp_executable =
\ {
\ 'java': {
\ 'externalDependencies': [
\ 'junit:junit:jar:4.12:test', " Maven format
\ 'junit:junit:4.1' " Gradle format
\ ],
\ 'classPath': [
\ 'lib/some-dependency.jar',
\ '/android-sdk/platforms/android-28.jar'
\ ]
\ }
\ }
The Java language server will look for the dependencies you specify in
`externalDependencies` array in your Maven and Gradle caches ~/.m2 and
~/.gradle.
===============================================================================
eclipselsp *ale-java-eclipselsp*

View File

@ -29,3 +29,52 @@ Execute(The javalsp callback should return backward compatible value):
\]
AssertLinter '/bin/java', join(cmd, ' ')
Execute(The javalsp should have default config):
AssertEqual
\ {
\ 'java': {
\ 'classPath': [],
\ 'externalDependencies': []
\ }
\ },
\ ale_linters#java#javalsp#Config(bufnr(''))
Execute(The javalsp should have default config if user sets empty hash):
let b:ale_java_javalsp_config = {}
AssertEqual
\ {
\ 'java': {
\ 'classPath': [],
\ 'externalDependencies': []
\ }
\ },
\ ale_linters#java#javalsp#Config(bufnr(''))
Execute(The javalsp should have add missing config):
let b:ale_java_javalsp_config = { 'java': { 'classPath': ['aaa.jar'] } }
AssertEqual
\ {
\ 'java': {
\ 'classPath': ['aaa.jar'],
\ 'externalDependencies': []
\ }
\ },
\ ale_linters#java#javalsp#Config(bufnr(''))
let b:ale_java_javalsp_config =
\ {
\ 'java': {
\ 'externalDependencies': ['unit-test:2.0.0']
\ }
\ }
AssertEqual
\ {
\ 'java': {
\ 'classPath': [],
\ 'externalDependencies': ['unit-test:2.0.0']
\ }
\ },
\ ale_linters#java#javalsp#Config(bufnr(''))