aboutsummaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authormattn <mattn.jp@gmail.com>2019-12-25 12:00:47 +0900
committerGitHub <noreply@github.com>2019-12-25 12:00:47 +0900
commitd7353a2bf491e1e6c7d4f7bf1e54e624fb7955e1 (patch)
tree5599f3d8611e300406164a7429a361eb24260cb5 /plugin
parent73153e820f1748e23aaa2e1e6b8717aefb44ba9e (diff)
parent3497ec2aaf4d325189d7fda76a027827c270cef8 (diff)
downloadvim-lsp-settings-d7353a2bf491e1e6c7d4f7bf1e54e624fb7955e1.tar.gz
vim-lsp-settings-d7353a2bf491e1e6c7d4f7bf1e54e624fb7955e1.tar.bz2
vim-lsp-settings-d7353a2bf491e1e6c7d4f7bf1e54e624fb7955e1.zip
Merge pull request #15 from mattn/lsp-register-server
Add LspRegisterServer
Diffstat (limited to 'plugin')
-rw-r--r--plugin/lsp_settings.vim20
1 files changed, 17 insertions, 3 deletions
diff --git a/plugin/lsp_settings.vim b/plugin/lsp_settings.vim
index 8ba6d39..68c0bb5 100644
--- a/plugin/lsp_settings.vim
+++ b/plugin/lsp_settings.vim
@@ -102,8 +102,10 @@ function! s:vimlsp_settings_suggest() abort
if empty(s:vimlsp_installer())
return
endif
- echomsg 'If you want to enable Language Server, please do :LspInstallServer'
- command! -buffer LspInstallServer call s:vimlsp_install_server()
+ if !exists(':LspInstallServer')
+ echomsg 'If you want to enable Language Server, please do :LspInstallServer'
+ command! -buffer LspInstallServer call s:vimlsp_install_server()
+ endif
endfunction
function! s:vimlsp_settings_get(name, key, default) abort
@@ -123,6 +125,12 @@ function! s:vimlsp_settings_get(name, key, default) abort
endfunction
function! s:vimlsp_setting() abort
+ if has('patch-8.1.1113')
+ command! -nargs=1 LspRegisterServer autocmd User lsp_setup ++once call lsp#register_server(<args>)
+ else
+ command! -nargs=1 LspRegisterServer autocmd User lsp_setup call lsp#register_server(<args>)
+ endif
+
for l:ft in keys(s:settings)
if has_key(g:, 'lsp_settings_whitelist') && index(g:lsp_settings_whitelist, l:ft) == -1
continue
@@ -148,12 +156,18 @@ function! s:vimlsp_setting() abort
if l:found ==# 0
exe printf('augroup vimlsp_suggest_%s', l:ft)
au!
- exe printf('autocmd FileType %s ++once call s:vimlsp_settings_suggest()', l:ft)
+ if has('patch-8.1.1113')
+ exe printf('autocmd FileType %s ++once call s:vimlsp_settings_suggest()', l:ft)
+ else
+ exe printf('autocmd FileType %s call s:vimlsp_settings_suggest()', l:ft)
+ endif
augroup END
elseif !empty(s:vimlsp_installer())
command! -buffer LspInstallServer call s:vimlsp_install_server()
endif
endfor
+
+ delcommand LspRegisterServer
endfunction
call s:vimlsp_setting()