diff options
57 files changed, 98 insertions, 72 deletions
diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim index 67c630e..d9a6a5b 100644 --- a/autoload/lsp_settings.vim +++ b/autoload/lsp_settings.vim @@ -168,8 +168,14 @@ function! lsp_settings#exec_path(cmd) abort return '' endfunction -function! lsp_settings#root_uri(pattern) abort - let l:dir = lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), a:pattern) +function! lsp_settings#root_path(...) abort + let l:patterns = get(a:000, 0, []) + return lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), extend(l:patterns, g:lsp_settings_root_markers)) +endfunction + +function! lsp_settings#root_uri(...) abort + let l:patterns = get(a:000, 0, []) + let l:dir = lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), extend(l:patterns, g:lsp_settings_root_markers)) if empty(l:dir) return lsp#utils#get_default_root_uri() endif @@ -358,18 +364,7 @@ function! s:vim_lsp_load_or_suggest(ft) abort return endif - try - let l:root = lsp#utils#find_nearest_parent_directory('.', '.vim-lsp-settings') - if !empty(l:root) && filereadable(l:root . '/settings.json') - let l:settings = json_decode(join(readfile(l:root . '/settings.json'), "\n")) - if has_key(g:, 'lsp_settings') - call lsp_settings#utils#merge(g:lsp_settings, l:settings) - else - let g:lsp_settings = l:settings - endif - endif - catch - endtry + call lsp_settings#profile#load_local() if get(g:, 'lsp_loaded', 0) for l:server in s:settings[a:ft] @@ -438,6 +433,8 @@ function! s:vim_lsp_load_or_suggest(ft) abort endif endfor + delcommand LspRegisterServer + if l:disabled == 0 && l:found ==# 0 if a:ft !=# '_' call s:vim_lsp_settings_suggest(a:ft) @@ -451,9 +448,6 @@ function! s:vim_lsp_load_or_suggest(ft) abort endif endif - if exists(':LspRegisterServer') !=# 2 - delcommand LspRegisterServer - endif endfunction function! lsp_settings#clear() abort diff --git a/autoload/lsp_settings/profile.vim b/autoload/lsp_settings/profile.vim new file mode 100644 index 0000000..a035032 --- /dev/null +++ b/autoload/lsp_settings/profile.vim @@ -0,0 +1,31 @@ +function! lsp_settings#profile#load_local() abort + try + let l:root = lsp#utils#find_nearest_parent_directory('.', '.vim-lsp-settings') + if !empty(l:root) && filereadable(l:root . '/settings.json') + let l:settings = json_decode(join(readfile(l:root . '/settings.json'), "\n")) + if has_key(g:, 'lsp_settings') + call lsp_settings#utils#merge(g:lsp_settings, l:settings) + else + let g:lsp_settings = l:settings + endif + endif + catch + endtry +endfunction + +function! lsp_settings#profile#edit_local() abort + let l:root = lsp_settings#root_path(['.vim-lsp-settings']) + if !isdirectory(l:root) + return + endif + let l:root .= '/.vim-lsp-settings' + if !isdirectory(l:root) + call mkdir(l:root) + endif + exe 'new' l:root . '/settings.json' + if !filereadable(l:root . '/settings.json') + call setline(1, ['{', "\t", '}']) + call cursor([2, 2]) + setlocal nomodified + endif +endfunction diff --git a/plugin/lsp_settings.vim b/plugin/lsp_settings.vim index 7b89ee0..5898982 100644 --- a/plugin/lsp_settings.vim +++ b/plugin/lsp_settings.vim @@ -10,4 +10,6 @@ let g:lsp_settings_root_markers = get(g:, 'lsp_settings_root_markers', [ \ '.bzr/' \ ]) +command! -nargs=0 LspSettingsLocalEdit call lsp_settings#profile#edit_local() + call lsp_settings#init() diff --git a/settings/analysis-server-dart-snapshot.vim b/settings/analysis-server-dart-snapshot.vim index abdaff9..239fea8 100644 --- a/settings/analysis-server-dart-snapshot.vim +++ b/settings/analysis-server-dart-snapshot.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_analysis_server_dart_snapshot LspRegisterServer { \ 'name': 'analysis-server-dart-snapshot', \ 'cmd': {server_info->lsp_settings#get('analysis-server-dart-snapshot', 'cmd', [lsp_settings#exec_path('analysis-server-dart-snapshot')])}, - \ 'root_uri':{server_info->lsp_settings#get('analysis-server-dart-snapshot', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('analysis-server-dart-snapshot', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('analysis-server-dart-snapshot', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('analysis-server-dart-snapshot', 'whitelist', ['dart']), \ 'blacklist': lsp_settings#get('analysis-server-dart-snapshot', 'blacklist', []), diff --git a/settings/apex-jorje-lsp.vim b/settings/apex-jorje-lsp.vim index 1c4446a..ce4e400 100644 --- a/settings/apex-jorje-lsp.vim +++ b/settings/apex-jorje-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_apex_jorje_lsp LspRegisterServer { \ 'name': 'apex-jorje-lsp', \ 'cmd': {server_info->lsp_settings#get('apex-jorje-lsp', 'cmd', [lsp_settings#exec_path('apex-jorje-lsp')])}, - \ 'root_uri':{server_info->lsp_settings#get('apex-jorje-lsp', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('apex-jorje-lsp', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('apex-jorje-lsp', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('apex-jorje-lsp', 'whitelist', ['apex']), \ 'blacklist': lsp_settings#get('apex-jorje-lsp', 'blacklist', []), diff --git a/settings/bash-language-server.vim b/settings/bash-language-server.vim index bf7a800..9eaa214 100644 --- a/settings/bash-language-server.vim +++ b/settings/bash-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_bash_language_server LspRegisterServer { \ 'name': 'bash-language-server', \ 'cmd': {server_info->lsp_settings#get('bash-language-server', 'cmd', [lsp_settings#exec_path('bash-language-server'), 'start'])}, - \ 'root_uri':{server_info->lsp_settings#get('bash-language-server', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('bash-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('bash-language-server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('bash-language-server', 'whitelist', ['sh']), \ 'blacklist': lsp_settings#get('bash-language-server', 'blacklist', []), diff --git a/settings/cl-lsp.vim b/settings/cl-lsp.vim index 0cca588..5a46294 100644 --- a/settings/cl-lsp.vim +++ b/settings/cl-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_cl_lsp LspRegisterServer { \ 'name': 'cl-lsp', \ 'cmd': {server_info->lsp_settings#get('cl-lsp', 'cmd', {key, name-> ['ros', '-Q', '--', trim(filter(systemlist('ros version'), 'v:val=~"^homedir"')[0][8:], '"''') . '/bin/cl-lsp', 'stdio']})}, - \ 'root_uri':{server_info->lsp_settings#get('cl-lsp', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('cl-lsp', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('cl-lsp', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('cl-lsp', 'whitelist', ['lisp']), \ 'blacklist': lsp_settings#get('cl-lsp', 'blacklist', []), diff --git a/settings/clangd.vim b/settings/clangd.vim index 82b31b9..b87bfcc 100644 --- a/settings/clangd.vim +++ b/settings/clangd.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_clangd LspRegisterServer { \ 'name': 'clangd', \ 'cmd': {server_info->lsp_settings#get('clangd', 'cmd', [lsp_settings#exec_path('clangd')])}, - \ 'root_uri':{server_info->lsp_settings#get('clangd', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('clangd', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('clangd', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('clangd', 'whitelist', ['c', 'cpp', 'objc', 'objcpp']), \ 'blacklist': lsp_settings#get('clangd', 'blacklist', []), diff --git a/settings/clojure-lsp.vim b/settings/clojure-lsp.vim index 464683a..ae431dc 100644 --- a/settings/clojure-lsp.vim +++ b/settings/clojure-lsp.vim @@ -3,8 +3,7 @@ augroup vimlsp_settings_clojure_lsp LspRegisterServer { \ 'name': 'clojure-lsp', \ 'cmd': {server_info->lsp_settings#get('clojure-lsp', 'cmd', [lsp_settings#exec_path('clojure-lsp')])}, - \ 'root_uri':{server_info->lsp_settings#get('clojure-lsp', 'root_uri', lsp_settings#root_uri(extend([ - \ '.lein/', '.shadow-cljs/', 'project.clj', 'deps.edn', 'shadow-cljs.edn'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('clojure-lsp', 'root_uri', lsp_settings#root_uri(['.lein/', '.shadow-cljs/', 'project.clj', 'deps.edn', 'shadow-cljs.edn']))}, \ 'initialization_options': lsp_settings#get('clojure-lsp', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('clojure-lsp', 'whitelist', ['clojure']), \ 'blacklist': lsp_settings#get('clojure-lsp', 'blacklist', []), diff --git a/settings/cobol-language-support.vim b/settings/cobol-language-support.vim index c06be88..9f0977e 100644 --- a/settings/cobol-language-support.vim +++ b/settings/cobol-language-support.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_cobol_language_support LspRegisterServer { \ 'name': 'cobol-language-support', \ 'cmd': {server_info->lsp_settings#get('cobol-language-support', 'cmd', [lsp_settings#exec_path('cobol-language-support')])}, - \ 'root_uri':{server_info->lsp_settings#get('cobol-language-server', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('cobol-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('cobol-language-support', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('cobol-language-support', 'whitelist', ['cobol']), \ 'blacklist': lsp_settings#get('cobol-language-support', 'blacklist', []), diff --git a/settings/css-languageserver.vim b/settings/css-languageserver.vim index ad0b583..9bab50d 100644 --- a/settings/css-languageserver.vim +++ b/settings/css-languageserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_css_languageserver LspRegisterServer { \ 'name': 'css-languageserver', \ 'cmd': {server_info->lsp_settings#get('css-languageserver', 'cmd', [lsp_settings#exec_path('css-languageserver'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('css-languageserver', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('css-languageserver', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('css-languageserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('css-languageserver', 'whitelist', ['css', 'less', 'sass']), \ 'blacklist': lsp_settings#get('css-languageserver', 'blacklist', []), diff --git a/settings/digestif.vim b/settings/digestif.vim index bd3db88..7b4f7d0 100644 --- a/settings/digestif.vim +++ b/settings/digestif.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_digestif LspRegisterServer { \ 'name': 'digestif', \ 'cmd': {server_info->lsp_settings#get('digestif', 'cmd', [lsp_settings#exec_path('digestif')])}, - \ 'root_uri':{server_info->lsp_settings#get('digestif', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('digestif', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('digestif', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('digestif', 'whitelist', ['plaintex', 'tex']), \ 'blacklist': lsp_settings#get('digestif', 'blacklist', []), diff --git a/settings/dls.vim b/settings/dls.vim index 909ba85..6399c85 100644 --- a/settings/dls.vim +++ b/settings/dls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_dls LspRegisterServer { \ 'name': 'dls', \ 'cmd': {server_info->lsp_settings#get('dls', 'cmd', [lsp_settings#exec_path('dls')])}, - \ 'root_uri':{server_info->lsp_settings#get('dls', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('dls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('dls', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('dls', 'whitelist', ['d']), \ 'blacklist': lsp_settings#get('dls', 'blacklist', []), diff --git a/settings/docker-langserver.vim b/settings/docker-langserver.vim index e34f968..c73ef1a 100644 --- a/settings/docker-langserver.vim +++ b/settings/docker-langserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_dockerfile_language_server_nodejs LspRegisterServer { \ 'name': 'docker-langserver', \ 'cmd': {server_info->lsp_settings#get('docker-langserver', 'cmd', [lsp_settings#exec_path('docker-langserver'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('docker-langserver', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('docker-langserver', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('docker-langserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('docker-langserver', 'whitelist', ['dockerfile']), \ 'blacklist': lsp_settings#get('docker-langserver', 'blacklist', []), diff --git a/settings/eclipse-jdt-ls.vim b/settings/eclipse-jdt-ls.vim index fae08bc..2577cdc 100644 --- a/settings/eclipse-jdt-ls.vim +++ b/settings/eclipse-jdt-ls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_eclipse_jdt_ls LspRegisterServer { \ 'name': 'eclipse-jdt-ls', \ 'cmd': {server_info->lsp_settings#get('eclipse-jdt-ls', 'cmd', [lsp_settings#exec_path('eclipse-jdt-ls')])}, - \ 'root_uri':{server_info->lsp_settings#get('eclipse-jdt-ls', 'root_uri', lsp_settings#root_uri(extend(['pom.xml', 'build.gradle'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('eclipse-jdt-ls', 'root_uri', lsp_settings#root_uri(['pom.xml', 'build.gradle']))}, \ 'initialization_options': lsp_settings#get('eclipse-jdt-ls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('eclipse-jdt-ls', 'whitelist', ['java']), \ 'blacklist': lsp_settings#get('eclipse-jdt-ls', 'blacklist', []), diff --git a/settings/efm-langserver.vim b/settings/efm-langserver.vim index e4a85c3..245fa8d 100644 --- a/settings/efm-langserver.vim +++ b/settings/efm-langserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_efm_langserver LspRegisterServer { \ 'name': 'efm-langserver', \ 'cmd': {server_info->lsp_settings#get('efm-langserver', 'cmd', [lsp_settings#exec_path('efm-langserver')])}, - \ 'root_uri':{server_info->lsp_settings#get('efm-langserver', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('efm-langserver', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('efm-langserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('efm-langserver', 'whitelist', ['*']), \ 'blacklist': lsp_settings#get('efm-langserver', 'blacklist', []), diff --git a/settings/elixir-ls.vim b/settings/elixir-ls.vim index d824a71..28392b3 100644 --- a/settings/elixir-ls.vim +++ b/settings/elixir-ls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_elixir_ls LspRegisterServer { \ 'name': 'elixir-ls', \ 'cmd': {server_info->lsp_settings#get('elixir-ls', 'cmd', [lsp_settings#exec_path('elixir-ls')])}, - \ 'root_uri':{server_info->lsp_settings#get('elixir-ls', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('elixir-ls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('elixir-ls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('elixir-ls', 'whitelist', ['elixir']), \ 'blacklist': lsp_settings#get('elixir-ls', 'blacklist', []), diff --git a/settings/elm-language-server.vim b/settings/elm-language-server.vim index 3370ba4..709d02b 100644 --- a/settings/elm-language-server.vim +++ b/settings/elm-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_elm_language_server LspRegisterServer { \ 'name': 'elm-language-server', \ 'cmd': {server_info->lsp_settings#get('elm-language-server', 'cmd', [lsp_settings#exec_path('elm-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('elm-language-server', 'root_uri', lsp_settings#root_uri(extend(['elm.json'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('elm-language-server', 'root_uri', lsp_settings#root_uri(['elm.json']))}, \ 'initialization_options': lsp_settings#get('elm-language-server', 'initialization_options', {'elmPath': 'elm', 'runtime': 'node', 'elmFormatPath': 'elm-format', 'elmTestPath': 'elm-test'}), \ 'whitelist': lsp_settings#get('elm-language-server', 'whitelist', ['elm', 'elm.tsx']), \ 'blacklist': lsp_settings#get('elm-language-server', 'blacklist', []), diff --git a/settings/emmylua-ls.vim b/settings/emmylua-ls.vim index ce91a0f..2fd836a 100644 --- a/settings/emmylua-ls.vim +++ b/settings/emmylua-ls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_emmylua_ls LspRegisterServer { \ 'name': 'emmylua-ls', \ 'cmd': {server_info->lsp_settings#get('emmylua-ls', 'cmd', [lsp_settings#exec_path('emmylua-ls')])}, - \ 'root_uri':{server_info->lsp_settings#get('emmylua-ls', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('emmylua-ls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('emmylua-ls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('emmylua-ls', 'whitelist', ['lua']), \ 'blacklist': lsp_settings#get('emmylua-ls', 'blacklist', []), diff --git a/settings/erlang-ls.vim b/settings/erlang-ls.vim index 8d3d2a6..8239d6b 100644 --- a/settings/erlang-ls.vim +++ b/settings/erlang-ls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_erlang_ls LspRegisterServer { \ 'name': 'erlang-ls', \ 'cmd': {server_info->lsp_settings#get('erlang-ls', 'cmd', [lsp_settings#exec_path('erlang-ls'), '--transport', 'stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('erlang-ls', 'root_uri', lsp_settings#root_uri(extend(['rebar.config'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('erlang-ls', 'root_uri', lsp_settings#root_uri(['rebar.config']))}, \ 'initialization_options': lsp_settings#get('erlang-ls', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('erlang-ls', 'whitelist', ['erlang']), \ 'blacklist': lsp_settings#get('erlang-ls', 'blacklist', []), diff --git a/settings/fortls.vim b/settings/fortls.vim index b17b03e..bc25d77 100644 --- a/settings/fortls.vim +++ b/settings/fortls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_fortls LspRegisterServer { \ 'name': 'fortls', \ 'cmd': {server_info->lsp_settings#get('fortls', 'cmd', [lsp_settings#exec_path('fortls')])}, - \ 'root_uri':{server_info->lsp_settings#get('fortls', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('fortls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('fortls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('fortls', 'whitelist', ['fortran']), \ 'blacklist': lsp_settings#get('fortls', 'blacklist', []), diff --git a/settings/fsautocomplete.vim b/settings/fsautocomplete.vim index e62f4bf..7bbfe33 100644 --- a/settings/fsautocomplete.vim +++ b/settings/fsautocomplete.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_fsautocomplete LspRegisterServer { \ 'name': 'fsautocomplete', \ 'cmd': {server_info->lsp_settings#get('fsautocomplete', 'cmd', [lsp_settings#exec_path('fsautocomplete'), '--background-service-enabled'])}, - \ 'root_uri':{server_info->lsp_settings#get('fsautocomplete', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('fsautocomplete', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('fsautocomplete', 'initialization_options', {'AutomaticWorkspaceInit': v:true}), \ 'whitelist': lsp_settings#get('fsautocomplete', 'whitelist', ['fsharp']), \ 'blacklist': lsp_settings#get('fsautocomplete', 'blacklist', []), diff --git a/settings/fsharp-language-server.vim b/settings/fsharp-language-server.vim index 9fbc045..e401802 100644 --- a/settings/fsharp-language-server.vim +++ b/settings/fsharp-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_fsharp_language_server LspRegisterServer { \ 'name': 'fsharp-language-server', \ 'cmd': {server_info->lsp_settings#get('fsharp-language-server', 'cmd', [lsp_settings#exec_path('fsharp-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('fsharp-language-server', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('fsharp-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('fsharp-language-server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('fsharp-language-server', 'whitelist', ['fsharp']), \ 'blacklist': lsp_settings#get('fsharp-language-server', 'blacklist', []), diff --git a/settings/glslls.vim b/settings/glslls.vim index 9dd530a..240fadc 100644 --- a/settings/glslls.vim +++ b/settings/glslls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_glslls LspRegisterServer { \ 'name': 'glslls', \ 'cmd': {server_info->lsp_settings#get('glslls', 'cmd', [lsp_settings#exec_path('glslls'), '--stdin'])}, - \ 'root_uri':{server_info->lsp_settings#get('glslls', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('glslls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('glslls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('glslls', 'whitelist', ['glsl']), \ 'blacklist': lsp_settings#get('glslls', 'blacklist', []), diff --git a/settings/gopls.vim b/settings/gopls.vim index d954040..87bbd9d 100644 --- a/settings/gopls.vim +++ b/settings/gopls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_gopls LspRegisterServer { \ 'name': 'gopls', \ 'cmd': {server_info->lsp_settings#get('gopls', 'cmd', [lsp_settings#exec_path('gopls')])}, - \ 'root_uri':{server_info->lsp_settings#get('gopls', 'root_uri', lsp_settings#root_uri(extend(['go.mod'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('gopls', 'root_uri', lsp_settings#root_uri(extend(['go.mod'], )))}, \ 'initialization_options': lsp_settings#get('gopls', 'initialization_options', {"diagnostics": v:true, 'completeUnimported': v:true, 'matcher': 'fuzzy'}), \ 'whitelist': lsp_settings#get('gopls', 'whitelist', ['go']), \ 'blacklist': lsp_settings#get('gopls', 'blacklist', []), diff --git a/settings/gql-language-server.vim b/settings/gql-language-server.vim index eb47474..2fd42e2 100644 --- a/settings/gql-language-server.vim +++ b/settings/gql-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_gql_language_server LspRegisterServer { \ 'name': 'gql-language-server', \ 'cmd': {server_info->lsp_settings#get('gql-language-server', 'cmd', [lsp_settings#exec_path('gql-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('gql-language-server', 'root_uri', lsp_settings#root_uri(extend(['package.json', 'tsconfig.json', '.gqlconfig'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('gql-language-server', 'root_uri', lsp_settings#root_uri(['package.json', 'tsconfig.json', '.gqlconfig']))}, \ 'initialization_options': lsp_settings#get('gql-language-server', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('gql-language-server', 'whitelist', ['graphql']), \ 'blacklist': lsp_settings#get('gql-language-server', 'blacklist', []), diff --git a/settings/groovy-language-server.vim b/settings/groovy-language-server.vim index c830939..f642e45 100644 --- a/settings/groovy-language-server.vim +++ b/settings/groovy-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_groovy_language_server LspRegisterServer { \ 'name': 'groovy-language-server', \ 'cmd': {server_info->lsp_settings#get('groovy-language-server', 'cmd', [lsp_settings#exec_path('groovy-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('groovy-language-server', 'root_uri', lsp_settings#root_uri(extend(['build.gradle'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('groovy-language-server', 'root_uri', lsp_settings#root_uri(['build.gradle']))}, \ 'initialization_options': lsp_settings#get('groovy-language-server', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('groovy-language-server', 'whitelist', ['groovy']), \ 'blacklist': lsp_settings#get('groovy-language-server', 'blacklist', []), diff --git a/settings/html-languageserver.vim b/settings/html-languageserver.vim index fd3be24..ef03108 100644 --- a/settings/html-languageserver.vim +++ b/settings/html-languageserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_html_languageserver LspRegisterServer { \ 'name': 'html-languageserver', \ 'cmd': {server_info->lsp_settings#get('html-languageserver', 'cmd', [lsp_settings#exec_path('html-languageserver'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('html-langserver', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('html-langserver', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('html-languageserver', 'initialization_options', {'embeddedLanguages': {'css': v:true, 'javascript': v:true}}), \ 'whitelist': lsp_settings#get('html-languageserver', 'whitelist', ['html']), \ 'blacklist': lsp_settings#get('html-languageserver', 'blacklist', []), diff --git a/settings/intelephense.vim b/settings/intelephense.vim index d53fc3b..da8588d 100644 --- a/settings/intelephense.vim +++ b/settings/intelephense.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_intelephense_server LspRegisterServer { \ 'name': 'intelephense', \ 'cmd': {server_info->lsp_settings#get('intelephense', 'cmd', [lsp_settings#exec_path('intelephense'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('intelephense', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('intelephense', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('intelephense', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('intelephense', 'whitelist', ['php']), \ 'blacklist': lsp_settings#get('intelephense', 'blacklist', []), diff --git a/settings/javascript-typescript-stdio.vim b/settings/javascript-typescript-stdio.vim index 474b507..9d13b4f 100644 --- a/settings/javascript-typescript-stdio.vim +++ b/settings/javascript-typescript-stdio.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_javascript_typescript_stdio LspRegisterServer { \ 'name': 'javascript-typescript-stdio', \ 'cmd': {server_info->lsp_settings#get('javascript-typescript-stdio', 'cmd', [lsp_settings#exec_path('javascript-typescript-stdio')])}, - \ 'root_uri':{server_info->lsp_settings#get('javascript-typescript-stdio', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('javascript-typescript-stdio', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('javascript-typescript-stdio', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('javascript-typescript-stdio', 'whitelist', ['javascript', 'javascriptreact', 'javascript.jsx']), \ 'blacklist': lsp_settings#get('javascript-typescript-stdio', 'blacklist', []), diff --git a/settings/json-languageserver.vim b/settings/json-languageserver.vim index 9af1d69..7b21b94 100644 --- a/settings/json-languageserver.vim +++ b/settings/json-languageserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_json_languageserver LspRegisterServer { \ 'name': 'json-languageserver', \ 'cmd': {server_info->lsp_settings#get('json-languageserver', 'cmd', [lsp_settings#exec_path('json-languageserver'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('json-languageserver', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('json-languageserver', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('json-languageserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('json-languageserver', 'whitelist', ['json', 'jsonc']), \ 'blacklist': lsp_settings#get('json-languageserver', 'blacklist', []), diff --git a/settings/julia-language-server.vim b/settings/julia-language-server.vim index 673086d..5ca1a84 100644 --- a/settings/julia-language-server.vim +++ b/settings/julia-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_julia_language_server LspRegisterServer { \ 'name': 'julia-language-server', \ 'cmd': {server_info->lsp_settings#get('julia-language-server', 'cmd', [lsp_settings#exec_path('julia-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('julia-language-server', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('julia-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('julia-language-server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('julia-language-server', 'whitelist', ['julia']), \ 'blacklist': lsp_settings#get('julia-language-server', 'blacklist', []), diff --git a/settings/kotlin-language-server.vim b/settings/kotlin-language-server.vim index dce6ea3..0fd011c 100644 --- a/settings/kotlin-language-server.vim +++ b/settings/kotlin-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_kotlin_language_server LspRegisterServer { \ 'name': 'kotlin-language-server', \ 'cmd': {server_info->lsp_settings#get('kotlin-language-server', 'cmd', [lsp_settings#exec_path('kotlin-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('kotlin-language-server', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('kotlin-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('kotlin-language-server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('kotlin-language-server', 'whitelist', ['kotlin']), \ 'blacklist': lsp_settings#get('kotlin-language-server', 'blacklist', []), diff --git a/settings/lsp4xml.vim b/settings/lsp4xml.vim index 0c6ecfb..50268b9 100644 --- a/settings/lsp4xml.vim +++ b/settings/lsp4xml.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_lsp4xml LspRegisterServer { \ 'name': 'lsp4xml', \ 'cmd': {server_info->lsp_settings#get('lsp4xml', 'cmd', [lsp_settings#exec_path('lsp4xml')])}, - \ 'root_uri':{server_info->lsp_settings#get('lsp4xml', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('lsp4xml', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('lsp4xml', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('lsp4xml', 'whitelist', ['xml']), \ 'blacklist': lsp_settings#get('lsp4xml', 'blacklist', []), diff --git a/settings/metals.vim b/settings/metals.vim index 4ffb9f8..bf11930 100644 --- a/settings/metals.vim +++ b/settings/metals.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_metals LspRegisterServer { \ 'name': 'metals', \ 'cmd': {server_info->lsp_settings#get('metals', 'cmd', [lsp_settings#exec_path('metals')])}, - \ 'root_uri':{server_info->lsp_settings#get('metals', 'root_uri', lsp_settings#root_uri(extend(['build.sbt'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('metals', 'root_uri', lsp_settings#root_uri(['build.sbt']))}, \ 'initialization_options': lsp_settings#get('metals', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('metals', 'whitelist', ['scala', 'sbt']), \ 'blacklist': lsp_settings#get('metals', 'blacklist', []), diff --git a/settings/monastery.vim b/settings/monastery.vim index b1550af..ee7fe93 100644 --- a/settings/monastery.vim +++ b/settings/monastery.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_monastery LspRegisterServer { \ 'name': 'monastery', \ 'cmd': {server_info->lsp_settings#get('monastery', 'cmd', [lsp_settings#exec_path('monastery')])}, - \ 'root_uri':{server_info->lsp_settings#get('monastery', 'root_uri', lsp_settings#root_uri(['.git/']))}, + \ 'root_uri':{server_info->lsp_settings#get('monastery', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('monastery', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('monastery', 'whitelist', ['perl']), \ 'blacklist': lsp_settings#get('monastery', 'blacklist', []), diff --git a/settings/nimlsp.vim b/settings/nimlsp.vim index 7d66769..b36bae2 100644 --- a/settings/nimlsp.vim +++ b/settings/nimlsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_nimlsp LspRegisterServer { \ 'name': 'nimlsp', \ 'cmd': {server_info->lsp_settings#get('nimlsp', 'cmd', [lsp_settings#exec_path('nimlsp')])}, - \ 'root_uri':{server_info->lsp_settings#get('nimlsp', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('nimlsp', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('nimlsp', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('nimlsp', 'whitelist', ['nim']), \ 'blacklist': lsp_settings#get('nimlsp', 'blacklist', []), diff --git a/settings/omnisharp-lsp.vim b/settings/omnisharp-lsp.vim index 50c169c..fe22321 100644 --- a/settings/omnisharp-lsp.vim +++ b/settings/omnisharp-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_omnisharp_lsp LspRegisterServer { \ 'name': 'omnisharp-lsp', \ 'cmd': {server_info->lsp_settings#get('omnisharp-lsp', 'cmd', [lsp_settings#exec_path('omnisharp-lsp'), '-lsp'])}, - \ 'root_uri':{server_info->lsp_settings#get('omnisharp-lsp', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('omnisharp-lsp', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('omnisharp-lsp', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('omnisharp-lsp', 'whitelist', ['cs']), \ 'blacklist': lsp_settings#get('omnisharp-lsp', 'blacklist', []), diff --git a/settings/perl-languageserver.vim b/settings/perl-languageserver.vim index 6c0304b..f8bdab0 100644 --- a/settings/perl-languageserver.vim +++ b/settings/perl-languageserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_perl_languageserver LspRegisterServer { \ 'name': 'perl-languageserver', \ 'cmd': {server_info->lsp_settings#get('perl-languageserver', 'cmd', ['perl', '-MPerl::LanguageServer', '-e', 'Perl::LanguageServer->run'])}, - \ 'root_uri':{server_info->lsp_settings#get('perl-languageserver', 'root_uri', lsp_settings#root_uri(['.git/']))}, + \ 'root_uri':{server_info->lsp_settings#get('perl-languageserver', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('perl-languageserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('perl-languageserver', 'whitelist', ['perl']), \ 'blacklist': lsp_settings#get('perl-languageserver', 'blacklist', []), diff --git a/settings/powershell-languageserver.vim b/settings/powershell-languageserver.vim index d3eabd9..b7e5682 100644 --- a/settings/powershell-languageserver.vim +++ b/settings/powershell-languageserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_powershell_languageserver LspRegisterServer { \ 'name': 'powershell-languageserver', \ 'cmd': {server_info->lsp_settings#get('powershell-languageserver', 'cmd', [lsp_settings#exec_path('powershell-languageserver')])}, - \ 'root_uri':{server_info->lsp_settings#get('powershell-languageserver', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('powershell-languageserver', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('powershell-languageserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('powershell-languageserver', 'whitelist', ['ps1']), \ 'blacklist': lsp_settings#get('powershell-languageserver', 'blacklist', []), diff --git a/settings/pyls-ms.vim b/settings/pyls-ms.vim index ebb2eb7..264c51d 100644 --- a/settings/pyls-ms.vim +++ b/settings/pyls-ms.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_pyls_ms LspRegisterServer { \ 'name': 'pyls-ms', \ 'cmd': {server_info->lsp_settings#get('pyls-ms', 'cmd', [lsp_settings#exec_path('pyls-ms')])}, - \ 'root_uri':{server_info->lsp_settings#get('pyls-ms', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('pyls-ms', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('pyls-ms', 'initialization_options', { \ 'analysisUpdates': v:true, \ 'asyncStartup': v:true, diff --git a/settings/pyls.vim b/settings/pyls.vim index 9f11b63..f6b5bd1 100644 --- a/settings/pyls.vim +++ b/settings/pyls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_pyls LspRegisterServer { \ 'name': 'pyls', \ 'cmd': {server_info->lsp_settings#get('pyls', 'cmd', [lsp_settings#exec_path('pyls')])}, - \ 'root_uri':{server_info->lsp_settings#get('pyls', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('pyls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('pyls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('pyls', 'whitelist', ['python']), \ 'blacklist': lsp_settings#get('pyls', 'blacklist', []), diff --git a/settings/r-languageserver.vim b/settings/r-languageserver.vim index 20a61ad..9567b48 100644 --- a/settings/r-languageserver.vim +++ b/settings/r-languageserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_r_languageserver LspRegisterServer { \ 'name': 'r-languageserver', \ 'cmd': {server_info->lsp_settings#get('r-languageserver', 'cmd', ['R', '--slave', '-e', 'languageserver::run()'])}, - \ 'root_uri':{server_info->lsp_settings#get('r-languageserver', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('r-languageserver', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('r-languageserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('r-languageserver', 'whitelist', ['r']), \ 'blacklist': lsp_settings#get('r-languageserver', 'blacklist', []), diff --git a/settings/ra_lsp_server.vim b/settings/ra_lsp_server.vim index 0b15071..b4e4e87 100644 --- a/settings/ra_lsp_server.vim +++ b/settings/ra_lsp_server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_ra_lsp_server LspRegisterServer { \ 'name': 'ra_lsp_server', \ 'cmd': {server_info->lsp_settings#get('ra_lsp_server', 'cmd', [lsp_settings#exec_path('ra_lsp_server')])}, - \ 'root_uri':{server_info->lsp_settings#get('ra_lsp_server', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('ra_lsp_server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('ra_lsp_server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('ra_lsp_server', 'whitelist', ['rust']), \ 'blacklist': lsp_settings#get('ra_lsp_server', 'blacklist', []), diff --git a/settings/reason-language-server.vim b/settings/reason-language-server.vim index 40ccf61..9e9f778 100644 --- a/settings/reason-language-server.vim +++ b/settings/reason-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_reason_language_server LspRegisterServer { \ 'name': 'reason-language-server', \ 'cmd': {server_info->lsp_settings#get('reason-language-server', 'cmd', [lsp_settings#exec_path('reason-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('reason-language-server', 'root_uri', lsp_settings#root_uri(extend(['package.json'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('reason-language-server', 'root_uri', lsp_settings#root_uri(['package.json']))}, \ 'initialization_options': lsp_settings#get('reason-language-server', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('reason-language-server', 'whitelist', ['reason']), \ 'blacklist': lsp_settings#get('reason-language-server', 'blacklist', []), diff --git a/settings/rls.vim b/settings/rls.vim index 16be745..22aba06 100644 --- a/settings/rls.vim +++ b/settings/rls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_rls LspRegisterServer { \ 'name': 'rls', \ 'cmd': {server_info->lsp_settings#get('rls', 'cmd', [lsp_settings#exec_path('rls')])}, - \ 'root_uri':{server_info->lsp_settings#get('rls', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('rls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('rls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('rls', 'whitelist', ['rust']), \ 'blacklist': lsp_settings#get('rls', 'blacklist', []), diff --git a/settings/slp.vim b/settings/slp.vim index 521ff77..4918c7b 100644 --- a/settings/slp.vim +++ b/settings/slp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_slp LspRegisterServer { \ 'name': 'slp', \ 'cmd': {server_info->lsp_settings#get('slp', 'cmd', [lsp_settings#exec_path('slp.pl')])}, - \ 'root_uri':{server_info->lsp_settings#get('slp', 'root_uri', lsp_settings#root_uri(['.git/']))}, + \ 'root_uri':{server_info->lsp_settings#get('slp', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('slp', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('slp', 'whitelist', ['perl']), \ 'blacklist': lsp_settings#get('slp', 'blacklist', []), diff --git a/settings/solargraph.vim b/settings/solargraph.vim index 9b247a9..60a2dae 100644 --- a/settings/solargraph.vim +++ b/settings/solargraph.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_solargraph LspRegisterServer { \ 'name': 'solargraph', \ 'cmd': {server_info->lsp_settings#get('solargraph', 'cmd', [lsp_settings#exec_path('solargraph'), 'stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('solargraph', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('solargraph', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('solargraph', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('solargraph', 'whitelist', ['ruby']), \ 'blacklist': lsp_settings#get('solargraph', 'blacklist', []), diff --git a/settings/sourcekit-lsp.vim b/settings/sourcekit-lsp.vim index d3c13d1..fcbbf1f 100644 --- a/settings/sourcekit-lsp.vim +++ b/settings/sourcekit-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_sourcekit_lsp LspRegisterServer { \ 'name': 'sourcekit-lsp', \ 'cmd': {server_info->lsp_settings#get('sourcekit-lsp', 'cmd', [lsp_settings#exec_path('sourcekit-lsp')])}, - \ 'root_uri':{server_info->lsp_settings#get('sourcekit-lsp', 'root_uri', lsp_settings#root_uri(extend(['Package.swift', '.xcodeproj', '.xcworkspace', 'Cartfile', 'Podfile'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('sourcekit-lsp', 'root_uri', lsp_settings#root_uri(['Package.swift', '.xcodeproj', '.xcworkspace', 'Cartfile', 'Podfile']))}, \ 'initialization_options': lsp_settings#get('sourcekit-lsp', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('sourcekit-lsp', 'whitelist', ['swift']), \ 'blacklist': lsp_settings#get('sourcekit-lsp', 'blacklist', []), diff --git a/settings/sql-language-server.vim b/settings/sql-language-server.vim index 891540f..cf40abd 100644 --- a/settings/sql-language-server.vim +++ b/settings/sql-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_sql_language_server LspRegisterServer { \ 'name': 'sql-language-server', \ 'cmd': {server_info->lsp_settings#get('sql-language-server', 'cmd', [lsp_settings#exec_path('sql-language-server'), 'up', '--method', 'stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('sql-language-server', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('sql-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('sql-language-server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('sql-language-server', 'whitelist', ['sql']), \ 'blacklist': lsp_settings#get('sql-language-server', 'blacklist', []), diff --git a/settings/svls.vim b/settings/svls.vim index 22477f5..9c2090d 100644 --- a/settings/svls.vim +++ b/settings/svls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_svls LspRegisterServer { \ 'name': 'svls', \ 'cmd': {server_info->lsp_settings#get('svls', 'cmd', [lsp_settings#exec_path('svls')])}, - \ 'root_uri':{server_info->lsp_settings#get('svls', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('svls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('svls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('svls', 'whitelist', ['systemverilog']), \ 'blacklist': lsp_settings#get('svls', 'blacklist', []), diff --git a/settings/terraform-lsp.vim b/settings/terraform-lsp.vim index dba8b8d..181d897 100644 --- a/settings/terraform-lsp.vim +++ b/settings/terraform-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_terraform_lsp LspRegisterServer { \ 'name': 'terraform-lsp', \ 'cmd': {server_info->lsp_settings#get('terraform-lsp', 'cmd', [lsp_settings#exec_path('terraform-lsp')])}, - \ 'root_uri':{server_info->lsp_settings#get('terraform-lsp', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('terraform-lsp', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('terraform-lsp', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('terraform-lsp', 'whitelist', ['terraform']), \ 'blacklist': lsp_settings#get('terraform-lsp', 'blacklist', []), diff --git a/settings/texlab.vim b/settings/texlab.vim index a1a33d8..2b65032 100644 --- a/settings/texlab.vim +++ b/settings/texlab.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_texlab LspRegisterServer { \ 'name': 'texlab', \ 'cmd': {server_info->lsp_settings#get('texlab', 'cmd', [lsp_settings#exec_path('texlab')])}, - \ 'root_uri':{server_info->lsp_settings#get('texlab', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('texlab', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('texlab', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('texlab', 'whitelist', ['plaintex', 'tex']), \ 'blacklist': lsp_settings#get('texlab', 'blacklist', []), diff --git a/settings/typescript-language-server.vim b/settings/typescript-language-server.vim index feb487b..e02fb31 100644 --- a/settings/typescript-language-server.vim +++ b/settings/typescript-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_typescript_language_server LspRegisterServer { \ 'name': 'typescript-language-server', \ 'cmd': {server_info->lsp_settings#get('typescript-language-server', 'cmd', [lsp_settings#exec_path('typescript-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('typescript-language-server', 'root_uri', lsp_settings#root_uri(extend(['package.json', 'tsconfig.json'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('typescript-language-server', 'root_uri', lsp_settings#root_uri(['package.json', 'tsconfig.json']))}, \ 'initialization_options': lsp_settings#get('typescript-language-server', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'typescript.tsx']), \ 'blacklist': lsp_settings#get('typescript-language-server', 'blacklist', []), diff --git a/settings/vim-language-server.vim b/settings/vim-language-server.vim index fe7d53e..986b36e 100644 --- a/settings/vim-language-server.vim +++ b/settings/vim-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_vim_language_server LspRegisterServer { \ 'name': 'vim-language-server', \ 'cmd': {server_info->lsp_settings#get('vim-language-server', 'cmd', [lsp_settings#exec_path('vim-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('vim-language-server', 'root_uri', lsp_settings#root_uri(extend(['.vim/', 'vimfiles/'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('vim-language-server', 'root_uri', lsp_settings#root_uri(['.vim/', 'vimfiles/']))}, \ 'initialization_options': extend({'vimruntime': $VIMRUNTIME, 'runtimepath': &rtp}, lsp_settings#get('vim-language-server', 'initialization_options', {}), 'force'), \ 'whitelist': lsp_settings#get('vim-language-server', 'whitelist', ['vim']), \ 'blacklist': lsp_settings#get('vimbash-language-server', 'blacklist', []), diff --git a/settings/vls.vim b/settings/vls.vim index 97f9659..c9575af 100644 --- a/settings/vls.vim +++ b/settings/vls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_vls LspRegisterServer { \ 'name': 'vls', \ 'cmd': {server_info->lsp_settings#get('vls', 'cmd', [lsp_settings#exec_path('vls'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('vls', 'root_uri', lsp_settings#root_uri(extend(['package.json'], g:lsp_settings_root_markers)))}, + \ 'root_uri':{server_info->lsp_settings#get('vls', 'root_uri', lsp_settings#root_uri(['package.json']))}, \ 'initialization_options': lsp_settings#get('vls', 'initialization_options', {'config': {'vetur': {'useWorkspaceDependencies': v:false, 'validation': {'template': v:true, 'style': v:true, 'script': v:true}, 'completion': {'autoImport': v:false, 'useScaffoldSnippets': v:false, 'tagCasing': 'kebab'}, 'format': {'defaultFormatter': {'js': '', 'ts': ''}, 'defaultFormatterOptions': {}, 'scriptInitialIndent': v:false, 'styleInitialIndent': v:false}, 'dev': {'logLevel': 'DEBUG'}}, 'css': {}, 'html': {'suggest': {}}, 'javascript': {'format': {}}, 'typescript': {'format': {}}, 'emmet': {}, 'stylusSupremacy': {}}}), \ 'whitelist': lsp_settings#get('vls', 'whitelist', ['vue']), \ 'blacklist': lsp_settings#get('vls', 'blacklist', []), diff --git a/settings/yaml-language-server.vim b/settings/yaml-language-server.vim index 4b021bf..118baf0 100644 --- a/settings/yaml-language-server.vim +++ b/settings/yaml-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_yaml_language_server LspRegisterServer { \ 'name': 'yaml-language-server', \ 'cmd': {server_info->lsp_settings#get('yaml-language-server', 'cmd', [lsp_settings#exec_path('yaml-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('yaml-language-server', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'root_uri':{server_info->lsp_settings#get('yaml-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('yaml-language-server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('yaml-language-server', 'whitelist', ['yaml']), \ 'blacklist': lsp_settings#get('yaml-language-server', 'blacklist', []), |