Skip to content

Commit 04428c9

Browse files
authored
Improve checking for 'completionProvider' (#1574)
1 parent 356254d commit 04428c9

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

autoload/lsp/capabilities.vim

+4
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@ function! lsp#capabilities#get_code_action_kinds(server_name) abort
189189
return []
190190
endfunction
191191

192+
function! lsp#capabilities#has_completion_provider(server_name) abort
193+
return s:has_provider(a:server_name, 'completionProvider')
194+
endfunction
195+
192196
function! lsp#capabilities#has_completion_resolve_provider(server_name) abort
193197
return s:has_provider(a:server_name, 'completionProvider', 'resolveProvider')
194198
endfunction

autoload/lsp/omni.vim

+1-2
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ endfunction
204204
function! s:find_complete_servers() abort
205205
let l:server_names = []
206206
for l:server_name in lsp#get_allowed_servers()
207-
let l:init_capabilities = lsp#get_server_capabilities(l:server_name)
208-
if has_key(l:init_capabilities, 'completionProvider')
207+
if lsp#capabilities#has_completion_provider(l:server_name)
209208
" TODO: support triggerCharacters
210209
call add(l:server_names, l:server_name)
211210
endif

autoload/lsp/ui/vim/completion.vim

+1-5
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,7 @@ function! s:resolve_completion_item(completion_item, server_name) abort
197197
endif
198198

199199
" check server capabilities.
200-
let l:capabilities = lsp#get_server_capabilities(a:server_name)
201-
if !has_key(l:capabilities, 'completionProvider')
202-
\ || type(l:capabilities['completionProvider']) != v:t_dict
203-
\ || !has_key(l:capabilities['completionProvider'], 'resolveProvider')
204-
\ || !l:capabilities['completionProvider']['resolveProvider']
200+
if !lsp#capabilities#has_completion_resolve_provider(a:server_name)
205201
return a:completion_item
206202
endif
207203

0 commit comments

Comments
 (0)