aboutsummaryrefslogtreecommitdiff
path: root/settings
diff options
context:
space:
mode:
authormattn <mattn.jp@gmail.com>2020-01-19 00:04:38 +0900
committerGitHub <noreply@github.com>2020-01-19 00:04:38 +0900
commitb5760117d42a3e8e4aa3953ed252438866ea40aa (patch)
tree47af62c2b8bdd888764e7705ddef6f51c11d4236 /settings
parent92500966993fd19b8fe3050b1c2d9572a46151a6 (diff)
parentd6395d74a302d8a1e2fb17e17dfaf224c40bb89c (diff)
downloadvim-lsp-settings-b5760117d42a3e8e4aa3953ed252438866ea40aa.tar.gz
vim-lsp-settings-b5760117d42a3e8e4aa3953ed252438866ea40aa.tar.bz2
vim-lsp-settings-b5760117d42a3e8e4aa3953ed252438866ea40aa.zip
Merge pull request #90 from mattn/json-schemas
JSON Schemas
Diffstat (limited to 'settings')
-rw-r--r--settings/json-languageserver.vim2
-rw-r--r--settings/yaml-language-server.vim2
2 files changed, 2 insertions, 2 deletions
diff --git a/settings/json-languageserver.vim b/settings/json-languageserver.vim
index e1f3375..b233342 100644
--- a/settings/json-languageserver.vim
+++ b/settings/json-languageserver.vim
@@ -8,6 +8,6 @@ augroup vimlsp_settings_json_languageserver
\ 'whitelist': lsp_settings#get('json-languageserver', 'whitelist', ['json']),
\ 'blacklist': lsp_settings#get('json-languageserver', 'blacklist', []),
\ 'config': lsp_settings#get('json-languageserver', 'config', {}),
- \ 'workspace_config': lsp_settings#get('json-languageserver', 'workspace_config', {}),
+ \ 'workspace_config': lsp_settings#get('json-languageserver', 'workspace_config', {name, key->{'json': {'format': {'enable': v:true}, 'schemas': json_decode(join(readfile(expand('<sfile>:h:h') . '/data/catalog.json'), "\n"))['schemas']}}}),
\ }
augroup END
diff --git a/settings/yaml-language-server.vim b/settings/yaml-language-server.vim
index 7fffc67..c9e91c8 100644
--- a/settings/yaml-language-server.vim
+++ b/settings/yaml-language-server.vim
@@ -8,6 +8,6 @@ augroup vimlsp_settings_yaml_language_server
\ 'whitelist': lsp_settings#get('yaml-language-server', 'whitelist', ['yaml']),
\ 'blacklist': lsp_settings#get('yaml-language-server', 'blacklist', []),
\ 'config': lsp_settings#get('yaml-language-server', 'config', {}),
- \ 'workspace_config': lsp_settings#get('yaml-language-server', 'workspace_config', {}),
+ \ 'workspace_config': lsp_settings#get('yaml-language-server', 'workspace_config', {name, key->{'json': {'format': {'enable': v:true}, 'schemas': json_decode(join(readfile(expand('<sfile>:h:h') . '/data/catalog.json'), "\n"))['schemas']}}}),
\ }
augroup END