Add lsp_settings_extra_paths

8 files changed, 8 insertions, 8 deletions

diff --git a/setting/clangd.vim b/setting/clangd.vim
index f130b34..4c9ba11 100644
--- a/setting/clangd.vim
+++ b/setting/clangd.vim
@@ -2,7 +2,7 @@ augroup vimlsp_settings_clangd
   au!
   autocmd User lsp_setup call lsp#register_server({
       \ 'name': 'clangd',
-      \ 'cmd': lsp_settings#get('clangd', 'cmd', {server_info->['clangd']}),
+      \ 'cmd': lsp_settings#get('clangd', 'cmd', {server_info->[lsp_settings#exec_path('clangd')]}),
       \ '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/setting/gopls.vim b/setting/gopls.vim
index 1ed5cef..c5fcc88 100644
--- a/setting/gopls.vim
+++ b/setting/gopls.vim
@@ -2,7 +2,7 @@ augroup vimlsp_settings_gopls
   au!
   autocmd User lsp_setup call lsp#register_server({
       \ 'name': 'gopls',
-      \ 'cmd': lsp_settings#get('gopls', 'cmd', {server_info->['gopls']}),
+      \ 'cmd': lsp_settings#get('gopls', 'cmd', {server_info->[lsp_settings#exec_path('gopls')]}),
       \ 'initialization_options': lsp_settings#get('gopls', 'initialization_options', {"diagnostics": "true"}),
       \ 'whitelist': lsp_settings#get('gopls', 'whitelist', ['go']),
       \ 'blacklist': lsp_settings#get('gopls', 'blacklist', []),
diff --git a/setting/intelephense-server.vim b/setting/intelephense-server.vim
index 25f4ccf..ef10860 100644
--- a/setting/intelephense-server.vim
+++ b/setting/intelephense-server.vim
@@ -2,7 +2,7 @@ augroup vimlsp_settings_intelephense_server
   au!
   autocmd User lsp_setup call lsp#register_server({
       \ 'name': 'intelephense',
-      \ 'cmd': lsp_settings#get('intelephense', 'cmd', {server_info->[&shell, &shellcmdflag, 'intelephense-server --stdio']}),
+      \ 'cmd': lsp_settings#get('intelephense', 'cmd', {server_info->[lsp_settings#exec_path('intelephense-server'), '--stdio']}),
       \ 'whitelist': lsp_settings#get('intelephense', 'whitelist', ['php']),
       \ 'blacklist': lsp_settings#get('intelephense', 'blacklist', []),
       \ 'config': lsp_settings#get('intelephense', 'config', {}),
diff --git a/setting/pyls.vim b/setting/pyls.vim
index 686353e..177a429 100644
--- a/setting/pyls.vim
+++ b/setting/pyls.vim
@@ -2,7 +2,7 @@ augroup vimlsp_settings_pyls
   au!
   autocmd User lsp_setup call lsp#register_server({
       \ 'name': 'pyls',
-      \ 'cmd': lsp_settings#get('pyls', 'cmd', {server_info->['pyls']}),
+      \ 'cmd': lsp_settings#get('pyls', 'cmd', {server_info->[lsp_settings#exec_path('pyls')]}),
       \ '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/setting/rls.vim b/setting/rls.vim
index 252c658..4267795 100644
--- a/setting/rls.vim
+++ b/setting/rls.vim
@@ -2,7 +2,7 @@ augroup vimlsp_settings_rls
   au!
   autocmd User lsp_setup call lsp#register_server({
       \ 'name': 'rls',
-      \ 'cmd': lsp_settings#get('rls', 'cmd', {server_info->['rls']}),
+      \ 'cmd': lsp_settings#get('rls', 'cmd', {server_info->[lsp_settings#exec_path('rls')]}),
       \ '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/setting/solargraph.vim b/setting/solargraph.vim
index 914fb62..f86be72 100644
--- a/setting/solargraph.vim
+++ b/setting/solargraph.vim
@@ -2,7 +2,7 @@ augroup vimlsp_settings_solargraph
   au!
   autocmd User lsp_setup call lsp#register_server({
       \ 'name': 'solargraph',
-      \ 'cmd': lsp_settings#get('solargraph', 'cmd', {server_info->[&shell, &shellcmdflag, 'solargraph stdio']}),
+      \ 'cmd': lsp_settings#get('solargraph', 'cmd', {server_info->[lsp_settings#exec_path('solargraph'), 'stdio']}),
       \ '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/setting/typescript-language-server.vim b/setting/typescript-language-server.vim
index 4f2fcc0..ab7009d 100644
--- a/setting/typescript-language-server.vim
+++ b/setting/typescript-language-server.vim
@@ -2,7 +2,7 @@ augroup vimlsp_settings_typescript_language_server
   au!
   autocmd User lsp_setup call lsp#register_server({
       \ 'name': 'typescript-language-server',
-      \ 'cmd': lsp_settings#get('typescript-language-server', {server_info->[&shell, &shellcmdflag, 'typescript-language-server --stdio']}),
+      \ 'cmd': lsp_settings#get('typescript-language-server', {server_info->[lsp_settings#exec_path('typescript-language-server'), '--stdio']}),
       \ 'root_uri':{server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), 'tsconfig.json'))},
       \ 'initialization_options': lsp_settings#get('typescript-language-server', 'initialization_options', {"diagnostics": "true"}),
       \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['typescript', 'typescript.tsx']),
diff --git a/setting/vim-language-server.vim b/setting/vim-language-server.vim
index 3be4af7..6932aa9 100644
--- a/setting/vim-language-server.vim
+++ b/setting/vim-language-server.vim
@@ -2,7 +2,7 @@ augroup vimlsp_settings_vim_language_server
   au!
   autocmd User lsp_setup call lsp#register_server({
       \ 'name': 'vim-language-server',
-      \ 'cmd': {server_info->[&shell, &shellcmdflag, 'vim-language-server --stdio']},
+      \ 'cmd': {server_info->[lsp_settings#exec_path('vim-language-server'), '--stdio']},
       \ 'initialization_options': {
       \   'vimruntime': $VIMRUNTIME,
       \   'runtimepath': &rtp,