averello/vim-lsp-mirror
1
0
Fork 0
mirror of https://github.com/prabirshrestha/vim-lsp.git synced 2025-12-14 20:35:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Export root_uri resolved (#729)

Browse Source 
* Export root_uri resolved

* Avoid uninitialized
This commit is contained in:
mattn
2020-02-25 17:39:16 +09:00
committed by GitHub
parent 6f3d2d4e79
commit 80ec75e1da
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
autoload/lsp.vim
View File

@@ -85,6 +85,10 @@ function! lsp#get_server_info(server_name) abort
return s:servers[a:server_name]['server_info']
endfunction
function! lsp#get_server_root_uri(server_name) abort
return get(s:servers[a:server_name]['server_info'], '_root_uri_resolved', '')
endfunction
function! lsp#get_server_capabilities(server_name) abort
let l:server = s:servers[a:server_name]
return has_key(l:server, 'init_result') ? l:server['init_result']['result']['capabilities'] : {}
@@ -514,18 +518,13 @@ function! s:ensure_init(buf, server_name, cb) abort
" server has already started, but not initialized
let l:server_info = l:server['server_info']
if has_key(l:server_info, 'root_uri')
let l:root_uri = l:server_info['root_uri'](l:server_info)
else
let l:root_uri = lsp#utils#get_default_root_uri()
endif
let l:root_uri = has_key(l:server_info, 'root_uri') ? l:server_info['root_uri'](l:server_info) : ''
if empty(l:root_uri)
let l:msg = s:new_rpc_error('ignore initialization lsp server due to empty root_uri', { 'server_name': a:server_name, 'lsp_id': l:server['lsp_id'] })
call lsp#log(l:msg)
call a:cb(l:msg)
return
let l:root_uri = lsp#utils#get_default_root_uri()
endif
let l:server['server_info']['_root_uri_resolved'] = l:root_uri
if has_key(l:server_info, 'capabilities')
let l:capabilities = l:server_info['capabilities']