aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasuhiro Matsumoto <mattn.jp@gmail.com>2020-01-31 17:31:49 +0900
committerYasuhiro Matsumoto <mattn.jp@gmail.com>2020-01-31 17:31:49 +0900
commitbc2e42cc6cab19bd17e1ef8604422e05c33009f3 (patch)
tree256dd1259e862798ae5f8e73e250e2ba5d702349
parentf7f7863e01cb5e8e2a928ee4e05da8b46ae24a4b (diff)
downloadvim-lsp-settings-bc2e42cc6cab19bd17e1ef8604422e05c33009f3.tar.gz
vim-lsp-settings-bc2e42cc6cab19bd17e1ef8604422e05c33009f3.tar.bz2
vim-lsp-settings-bc2e42cc6cab19bd17e1ef8604422e05c33009f3.zip
Should work with the user's wrong settings
-rw-r--r--autoload/lsp_settings.vim7
1 files changed, 2 insertions, 5 deletions
diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim
index 0b149f1..07feb8b 100644
--- a/autoload/lsp_settings.vim
+++ b/autoload/lsp_settings.vim
@@ -352,11 +352,8 @@ function! s:vim_lsp_load_or_suggest(ft) abort
if !empty(l:default) && l:default != l:server.command
continue
endif
- let l:command = lsp_settings#get(l:server.command, 'cmd', l:server.command)
- if type(l:command) == type([])
- let l:command = l:command[0]
- endif
- if !lsp_settings#executable(l:command)
+ let l:command = lsp_settings#get(l:server.command, 'cmd', [])
+ if empty(l:command) && !lsp_settings#executable(l:server.command)
let l:script = printf('%s/%s.vim', s:checkers_dir, l:server.command)
if !filereadable(l:script) || has_key(l:server, 'fallback')
continue