fix(lsp): enable lsp keybinds always, even when no server is attached

This commit is contained in:
2026-02-25 00:26:07 +01:00
parent e590a6d8f2
commit 7994298eb6
3 changed files with 39 additions and 95 deletions
+1 -95
View File
@@ -2,7 +2,6 @@
vim.lsp.config = vim.lsp.config
local log = require("log")
local util = require("util")
local M = {}
@@ -15,97 +14,6 @@ M.diagnostic_signs = {
},
}
---@param bufnr integer
local function set_keymaps(bufnr)
local keymaps = {
{ mode = { "n" }, lhs = "<leader>dk", rhs = vim.diagnostic.open_float },
{
mode = { "n" },
lhs = "[d",
rhs = function()
vim.diagnostic.jump({ count = -1, float = true })
end,
},
{
mode = { "n" },
lhs = "]d",
rhs = function()
vim.diagnostic.jump({ count = 1, float = true })
end,
},
{ mode = { "n" }, lhs = "gD", rhs = vim.lsp.buf.declaration },
{
mode = "n",
lhs = "K",
rhs = function()
vim.lsp.buf.hover({ max_width = 80 })
end,
},
{
mode = { "i", "s" },
lhs = "<C-s>",
rhs = function()
vim.lsp.buf.signature_help({ max_width = 80 })
end,
},
{
mode = { "n", "i" },
lhs = "<C-h>",
rhs = vim.lsp.buf.document_highlight,
},
{
mode = { "n", "x" },
lhs = "<leader>lf",
rhs = vim.lsp.buf.format,
},
{
mode = { "n" },
lhs = "<leader>ld",
rhs = function()
vim.diagnostic.enable(
not vim.diagnostic.is_enabled({ bufnr = bufnr }),
{ bufnr = bufnr }
)
end,
},
{
mode = { "n", "i" },
lhs = "<C-l>",
rhs = function()
vim.lsp.buf.clear_references()
vim.cmd.nohlsearch()
vim.schedule(vim.cmd.diffupdate)
return "<C-l>"
end,
opts = { expr = true },
},
}
local telescope = util.try_require("telescope.builtin")
if telescope then
vim.list_extend(keymaps, {
{ mode = "n", lhs = "<leader>dl", rhs = telescope.diagnostics },
{ mode = "n", lhs = "grt", rhs = telescope.lsp_type_definitions },
{ mode = "n", lhs = "gd", rhs = telescope.lsp_definitions },
{ mode = "n", lhs = "gri", rhs = telescope.lsp_implementations },
{ mode = "n", lhs = "grr", rhs = telescope.lsp_references },
})
else
vim.list_extend(keymaps, {
{ mode = "n", lhs = "<leader>dl", rhs = vim.diagnostic.setloclist },
{ mode = "n", lhs = "grt", rhs = vim.lsp.buf.type_definition },
{ mode = "n", lhs = "gd", rhs = vim.lsp.buf.definition },
})
end
for _, keymap in ipairs(keymaps) do
keymap.opts =
vim.tbl_extend("keep", keymap.opts or {}, { buffer = bufnr })
vim.keymap.set(keymap.mode, keymap.lhs, keymap.rhs, keymap.opts)
end
end
--- Load a JSON file and return a parsed table merged with settings
---@param path string
---@param settings? table
@@ -131,9 +39,7 @@ local function with_file(path, settings)
return vim.tbl_deep_extend("force", settings or {}, resp)
end
function M.on_attach(client, bufnr)
set_keymaps(bufnr)
function M.on_attach(client, _)
client.settings = with_file(
string.format(".%s.json", client.name),
client.settings