diff options
| author | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2020-02-15 23:14:32 +0900 |
|---|---|---|
| committer | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2020-02-15 23:14:32 +0900 |
| commit | 59587f9325fbdb526da08a7c6b9ea9ef2780088a (patch) | |
| tree | a8479d0f6754f727e53f486f26908d7343ec3a6e /autoload | |
| parent | 01f3c1a5d919f0ab772a7485aa5c0e5f41f3341f (diff) | |
| download | vim-lsp-settings-59587f9325fbdb526da08a7c6b9ea9ef2780088a.tar.gz vim-lsp-settings-59587f9325fbdb526da08a7c6b9ea9ef2780088a.tar.bz2 vim-lsp-settings-59587f9325fbdb526da08a7c6b9ea9ef2780088a.zip | |
Prefer settings.json
Diffstat (limited to 'autoload')
| -rw-r--r-- | autoload/lsp_settings.vim | 8 |
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 |