rearrange stuff
This commit is contained in:
parent
242b862cdc
commit
b60feb8dd2
1 changed files with 6 additions and 5 deletions
|
@ -2,15 +2,20 @@ require("lspkind").init({
|
||||||
mode = "symbol_text",
|
mode = "symbol_text",
|
||||||
})
|
})
|
||||||
|
|
||||||
|
local vim_lsp_capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
local lsp_capabilities = vim.tbl_deep_extend(
|
local lsp_capabilities = vim.tbl_deep_extend(
|
||||||
"force",
|
"force",
|
||||||
require("cmp_nvim_lsp").default_capabilities(),
|
require("cmp_nvim_lsp").default_capabilities(),
|
||||||
vim.lsp.protocol.make_client_capabilities(),
|
vim_lsp_capabilities,
|
||||||
{ workspace = { didChangeConfiguration = { dynamicRegistration = true } } }
|
{ workspace = { didChangeConfiguration = { dynamicRegistration = true } } }
|
||||||
)
|
)
|
||||||
|
|
||||||
local lspconfig = require("lspconfig")
|
local lspconfig = require("lspconfig")
|
||||||
|
|
||||||
|
lspconfig.gopls.setup({
|
||||||
|
capabilities = lsp_capabilities,
|
||||||
|
})
|
||||||
|
|
||||||
lspconfig.lua_ls.setup({
|
lspconfig.lua_ls.setup({
|
||||||
capabilities = lsp_capabilities,
|
capabilities = lsp_capabilities,
|
||||||
on_init = function(client)
|
on_init = function(client)
|
||||||
|
@ -39,10 +44,6 @@ lspconfig.nixd.setup({
|
||||||
capabilities = lsp_capabilities,
|
capabilities = lsp_capabilities,
|
||||||
})
|
})
|
||||||
|
|
||||||
lspconfig.gopls.setup({
|
|
||||||
capabilities = lsp_capabilities,
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<F2>", vim.diagnostic.goto_prev)
|
vim.keymap.set("n", "<F2>", vim.diagnostic.goto_prev)
|
||||||
vim.keymap.set("n", "<F3>", vim.diagnostic.goto_next)
|
vim.keymap.set("n", "<F3>", vim.diagnostic.goto_next)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue