summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Linsay <blinsay@gmail.com>2020-11-18 20:39:07 -0500
committerBen Linsay <blinsay@gmail.com>2020-11-18 22:22:16 -0500
commitddfc43e774fd38e4051ba9fd3619ca9f0da6639f (patch)
tree0e548cb19ddcd62cea2772a9ee229c6e4507c742
parent48fe0dd4f629bb1282277ba8a6757a84c13a4dda (diff)
downloadale-ddfc43e774fd38e4051ba9fd3619ca9f0da6639f.zip
pass lsp intialization_options to rust-analyzer
fixes #3350
-rw-r--r--ale_linters/rust/analyzer.vim2
-rw-r--r--test/command_callback/test_rust_analyzer_callbacks.vader4
2 files changed, 3 insertions, 3 deletions
diff --git a/ale_linters/rust/analyzer.vim b/ale_linters/rust/analyzer.vim
index 3666ec03..77d946f7 100644
--- a/ale_linters/rust/analyzer.vim
+++ b/ale_linters/rust/analyzer.vim
@@ -17,7 +17,7 @@ endfunction
call ale#linter#Define('rust', {
\ 'name': 'analyzer',
\ 'lsp': 'stdio',
-\ 'lsp_config': {b -> ale#Var(b, 'rust_analyzer_config')},
+\ 'initialization_options': {b -> ale#Var(b, 'rust_analyzer_config')},
\ 'executable': {b -> ale#Var(b, 'rust_analyzer_executable')},
\ 'command': function('ale_linters#rust#analyzer#GetCommand'),
\ 'project_root': function('ale_linters#rust#analyzer#GetProjectRoot'),
diff --git a/test/command_callback/test_rust_analyzer_callbacks.vader b/test/command_callback/test_rust_analyzer_callbacks.vader
index 95866076..efab1378 100644
--- a/test/command_callback/test_rust_analyzer_callbacks.vader
+++ b/test/command_callback/test_rust_analyzer_callbacks.vader
@@ -16,5 +16,5 @@ Execute(The project root should be detected correctly):
Execute(Should accept configuration settings):
AssertLSPConfig {}
- let b:ale_rust_analyzer_config = {'rust': {'clippy_preference': 'on'}}
- AssertLSPConfig {'rust': {'clippy_preference': 'on'}}
+ let b:ale_rust_analyzer_config = {'diagnostics': {'disabled': ['unresolved-import']}}
+ AssertLSPOptions {'diagnostics': {'disabled': ['unresolved-import']}}