diff --git a/nvim/lua/lsp-options.lua b/nvim/lua/lsp-options.lua index 7851027..b45a790 100644 --- a/nvim/lua/lsp-options.lua +++ b/nvim/lua/lsp-options.lua @@ -5,41 +5,45 @@ local keymap = vim.keymap local opts = { silent = true, noremap = true } M.on_attach = function(client, bufnr) - opts.buffer = bufnr + opts.buffer = bufnr - -- set keybinds - opts.desc = "See available code actions" - keymap.set({ "n", "v" }, "ca", vim.lsp.buf.code_action, opts) + -- set keybinds + opts.desc = "See available code actions" + keymap.set({ "n", "v" }, "ca", vim.lsp.buf.code_action, opts) - opts.desc = "Format current file" - keymap.set("n", "gf", vim.lsp.buf.format, opts) + opts.desc = "Format current file" + keymap.set("n", "gf", vim.lsp.buf.format, opts) - opts.desc = "Smart rename" - keymap.set("n", "n", vim.lsp.buf.rename, opts) + opts.desc = "Smart rename" + keymap.set("n", "n", vim.lsp.buf.rename, opts) - opts.desc = "Go to previous diagnostic" - keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) + opts.desc = "Go to previous diagnostic" + keymap.set("n", "[d", function() + vim.diagnostic.jump({ count = -1 }) + end, opts) - opts.desc = "Go to next diagnostic" - keymap.set("n", "]d", vim.diagnostic.goto_next, opts) + opts.desc = "Go to next diagnostic" + keymap.set("n", "]d", function() + vim.diagnostic.jump({ count = 1 }) + end, opts) - opts.desc = "Show documentation for what is under cursor" - keymap.set("n", "k", vim.lsp.buf.hover, opts) + opts.desc = "Show documentation for what is under cursor" + keymap.set("n", "k", vim.lsp.buf.hover, opts) - opts.desc = "Show signature help" - keymap.set("n", "v", vim.lsp.buf.signature_help, opts) + opts.desc = "Show signature help" + keymap.set("n", "v", vim.lsp.buf.signature_help, opts) - opts.desc = "Restart LSP" - keymap.set("n", "rs", ":LspRestart", opts) + opts.desc = "Restart LSP" + keymap.set("n", "rs", ":LspRestart", opts) - vim.opt.signcolumn = "yes" -- reserve space for diagnostics + vim.opt.signcolumn = "yes" -- reserve space for diagnostics end M.on_attach_no_formatting = function(client, bufnr) - M.on_attach(client, bufnr) + M.on_attach(client, bufnr) - client.server_capabilities.documentFormattingProvider = false - client.server_capabilities.documentRangeFormattingProvider = false + client.server_capabilities.documentFormattingProvider = false + client.server_capabilities.documentRangeFormattingProvider = false end -- used to enable autocompletion (assign to every lsp server config)