Skip to content

Commit

Permalink
lsp: Simplify capabilities spec
Browse files Browse the repository at this point in the history
Previous merge was not needed, see
hrsh7th/cmp-nvim-lsp#44 (comment)
  • Loading branch information
shyun3 committed Nov 5, 2024
1 parent af7c1d0 commit 7bb467f
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions rc/config/nvim/lua/plugins/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,10 @@ return {
},

config = function()
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = vim.tbl_deep_extend(
"force",
capabilities,
require("cmp_nvim_lsp").default_capabilities()
)

require("mason-lspconfig").setup_handlers({
function(server_name)
require("lspconfig")[server_name].setup({
capabilities = capabilities,
capabilities = require("cmp_nvim_lsp").default_capabilities(),
on_attach = on_lsp_attach,
})
end,
Expand Down

0 comments on commit 7bb467f

Please sign in to comment.