diff options
author | mattn <mattn.jp@gmail.com> | 2020-01-24 17:26:32 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-24 17:26:32 +0900 |
commit | 3692375c5c5a3ce609bf17c76e1413ddf5970bba (patch) | |
tree | fb9964e8be4b28f3bfad8624b40645585278e877 | |
parent | 3b5c80cf983a82f78ee98a2d6d7dacc7703de1c2 (diff) | |
parent | 02166bb14a6c30e910f97bd8ab8cf570ca98bc7c (diff) | |
download | vim-lsp-settings-3692375c5c5a3ce609bf17c76e1413ddf5970bba.tar.gz vim-lsp-settings-3692375c5c5a3ce609bf17c76e1413ddf5970bba.tar.bz2 vim-lsp-settings-3692375c5c5a3ce609bf17c76e1413ddf5970bba.zip |
Merge pull request #102 from sgur/fix/vim-initialization_options
Use the initialization_options value of g:lsp_settings in vim-language-server
-rw-r--r-- | settings/vim-language-server.vim | 4 |
1 files changed, 2 insertions, 2 deletions
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', {}), |