load_schemas is used also from json

This commit is contained in:
Yasuhiro Matsumoto
2021-12-03 01:46:53 +09:00
parent 65e078604b
commit dff3c25829
2 changed files with 6 additions and 1 deletions

View File

@@ -68,6 +68,11 @@ endfunction
let s:catalog_path = expand('<sfile>:h:h:h') . '/data/catalog.json'
function! lsp_settings#utils#load_schemas(name) abort
let l:schemas = json_decode(join(readfile(s:catalog_path), "\n"))['schemas']
return extend(l:schemas, lsp_settings#get(a:name, 'schemas', []))
endfunction
function! lsp_settings#utils#load_schemas_map(name) abort
let l:schemas = json_decode(join(readfile(s:catalog_path), "\n"))['schemas']
let l:result = {}
for l:v in extend(l:schemas, lsp_settings#get(a:name, 'schemas', []))

View File

@@ -8,7 +8,7 @@ augroup vim_lsp_settings_yaml_language_server
\ 'allowlist': lsp_settings#get('yaml-language-server', 'allowlist', ['yaml']),
\ 'blocklist': lsp_settings#get('yaml-language-server', 'blocklist', []),
\ 'config': lsp_settings#get('yaml-language-server', 'config', lsp_settings#server_config('yaml-language-server')),
\ 'workspace_config': lsp_settings#merge('yaml-language-server', 'workspace_config', {'yaml': {'format': {'enable': v:true}, 'schemas': lsp_settings#utils#load_schemas('yaml-language-server')}}),
\ 'workspace_config': lsp_settings#merge('yaml-language-server', 'workspace_config', {'yaml': {'format': {'enable': v:true}, 'schemas': lsp_settings#utils#load_schemas_map('yaml-language-server')}}),
\ 'semantic_highlight': lsp_settings#get('yaml-language-server', 'semantic_highlight', {}),
\ }
augroup END