aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autoload/lsp_settings.vim8
1 files changed, 4 insertions, 4 deletions
diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim
index df2a60f..67c630e 100644
--- a/autoload/lsp_settings.vim
+++ b/autoload/lsp_settings.vim
@@ -360,12 +360,12 @@ function! s:vim_lsp_load_or_suggest(ft) abort
try
let l:root = lsp#utils#find_nearest_parent_directory('.', '.vim-lsp-settings')
- if !empty(l:root) && filereadable(l:root . '/config.json')
- let l:config = json_decode(join(readfile(l:root . '/config.json'), "\n"))
+ if !empty(l:root) && filereadable(l:root . '/settings.json')
+ let l:settings = json_decode(join(readfile(l:root . '/settings.json'), "\n"))
if has_key(g:, 'lsp_settings')
- call lsp_settings#utils#merge(g:lsp_settings, l:config)
+ call lsp_settings#utils#merge(g:lsp_settings, l:settings)
else
- let g:lsp_settings = l:config
+ let g:lsp_settings = l:settings
endif
endif
catch