diff options
| author | mattn <mattn.jp@gmail.com> | 2020-01-31 18:40:20 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 18:40:20 +0900 |
| commit | a9df331431592bee084c95de918a031984d9a899 (patch) | |
| tree | 57879be2f87c99978fc7bdcad0b3b456d9112784 /autoload | |
| parent | f7f7863e01cb5e8e2a928ee4e05da8b46ae24a4b (diff) | |
| parent | ba47b4e67fe42073c5178606774416cac15f9b06 (diff) | |
| download | vim-lsp-settings-a9df331431592bee084c95de918a031984d9a899.tar.gz vim-lsp-settings-a9df331431592bee084c95de918a031984d9a899.tar.bz2 vim-lsp-settings-a9df331431592bee084c95de918a031984d9a899.zip | |
Merge pull request #139 from mattn/works-as-your-specified
Should work with the user's wrong settings
Diffstat (limited to 'autoload')
| -rw-r--r-- | autoload/lsp_settings.vim | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim index 0b149f1..55d9452 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 @@ -401,6 +398,10 @@ function! s:vim_lsp_load_or_suggest(ft) abort endif endfunction +function! lsp_settings#clear() abort + let s:ftmap = {} +endfunction + function! lsp_settings#init() abort for l:ft in keys(s:settings) if has_key(g:, 'lsp_settings_whitelist') && index(g:lsp_settings_whitelist, l:ft) == -1 || empty(s:settings[l:ft]) @@ -408,7 +409,7 @@ function! lsp_settings#init() abort endif exe 'augroup' lsp_settings#utils#group_name(l:ft) autocmd! - exe 'autocmd FileType' l:ft 'call s:vim_lsp_load_or_suggest(' string(l:ft) ')' + exe 'autocmd FileType' l:ft printf("call s:vim_lsp_load_or_suggest('%s')", l:ft) augroup END endfor augroup vim_lsp_suggest |