mirror of
https://github.com/mattn/vim-lsp-settings.git
synced 2025-12-22 12:14:21 +01:00
load_schemas is used also from json
This commit is contained in:
@@ -68,6 +68,11 @@ endfunction
|
|||||||
let s:catalog_path = expand('<sfile>:h:h:h') . '/data/catalog.json'
|
let s:catalog_path = expand('<sfile>:h:h:h') . '/data/catalog.json'
|
||||||
|
|
||||||
function! lsp_settings#utils#load_schemas(name) abort
|
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:schemas = json_decode(join(readfile(s:catalog_path), "\n"))['schemas']
|
||||||
let l:result = {}
|
let l:result = {}
|
||||||
for l:v in extend(l:schemas, lsp_settings#get(a:name, 'schemas', []))
|
for l:v in extend(l:schemas, lsp_settings#get(a:name, 'schemas', []))
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ augroup vim_lsp_settings_yaml_language_server
|
|||||||
\ 'allowlist': lsp_settings#get('yaml-language-server', 'allowlist', ['yaml']),
|
\ 'allowlist': lsp_settings#get('yaml-language-server', 'allowlist', ['yaml']),
|
||||||
\ 'blocklist': lsp_settings#get('yaml-language-server', 'blocklist', []),
|
\ 'blocklist': lsp_settings#get('yaml-language-server', 'blocklist', []),
|
||||||
\ 'config': lsp_settings#get('yaml-language-server', 'config', lsp_settings#server_config('yaml-language-server')),
|
\ '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', {}),
|
\ 'semantic_highlight': lsp_settings#get('yaml-language-server', 'semantic_highlight', {}),
|
||||||
\ }
|
\ }
|
||||||
augroup END
|
augroup END
|
||||||
|
|||||||
Reference in New Issue
Block a user