From 242bba9d0df3c35b931f148ffb08ab945a14b015 Mon Sep 17 00:00:00 2001 From: Duc Nghiem-Xuan Date: Wed, 29 Jan 2020 23:21:30 +0900 Subject: Make g:lsp_settings higher priority than settings.json Config from g:lsp_settings should have higher priority so that user can enable efm-langserver without edit settings.json directly. --- plugin/lsp_settings.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/lsp_settings.vim b/plugin/lsp_settings.vim index 9c70970..e9933b3 100644 --- a/plugin/lsp_settings.vim +++ b/plugin/lsp_settings.vim @@ -255,7 +255,7 @@ function! s:vim_lsp_load_or_suggest(ft) abort let l:found = 0 for l:server in s:settings[a:ft] - if get(l:server, 'disabled', 0) || s:vim_lsp_settings_get(l:server.command, 'disabled', 0) + if s:vim_lsp_settings_get(l:server.command, 'disabled', get(l:server, 'disabled', 0)) continue endif let l:default = get(g:, 'lsp_settings_' . a:ft, '') -- cgit v1.2.3-54-g00ecf