diff options
| -rw-r--r-- | plugin/lsp_settings.vim | 23 | ||||
| -rw-r--r-- | schema.json | 4 | ||||
| -rw-r--r-- | settings.json | 7 | ||||
| -rw-r--r-- | settings/efm-langserver.vim | 13 |
4 files changed, 36 insertions, 11 deletions
diff --git a/plugin/lsp_settings.vim b/plugin/lsp_settings.vim index 43c6225..1416097 100644 --- a/plugin/lsp_settings.vim +++ b/plugin/lsp_settings.vim @@ -41,8 +41,8 @@ function! s:executable(cmd) abort return 0 endfunction -function! s:vim_lsp_installer() abort - let l:ft = tolower(split(&filetype, '\.')[0]) +function! s:vimlsp_installer(ft) abort + let l:ft = tolower(split(a:ft, '\.')[0]) if !has_key(s:settings, l:ft) return [] endif @@ -105,8 +105,8 @@ function! s:vim_lsp_install_server_post(command, job, code, ...) abort endif endfunction -function! s:vim_lsp_install_server() abort - let l:entry = s:vim_lsp_installer() +function! s:vimlsp_install_server(ft) abort + let l:entry = s:vimlsp_installer(a:ft) if empty(l:entry) return endif @@ -128,8 +128,8 @@ function! s:vim_lsp_install_server() abort endif endfunction -function! s:vim_lsp_settings_suggest() abort - if empty(s:vim_lsp_installer()) +function! s:vimlsp_settings_suggest(ft) abort + if empty(s:vimlsp_installer(a:ft)) return endif if exists(':LspInstallServer') !=# 2 @@ -137,7 +137,7 @@ function! s:vim_lsp_settings_suggest() abort echohl Directory echomsg 'Please do :LspInstallServer to enable Language Server' echohl None - command! -buffer LspInstallServer call s:vim_lsp_install_server() + command! -buffer LspInstallServer call s:vimlsp_install_server(&l:filetype) endif endfunction @@ -214,7 +214,7 @@ function! s:vim_lsp_load_or_suggest(ft) abort let l:found = 0 for l:server in s:settings[a:ft] - if s:vim_lsp_settings_get(l:server.command, 'disabled', 0) + if get(l:server, 'disabled', 0) || s:vimlsp_settings_get(l:server.command, 'disabled', 0) continue endif let l:default = get(g:, 'lsp_settings_' . a:ft, '') @@ -255,11 +255,11 @@ function! s:vim_lsp_load_or_suggest(ft) abort endfor if l:found ==# 0 - call s:vim_lsp_settings_suggest() + call s:vimlsp_settings_suggest(a:ft) else doautocmd User lsp_setup if exists(':LspInstallServer') !=# 2 - command! -buffer LspInstallServer call s:vim_lsp_install_server() + command! -buffer LspInstallServer call s:vimlsp_install_server(&l:filetype) endif endif @@ -272,4 +272,5 @@ function! s:load_or_suggest_group_name(ft) abort return printf('vim_lsp_suggest_%s', a:ft) endfunction -call s:vim_lsp_settings() +call s:vimlsp_setting() +call s:vimlsp_load_or_suggest('_') diff --git a/schema.json b/schema.json index c9ccb91..2537af6 100644 --- a/schema.json +++ b/schema.json @@ -23,6 +23,10 @@ "description": "define name of language server", "type": "string" }, + "diabled": { + "description": "disable this server", + "type": "boolean" + }, "requires": { "description": "define commands to install this language server", "type": "array", diff --git a/settings.json b/settings.json index 105ca15..c374e70 100644 --- a/settings.json +++ b/settings.json @@ -1,5 +1,12 @@ { "$schema": "https://mattn.github.io/vim-lsp-settings/schema.json", + "_": [ + { + "command": "efm-langserver", + "disabled": true, + "requires": [] + } + ], "c": [ { "command": "clangd", diff --git a/settings/efm-langserver.vim b/settings/efm-langserver.vim new file mode 100644 index 0000000..1a7c8cc --- /dev/null +++ b/settings/efm-langserver.vim @@ -0,0 +1,13 @@ +augroup vimlsp_settings_efm_langserver + au! + LspRegisterServer { + \ 'name': 'efm-langserver', + \ 'cmd': {server_info->lsp_settings#get('efm-langserver', 'cmd', [lsp_settings#exec_path('efm-langserver')])}, + \ 'root_uri':{server_info->lsp_settings#get('efm-langserver', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, + \ 'initialization_options': lsp_settings#get('efm-langserver', 'initialization_options', v:null), + \ 'whitelist': lsp_settings#get('efm-langserver', 'whitelist', ['*']), + \ 'blacklist': lsp_settings#get('efm-langserver', 'blacklist', []), + \ 'config': lsp_settings#get('efm-langserver', 'config', {}), + \ 'workspace_config': lsp_settings#get('efm-langserver', 'workspace_config', {}), + \ } +augroup END |