diff options
| author | mattn <mattn.jp@gmail.com> | 2020-01-29 23:39:30 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-29 23:39:30 +0900 |
| commit | 73f40e2308586197424a875b5717a0c9514ddc36 (patch) | |
| tree | 68a50a2b7026dcbd2726400e64d9708e925f134b /plugin | |
| parent | 085fc82ade226146a15acd2145453093d8373051 (diff) | |
| parent | 242bba9d0df3c35b931f148ffb08ab945a14b015 (diff) | |
| download | vim-lsp-settings-73f40e2308586197424a875b5717a0c9514ddc36.tar.gz vim-lsp-settings-73f40e2308586197424a875b5717a0c9514ddc36.tar.bz2 vim-lsp-settings-73f40e2308586197424a875b5717a0c9514ddc36.zip | |
Merge pull request #112 from xuanduc987/priority_user_setting
Make g:lsp_settings higher priority than settings.json
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/lsp_settings.vim | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/lsp_settings.vim b/plugin/lsp_settings.vim index c4b93ef..58aa100 100644 --- a/plugin/lsp_settings.vim +++ b/plugin/lsp_settings.vim @@ -257,7 +257,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, '') |