averello/vim-lsp-settings-mirror
1
0
Fork 0
mirror of https://github.com/mattn/vim-lsp-settings.git synced 2025-12-12 20:35:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prefer settings.json

Browse Source
This commit is contained in:
Yasuhiro Matsumoto
2020-02-15 23:14:32 +09:00
parent 01f3c1a5d9
commit 59587f9325
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autoload/lsp_settings.vim
View File

@@ -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