Skip to content

Commit cf22c9e

Browse files
chore: use vim.lsp.config instead of require('lspconfig') (#2192)
* chore: use vim.lsp.config instead of require('lspconfig') Because neovim/nvim-lspconfig#4077 * chore: add vim.lsp.enable()
1 parent 22109dd commit cf22c9e

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ lua <<EOF
112112
{ name = 'buffer' },
113113
})
114114
})
115-
require("cmp_git").setup() ]]--
115+
require("cmp_git").setup() ]]--
116116
117117
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
118118
cmp.setup.cmdline({ '/', '?' }, {
@@ -136,9 +136,10 @@ lua <<EOF
136136
-- Set up lspconfig.
137137
local capabilities = require('cmp_nvim_lsp').default_capabilities()
138138
-- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
139-
require('lspconfig')['<YOUR_LSP_SERVER>'].setup {
139+
vim.lsp.config('<YOUR_LSP_SERVER>', {
140140
capabilities = capabilities
141-
}
141+
})
142+
vim.lsp.enable('<YOUR_LSP_SERVER>')
142143
EOF
143144
```
144145

doc/cmp.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,10 @@ A recommended configuration can be found below.
140140

141141
-- Setup lspconfig.
142142
local capabilities = require('cmp_nvim_lsp').default_capabilities()
143-
require('lspconfig')[%YOUR_LSP_SERVER%].setup {
143+
vim.lsp.config(%YOUR_LSP_SERVER%, {
144144
capabilities = capabilities
145-
}
145+
})
146+
vim.lsp.enable(%YOUR_LSP_SERVER%)
146147
EOF
147148
<
148149
==============================================================================

utils/vimrc.vim

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ EOF
4646
lua << EOF
4747
local capabilities = require('cmp_nvim_lsp').default_capabilities()
4848

49-
require'lspconfig'.cssls.setup {
49+
vim.lsp.config('cssls', {
5050
capabilities = capabilities,
51-
}
51+
})
52+
vim.lsp.enable('cssls')
5253
EOF
5354

0 commit comments

Comments
 (0)