diff options
| author | mattn <mattn.jp@gmail.com> | 2020-01-25 00:04:46 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-25 00:04:46 +0900 |
| commit | 46193cac27c6ae28f5e85cfb2cdedb2075a43209 (patch) | |
| tree | ab0714def72a73bdb509d149625d1d86b1342588 /settings | |
| parent | ac91e517302380f0b5b50b06837789036d639ac8 (diff) | |
| parent | 431fb236bfb6dd70b98c6c453a2dc48d780bcb74 (diff) | |
| download | vim-lsp-settings-46193cac27c6ae28f5e85cfb2cdedb2075a43209.tar.gz vim-lsp-settings-46193cac27c6ae28f5e85cfb2cdedb2075a43209.tar.bz2 vim-lsp-settings-46193cac27c6ae28f5e85cfb2cdedb2075a43209.zip | |
Merge branch 'master' into efm
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/json-languageserver.vim | 2 | ||||
| -rw-r--r-- | settings/vim-language-server.vim | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/settings/json-languageserver.vim b/settings/json-languageserver.vim index d7e79ca..a19b3b6 100644 --- a/settings/json-languageserver.vim +++ b/settings/json-languageserver.vim @@ -5,7 +5,7 @@ augroup vimlsp_settings_json_languageserver \ 'cmd': {server_info->lsp_settings#get('json-languageserver', 'cmd', [lsp_settings#exec_path('json-languageserver'), '--stdio'])}, \ 'root_uri':{server_info->lsp_settings#get('json-languageserver', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))}, \ 'initialization_options': lsp_settings#get('json-languageserver', 'initialization_options', v:null), - \ 'whitelist': lsp_settings#get('json-languageserver', 'whitelist', ['json']), + \ 'whitelist': lsp_settings#get('json-languageserver', 'whitelist', ['json', 'jsonc']), \ 'blacklist': lsp_settings#get('json-languageserver', 'blacklist', []), \ 'config': lsp_settings#get('json-languageserver', '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']}}}), diff --git a/settings/vim-language-server.vim b/settings/vim-language-server.vim index ab91f10..e31efed 100644 --- a/settings/vim-language-server.vim +++ b/settings/vim-language-server.vim @@ -4,8 +4,8 @@ augroup vimlsp_settings_vim_language_server \ 'name': 'vim-language-server', \ 'cmd': {server_info->lsp_settings#get('vim-language-server', 'cmd', [lsp_settings#exec_path('vim-language-server'), '--stdio'])}, \ 'root_uri':{server_info->lsp_settings#get('vim-language-server', 'root_uri', lsp_settings#root_uri(extend(['.vim/', 'vimfiles/'], g:lsp_settings_root_markers)))}, - \ 'initialization_options': { 'vimruntime': $VIMRUNTIME, 'runtimepath': &rtp }, - \ 'whitelist': lsp_settings#get('vim-language-server', 'whitelist', ['vim']), + \ 'initialization_options': extend({'vimruntime': $VIMRUNTIME, 'runtimepath': &rtp}, lsp_settings#get('vim-language-server', 'initialization_options', {}), 'force'), + \ 'whitelist': lsp_settings#get('vim-language-server', 'whitelist', ['vim']), \ 'blacklist': lsp_settings#get('vimbash-language-server', 'blacklist', []), \ 'config': lsp_settings#get('vim-language-server', 'config', {}), \ 'workspace_config': lsp_settings#get('vim-language-server', 'workspace_config', {}), |