aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuc Nghiem-Xuan <git@ducnx.com>2020-01-29 23:21:30 +0900
committerDuc Nghiem-Xuan <git@ducnx.com>2020-01-29 23:21:30 +0900
commit242bba9d0df3c35b931f148ffb08ab945a14b015 (patch)
tree0f20ea84802fad44ca943e995beb27533b585c21
parent54b401800bd2322bb40151cd63269ad3a39ebb35 (diff)
downloadvim-lsp-settings-242bba9d0df3c35b931f148ffb08ab945a14b015.tar.gz
vim-lsp-settings-242bba9d0df3c35b931f148ffb08ab945a14b015.tar.bz2
vim-lsp-settings-242bba9d0df3c35b931f148ffb08ab945a14b015.zip
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.
-rw-r--r--plugin/lsp_settings.vim2
1 files changed, 1 insertions, 1 deletions
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, '')