Merge pull request #15 from mattn/lsp-register-server

Add LspRegisterServer

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()

settings/bash-language-server.vim

@@ -1,12 +1,12 @@
 augroup vimlsp_settings_bash_language_server
   au!
-  autocmd User lsp_setup ++once call lsp#register_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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
       \ 'whitelist': lsp_settings#get('bash-language-server', 'whitelist', ['sh']),
       \ 'blacklist': lsp_settings#get('bash-language-server', 'blacklist', []),
       \ 'config': lsp_settings#get('bash-language-server', 'config', {}),
       \ 'workspace_config': lsp_settings#get('bash-language-server', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/clangd.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_clangd
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  LspRegisterServer {
       \ 'name': 'clangd',
       \ 'cmd': {server_info->lsp_settings#get('clangd', 'cmd', [lsp_settings#exec_path('clangd')])},
       \ 'root_uri':{server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/']))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_clangd
       \ 'blacklist': lsp_settings#get('clangd', 'blacklist', []),
       \ 'config': lsp_settings#get('clangd', 'config', {}),
       \ 'workspace_config': lsp_settings#get('clangd', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/clojure-lsp.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_clojure_lsp
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  LspRegisterServer {
       \ 'name': 'clojure-lsp',
       \ 'cmd': {server_info->lsp_settings#get('clojure-lsp', 'cmd', [lsp_settings#exec_path('clojure-lsp')])},
       \ 'root_uri':{server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/']))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_clojure_lsp
       \ 'blacklist': lsp_settings#get('clojure-lsp', 'blacklist', []),
       \ 'config': lsp_settings#get('clojure-lsp', 'config', {}),
       \ 'workspace_config': lsp_settings#get('clojure-lsp', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/css-languageserver.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_css_languageserver
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/']))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_css_languageserver
       \ 'blacklist': lsp_settings#get('css-languageserver', 'blacklist', []),
       \ 'config': lsp_settings#get('css-languageserver', 'config', v:null),
       \ 'workspace_config': lsp_settings#get('css-languageserver', 'workspace_config', {'css-languageserver': {'css.lint.validProperties': [], 'less.lint.validProperties': [], 'scss.lint.validProperties': []}}),
-      \ })
+      \ }
 augroup END

settings/docker-langserver.vim

@@ -1,12 +1,12 @@
 augroup vimlsp_settings_dockerfile_language_server_nodejs
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/']))},
       \ 'whitelist': lsp_settings#get('docker-langserver', 'whitelist', ['dockerfile']),
       \ 'blacklist': lsp_settings#get('docker-langserver', 'blacklist', []),
       \ 'config': lsp_settings#get('docker-langserver', 'config', {}),
       \ 'workspace_config': lsp_settings#get('docker-langserver', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/eclipse-jdt-ls.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_eclipse_jdt_ls
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/']))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_eclipse_jdt_ls
       \ 'blacklist': lsp_settings#get('eclipse-jdt-ls', 'blacklist', []),
       \ 'config': lsp_settings#get('eclipse-jdt-ls', 'config', {}),
       \ 'workspace_config': lsp_settings#get('eclipse-jdt-ls', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/emmylua-ls.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_emmylua_ls
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  LspRegisterServer {
       \ 'name': 'emmylua-ls',
       \ 'cmd': {server_info->lsp_settings#get('emmylua-ls', 'cmd', [lsp_settings#exec_path('emmylua-ls')])},
       \ 'root_uri':{server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/']))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_emmylua_ls
       \ 'blacklist': lsp_settings#get('emmylua-ls', 'blacklist', []),
       \ 'config': lsp_settings#get('emmylua-ls', 'config', {}),
       \ 'workspace_config': lsp_settings#get('emmylua-ls', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/fortls.vim

@@ -1,12 +1,12 @@
 augroup vimlsp_settings_fortls
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  LspRegisterServer {
       \ 'name': 'fortls',
       \ 'cmd': {server_info->lsp_settings#get('fortls', 'cmd', [lsp_settings#exec_path('fortls')])},
       \ 'initialization_options': lsp_settings#get('fortls', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('fortls', 'whitelist', ['fortran']),
       \ 'blacklist': lsp_settings#get('fortls', 'blacklist', []),
       \ 'config': lsp_settings#get('fortls', 'config', {}),
       \ 'workspace_config': lsp_settings#get('fortls', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/gopls.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_gopls
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/', 'go.mod'])))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_gopls
       \ 'blacklist': lsp_settings#get('gopls', 'blacklist', []),
       \ 'config': lsp_settings#get('gopls', 'config', {}),
       \ 'workspace_config': lsp_settings#get('gopls', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/html-languageserver.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_html_languageserver
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_html_languageserver
       \ 'blacklist': lsp_settings#get('html-languageserver', 'blacklist', []),
       \ 'config': lsp_settings#get('html-languageserver', 'config', {}),
       \ 'workspace_config': lsp_settings#get('html-languageserver', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/intelephense-server.vim

@@ -1,12 +1,12 @@
 augroup vimlsp_settings_intelephense_server
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  LspRegisterServer {
       \ 'name': 'intelephense',
       \ 'cmd': {server_info->lsp_settings#get('intelephense', 'cmd', [lsp_settings#exec_path('intelephense-server'), '--stdio'])},
       \ 'root_uri':{server_info->lsp_settings#get('intelephense', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
       \ 'whitelist': lsp_settings#get('intelephense', 'whitelist', ['php']),
       \ 'blacklist': lsp_settings#get('intelephense', 'blacklist', []),
       \ 'config': lsp_settings#get('intelephense', 'config', {}),
       \ 'workspace_config': lsp_settings#get('intelephense', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/javascript-typescript-langserver.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_javascript_typescript_langserver
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  LspRegisterServer {
       \ 'name': 'javascript-typescript-langserver',
       \ 'cmd': {server_info->lsp_settings#get('javascript-typescript-langserver', 'cmd', [lsp_settings#exec_path('javascript-typescript-langserver')])},
       \ 'root_uri':{server_info->lsp_settings#get('javascript-typescript-langserver', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_javascript_typescript_langserver
       \ 'blacklist': lsp_settings#get('javascript-typescript-langserver', 'blacklist', []),
       \ 'config': lsp_settings#get('javascript-typescript-langserver', 'config', {}),
       \ 'workspace_config': lsp_settings#get('javascript-typescript-langserver', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/kotlin-language-server.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_kotlin_language_server
   au!
-  autocmd User lsp_setup ++once call lsp#register_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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_kotlin_language_server
       \ 'blacklist': lsp_settings#get('kotlin-language-server', 'blacklist', []),
       \ 'config': lsp_settings#get('kotlin-language-server', 'config', {}),
       \ 'workspace_config': lsp_settings#get('kotlin-language-server', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/lsp4xml.vim

@@ -1,12 +1,12 @@
 augroup vimlsp_settings_lsp4xml
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
       \ 'whitelist': lsp_settings#get('lsp4xml', 'whitelist', ['xml']),
       \ 'blacklist': lsp_settings#get('lsp4xml', 'blacklist', []),
       \ 'config': lsp_settings#get('lsp4xml', 'config', {}),
       \ 'workspace_config': lsp_settings#get('lsp4xml', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/metals.vim

@@ -1,12 +1,12 @@
 augroup vimlsp_settings_metals
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/', 'build.sbt'])))},
       \ 'whitelist': lsp_settings#get('metals', 'whitelist', ['scala', 'sbt']),
       \ 'blacklist': lsp_settings#get('metals', 'blacklist', []),
       \ 'config': lsp_settings#get('metals', 'config', {}),
       \ 'workspace_config': lsp_settings#get('metals', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/omnisharp-lsp.vim

@@ -1,12 +1,12 @@
 augroup vimlsp_settings_omnisharp_lsp
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  LspRegisterServer {
       \ 'name': 'omnisharp-lsp',
       \ 'root_uri':{server_info->lsp_settings#get('omnisharp-lsp', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
       \ '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', []),
       \ 'config': lsp_settings#get('omnisharp-lsp', 'config', {}),
       \ 'workspace_config': lsp_settings#get('omnisharp-lsp', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/pyls.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_pyls
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_pyls
       \ 'blacklist': lsp_settings#get('pyls', 'blacklist', []),
       \ 'config': lsp_settings#get('pyls', 'config', {}),
       \ 'workspace_config': lsp_settings#get('pyls', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/rls.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_rls
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_rls
       \ 'blacklist': lsp_settings#get('rls', 'blacklist', []),
       \ 'config': lsp_settings#get('rls', 'config', {}),
       \ 'workspace_config': lsp_settings#get('rls', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/solargraph.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_solargraph
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_solargraph
       \ 'blacklist': lsp_settings#get('solargraph', 'blacklist', []),
       \ 'config': lsp_settings#get('solargraph', 'config', {}),
       \ 'workspace_config': lsp_settings#get('solargraph', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/terraform-lsp.vim

@@ -1,12 +1,12 @@
 augroup vimlsp_settings_terraform_lsp
   au!
-  autocmd User lsp_setup ++once call lsp#register_server({
+  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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
       \ 'whitelist': lsp_settings#get('terraform-lsp', 'whitelist', ['terraform']),
       \ 'blacklist': lsp_settings#get('terraform-lsp', 'blacklist', []),
       \ 'config': lsp_settings#get('terraform-lsp', 'config', {}),
       \ 'workspace_config': lsp_settings#get('terraform-lsp', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/typescript-language-server.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_typescript_language_server
   au!
-  autocmd User lsp_setup ++once call lsp#register_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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_typescript_language_server
       \ 'blacklist': lsp_settings#get('typescript-language-server', 'blacklist', []),
       \ 'config': lsp_settings#get('typescript-language-server', 'config', {}),
       \ 'workspace_config': lsp_settings#get('typescript-language-server', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END

settings/vim-language-server.vim

@@ -1,6 +1,6 @@
 augroup vimlsp_settings_vim_language_server
   au!
-  autocmd User lsp_setup ++once call lsp#register_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#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
@@ -9,5 +9,5 @@ augroup vimlsp_settings_vim_language_server
       \ 'blacklist': lsp_settings#get('bash-language-server', 'blacklist', []),
       \ 'config': lsp_settings#get('bash-language-server', 'config', {}),
       \ 'workspace_config': lsp_settings#get('bash-language-server', 'workspace_config', {}),
-      \ })
+      \ }
 augroup END