averello/vim-lsp-mirror
1
0
Fork 0
mirror of https://github.com/prabirshrestha/vim-lsp.git synced 2026-06-09 15:37:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

support hierarchical document symbol even if we don't explicilty set it to true (#631)

Browse Source
This commit is contained in:
Prabir Shrestha
2019-12-26 13:52:46 -08:00
committed by GitHub
parent 7ccab31b79
commit ae1aa1459f
1 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoload/lsp/ui/vim/utils.vim
+49 -14
View File
@@ -105,6 +105,24 @@ let s:diagnostic_severity = {
\ 4: 'Hint',
\ }
function! s:symbols_to_loc_list_children(server, path, list, symbols, depth) abort
for l:symbol in a:symbols
let l:line = l:symbol['range']['start']['line'] + 1
let l:char = l:symbol['range']['start']['character']
let l:col = lsp#utils#to_col(a:path, l:line, l:char)
call add(a:list, {
\ 'filename': a:path,
\ 'lnum': l:line,
\ 'col': l:col,
\ 'text': s:get_symbol_text_from_kind(a:server, l:symbol['kind']) . ' : ' . printf('%' . a:depth. 's', ' ') . l:symbol['name'],
\ })
if has_key(l:symbol, 'children') && !empty(l:symbol['children'])
call s:symbols_to_loc_list_children(a:server, a:path, a:list, l:symbol['children'], a:depth + 1)
endif
endfor
endfunction
function! lsp#ui#vim#utils#symbols_to_loc_list(server, result) abort
if !has_key(a:result['response'], 'result')
return []
@@ -116,19 +134,37 @@ function! lsp#ui#vim#utils#symbols_to_loc_list(server, result) abort
if !empty(l:locations) " some servers also return null so check to make sure it isn't empty
for l:symbol in a:result['response']['result']
let l:location = l:symbol['location']
if s:is_file_uri(l:location['uri'])
let l:path = lsp#utils#uri_to_path(l:location['uri'])
let l:bufnr = bufnr(l:path)
let l:line = l:location['range']['start']['line'] + 1
let l:char = l:location['range']['start']['character']
let l:col = lsp#utils#to_col(l:path, l:line, l:char)
call add(l:list, {
\ 'filename': l:path,
\ 'lnum': l:line,
\ 'col': l:col,
\ 'text': s:get_symbol_text_from_kind(a:server, l:symbol['kind']) . ' : ' . l:symbol['name'],
\ })
if has_key(l:symbol, 'location')
let l:location = l:symbol['location']
if s:is_file_uri(l:location['uri'])
let l:path = lsp#utils#uri_to_path(l:location['uri'])
let l:line = l:location['range']['start']['line'] + 1
let l:char = l:location['range']['start']['character']
let l:col = lsp#utils#to_col(l:path, l:line, l:char)
call add(l:list, {
\ 'filename': l:path,
\ 'lnum': l:line,
\ 'col': l:col,
\ 'text': s:get_symbol_text_from_kind(a:server, l:symbol['kind']) . ' : ' . l:symbol['name'],
\ })
endif
else
let l:location = a:result['request']['params']['textDocument']['uri']
if s:is_file_uri(l:location)
let l:path = lsp#utils#uri_to_path(l:location)
let l:line = l:symbol['range']['start']['line'] + 1
let l:char = l:symbol['range']['start']['character']
let l:col = lsp#utils#to_col(l:path, l:line, l:char)
call add(l:list, {
\ 'filename': l:path,
\ 'lnum': l:line,
\ 'col': l:col,
\ 'text': s:get_symbol_text_from_kind(a:server, l:symbol['kind']) . ' : ' . l:symbol['name'],
\ })
if has_key(l:symbol, 'children') && !empty(l:symbol['children'])
call s:symbols_to_loc_list_children(a:server, l:path, l:list, l:symbol['children'], 1)
endif
endif
endif
endfor
endif
@@ -148,7 +184,6 @@ function! lsp#ui#vim#utils#diagnostics_to_loc_list(result) abort
if !empty(l:diagnostics) && s:is_file_uri(l:uri)
let l:path = lsp#utils#uri_to_path(l:uri)
let l:bufnr = bufnr(l:path)
for l:item in l:diagnostics
let l:text = ''
if has_key(l:item, 'source') && !empty(l:item['source'])