summaryrefslogtreecommitdiff
path: root/ale_linters
diff options
context:
space:
mode:
authorPeter Benjamin <petermbenjamin@gmail.com>2023-09-09 15:28:38 -0700
committerGitHub <noreply@github.com>2023-09-09 23:28:38 +0100
commit61892e8586a2f7ffe0c7399dc85effd73fbcf91b (patch)
tree9f6533262e7d7f63fb57321f50090d35c4bf14b4 /ale_linters
parent92267a14ba4ef4f96ea5822366f5b24231b1d9d7 (diff)
downloadale-61892e8586a2f7ffe0c7399dc85effd73fbcf91b.zip
fix(json): update vscode json lsp name (#4601)
* fix(json): update vscode json lsp name * fix(vscodejson): fallback to previous name Co-authored-by: w0rp <devw0rp@gmail.com>
Diffstat (limited to 'ale_linters')
-rw-r--r--ale_linters/json/vscodejson.vim18
1 files changed, 17 insertions, 1 deletions
diff --git a/ale_linters/json/vscodejson.vim b/ale_linters/json/vscodejson.vim
index dcaee010..be9eaf53 100644
--- a/ale_linters/json/vscodejson.vim
+++ b/ale_linters/json/vscodejson.vim
@@ -1,6 +1,22 @@
" Author: Dalius Dobravolskas <dalius.dobravolskas@gmail.com>
" Description: VSCode json language server
+call ale#Set('json_vscodejson_executable', '<auto>')
+
+function! ale_linters#json#vscodejson#GetExecutable(buffer) abort
+ let l:executable = ale#Var(a:buffer, 'json_vscodejson_executable')
+
+ if l:executable is# '<auto>'
+ if ale#engine#IsExecutable(a:buffer, 'vscode-json-languageserver')
+ let l:executable = 'vscode-json-languageserver'
+ else
+ let l:executable = 'vscode-json-language-server'
+ endif
+ endif
+
+ return l:executable
+endfunction
+
function! ale_linters#json#vscodejson#GetProjectRoot(buffer) abort
let l:git_path = ale#path#FindNearestDirectory(a:buffer, '.git')
@@ -10,7 +26,7 @@ endfunction
call ale#linter#Define('json', {
\ 'name': 'vscodejson',
\ 'lsp': 'stdio',
-\ 'executable': 'vscode-json-language-server',
+\ 'executable': function('ale_linters#json#vscodejson#GetExecutable'),
\ 'command': '%e --stdio',
\ 'project_root': function('ale_linters#json#vscodejson#GetProjectRoot'),
\})