Skip to content

Commit 9c6422a

Browse files
committed
vim/lsp: resolved_capabilities -> server_capabilities for Neovim v0.8.0
Ref: neovim/neovim#17814
1 parent 8424796 commit 9c6422a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

dotfile/common/vim/.vim/pack/klw0/opt/lsp/autoload/lsp.vim

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
let s:undo_configure_key = 'undo_lsp_configure_buffer'
22

3-
function! lsp#ConfigureBuffer(client_capabilities) abort
3+
function! lsp#ConfigureBuffer(capabilities) abort
44
nnoremap <buffer><silent> gD :lua vim.lsp.buf.declaration()<CR>
55
let b:[s:undo_configure_key] = '| silent! nunmap <buffer> gD'
66

@@ -25,19 +25,19 @@ function! lsp#ConfigureBuffer(client_capabilities) abort
2525
setlocal tagfunc=v:lua.vim.lsp.tagfunc
2626
let b:[s:undo_configure_key] .= '| setlocal tagfunc<'
2727

28-
if a:client_capabilities.completion
28+
if has_key(a:capabilities, "completionProvider")
2929
setlocal omnifunc=v:lua.vim.lsp.omnifunc
3030
let b:[s:undo_configure_key] .= '| setlocal omnifunc<'
3131
endif
3232

33-
if a:client_capabilities.document_formatting
34-
autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_sync()
33+
if has_key(a:capabilities, "documentFormattingProvider")
34+
autocmd BufWritePre <buffer> lua vim.lsp.buf.format()
3535
let b:[s:undo_configure_key] .= '| autocmd! BufWritePre <buffer>'
3636
endif
3737

3838
let l:code_actions = []
39-
if type(a:client_capabilities.code_action) == v:t_dict
40-
let l:code_actions = get(a:client_capabilities.code_action, 'codeActionKinds', [])
39+
if has_key(a:capabilities, "codeActionProvider")
40+
let l:code_actions = get(a:capabilities.codeActionProvider, 'codeActionKinds', [])
4141
endif
4242

4343
if match(l:code_actions, 'source.organizeImports') != -1

dotfile/common/vim/.vimrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ lua << EOF
271271
local lspconfig = require('lspconfig')
272272

273273
local on_attach = function(client)
274-
vim.fn["lsp#ConfigureBuffer"](client.resolved_capabilities)
274+
vim.fn["lsp#ConfigureBuffer"](client.server_capabilities)
275275
end
276276

277277
local servers = {

0 commit comments

Comments
 (0)