From 43069da8b0c3e680d3db45c74942023af144f993 Mon Sep 17 00:00:00 2001 From: Oscar Wallberg Date: Mon, 4 Mar 2024 20:22:04 +0100 Subject: [PATCH] fix(lsp): update bindings --- lua/core/mappings.lua | 1 + lua/lsp.lua | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua index a903be4..a2293f4 100644 --- a/lua/core/mappings.lua +++ b/lua/core/mappings.lua @@ -57,6 +57,7 @@ vim.keymap.set({ "n", "i", }, "", -- Remove default mappings vim.keymap.set("", "", "") +vim.keymap.set({ "n", }, "K", "") -- Remove right-click menu items vim.cmd.aunmenu({ "PopUp.-1-", }) diff --git a/lua/lsp.lua b/lua/lsp.lua index 4a605ef..e1d0826 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -77,16 +77,12 @@ local function on_attach(client, bufnr) vim.keymap.set("n", "df", vim.diagnostic.open_float, opts) vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) - vim.keymap.set("n", "dl", vim.diagnostic.setloclist, opts) vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts) - vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) vim.keymap.set({ "n", "i", }, "", vim.lsp.buf.hover, opts) vim.keymap.set({ "n", "i", }, "", vim.lsp.buf.signature_help, opts) vim.keymap.set({ "n", "i", }, "", vim.lsp.buf.document_highlight, opts) - vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts) vim.keymap.set("n", "lr", ca_rename, opts) vim.keymap.set("n", "la", vim.lsp.buf.code_action, opts) - vim.keymap.set("n", "gr", vim.lsp.buf.references, opts) vim.keymap.set( { "n", "x", }, "lf", @@ -94,6 +90,22 @@ local function on_attach(client, bufnr) opts ) + ---@module "telescope.builtin" + local telescope = utils.try_require("telescope.builtin", module_name) + if telescope then + vim.keymap.set("n", "dl", telescope.diagnostics, opts) + vim.keymap.set("n", "lD", telescope.lsp_type_definitions, opts) + vim.keymap.set("n", "gd", telescope.lsp_definitions, opts) + vim.keymap.set("n", "gi", telescope.lsp_implementations, opts) + vim.keymap.set("n", "gr", telescope.lsp_references, opts) + else + vim.keymap.set("n", "dl", vim.diagnostic.setloclist, opts) + vim.keymap.set("n", "ld", vim.lsp.buf.type_definition, opts) + vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) + vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts) + vim.keymap.set("n", "gr", vim.lsp.buf.references, opts) + end + -- For document highlight vim.cmd.highlight({ "link LspReferenceRead Visual", bang = true, }) vim.cmd.highlight({ "link LspReferenceText Visual", bang = true, })