From b0e4112762d0440a01de2a5a6ff181a77edf3ebe Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Wed, 7 Aug 2024 13:23:25 +0300 Subject: feat(nvim): filetype-specific lsp keymaps, tweaked some existing keymaps --- .config/nvim/after/ftplugin/c.lua | 2 - .config/nvim/lua/custom/config/dap-keymaps.lua | 2 +- .config/nvim/lua/custom/config/lsp-keymaps.lua | 68 ++++++++++++++++---------- 3 files changed, 42 insertions(+), 30 deletions(-) delete mode 100644 .config/nvim/after/ftplugin/c.lua (limited to '.config/nvim') diff --git a/.config/nvim/after/ftplugin/c.lua b/.config/nvim/after/ftplugin/c.lua deleted file mode 100644 index 91b234a..0000000 --- a/.config/nvim/after/ftplugin/c.lua +++ /dev/null @@ -1,2 +0,0 @@ -Event = 'VeryLazy' -vim.keymap.set('n', 'H', 'ClangdSwitchSourceHeader', { desc = '[H]eader and Source Switcher' }) diff --git a/.config/nvim/lua/custom/config/dap-keymaps.lua b/.config/nvim/lua/custom/config/dap-keymaps.lua index 0fa0091..2a323fe 100644 --- a/.config/nvim/lua/custom/config/dap-keymaps.lua +++ b/.config/nvim/lua/custom/config/dap-keymaps.lua @@ -3,7 +3,7 @@ local keymaps = { { 'n', 'dR', 'DapRestartFrame', { desc = '[D]ebug [R]estart' } }, { 'n', 'dt', 'DapRestartFrame', { desc = '[D]ebug [R]estart' } }, { 'n', 'dp', 'DapToggleBreakpoint', { desc = '[D]ebug Break[p]oint' } }, - { 'n', 'H', 'lua require("dap.ui.widgets").hover()', { desc = '[H]over (debug)' } }, + { 'n', 'dh', 'lua require("dap.ui.widgets").hover()', { desc = '[D]ebug [H]over' } }, { 'n', 'si', '<DapStepInto', { desc = '[S]tep [I]nto' } }, { 'n', 'so', '<DapStepOver', { desc = '[S]tep [O]ver' } }, { 'n', 'sO', '<DapStepOut', { desc = '[S]tep [O]ut' } }, diff --git a/.config/nvim/lua/custom/config/lsp-keymaps.lua b/.config/nvim/lua/custom/config/lsp-keymaps.lua index d111872..4613c12 100644 --- a/.config/nvim/lua/custom/config/lsp-keymaps.lua +++ b/.config/nvim/lua/custom/config/lsp-keymaps.lua @@ -17,43 +17,57 @@ local function cursor_diagnostics() end local keymaps = { - { 'n', 'gd', 'Lspsaga goto_definition', { desc = '[G]oto [D]efinition' } }, + { 'n', 'gd', 'Lspsaga goto_definition', { desc = '[G]oto [D]efinition' } }, -- { 'n', 'gu', 'Telescope lsp_references', { desc = '[G]oto [U]sages' } }, - { 'n', 'gu', 'Lspsaga finder', { desc = '[G]oto [U]sages' } }, - { 'n', 'gi', 'Telescope lsp_implementations', { desc = '[G]oto [I]mplementations' } }, - { 'n', 'gt', 'Telescope lsp_type_definitions', { desc = '[G]oto [T]ype Definitions' } }, - { 'n', 'ds', 'Telescope lsp_document_symbols', { desc = '[D]ocument [S]symbols' } }, - { 'n', 'ps', 'Telescope lsp_workspace_symbols', { desc = '[P]roject [S]ymbols' } }, - { { 'n', 'i' }, '', vim.lsp.buf.signature_help, { desc = 'Show [P]arameters' } }, - { 'n', 'K', 'Lspsaga hover_doc', { desc = 'Documentation' } }, - { 'n', 'R', 'Lspsaga rename', { desc = '[R]ename' } }, - { { 'n', 'i' }, '', 'Lspsaga code_action', { desc = 'Code Actions' } }, - { 'n', 'ca', 'Lspsaga code_action', { desc = '[C]ode [A]ctions' } }, - { 'n', 'ge', next_diagnostic(severity.ERROR), { desc = '[G]oto [E]rror' } }, - { 'n', 'gE', prev_diagnostic(severity.ERROR), { desc = '[G]oto [E]rror (prev)' } }, - { 'n', 'gw', next_diagnostic(severity.ERROR), { desc = '[G]oto [W]arning' } }, - { 'n', 'gW', prev_diagnostic(severity.ERROR), { desc = '[G]oto [W]arning (prev)' } }, - { 'n', 'D', cursor_diagnostics, { desc = '[D]iagnostics under cursor' } }, + { 'n', 'gu', 'Lspsaga finder', { desc = '[G]oto [U]sages' } }, + { 'n', 'gi', 'Telescope lsp_implementations', { desc = '[G]oto [I]mplementations' } }, + { 'n', 'gt', 'Telescope lsp_type_definitions', { desc = '[G]oto [T]ype Definitions' } }, + { 'n', 'ds', 'Telescope lsp_document_symbols', { desc = '[D]ocument [S]symbols' } }, + { 'n', 'ps', 'Telescope lsp_workspace_symbols', { desc = '[P]roject [S]ymbols' } }, + { { 'n', 'i' }, '', vim.lsp.buf.signature_help, { desc = 'Show [P]arameters' } }, + { 'n', 'K', 'Lspsaga hover_doc', { desc = 'Documentation' } }, + { 'n', 'R', 'Lspsaga rename', { desc = '[R]ename' } }, + { { 'n', 'i' }, '', 'Lspsaga code_action', { desc = 'Code Actions' } }, + { 'n', 'ca', 'Lspsaga code_action', { desc = '[C]ode [A]ctions' } }, + { 'n', 'ge', next_diagnostic(severity.ERROR), { desc = '[G]oto [E]rror' } }, + { 'n', 'gE', prev_diagnostic(severity.ERROR), { desc = '[G]oto [E]rror (prev)' } }, + { 'n', 'gw', next_diagnostic(severity.ERROR), { desc = '[G]oto [W]arning' } }, + { 'n', 'gW', prev_diagnostic(severity.ERROR), { desc = '[G]oto [W]arning (prev)' } }, + { 'n', 'D', cursor_diagnostics, { desc = '[D]iagnostics under cursor' } }, } -local M = {} +for _, ft in ipairs({ 'c', 'h', 'cpp', 'hpp' }) do + keymaps[ft] = { + { 'n', 'H', 'ClangdSwitchSourceHeader', { desc = '[H]eader and Source Switcher' } }, + { 'n', 'K', 'lua require("pretty_hover").hover()', { desc = 'Documentation Hover' } }, + } +end ---- Registers LSP keymaps for the given buffer ----@param bufnr number: the id of the buffer -M.setup = function(bufnr) - for _, keymap in ipairs(keymaps) do +local function set_keymaps(tbl, bufnr) + for _, keymap in ipairs(tbl) do local mode = keymap[1] local lhs = keymap[2] local rhs = keymap[3] - local opts = keymap[4] - - if not opts then - opts = {} - end - + local opts = keymap[4] or {} opts.buffer = bufnr vim.keymap.set(mode, lhs, rhs, opts) end end +local M = {} + +--- Registers LSP keymaps for the given buffer +---@param bufnr number: the id of the buffer +M.setup = function(bufnr) + local filetype = vim.bo[bufnr].filetype + set_keymaps(keymaps, bufnr) + for ft, tbl in pairs(keymaps) do + if type(ft) == 'number' or ft ~= filetype then + goto continue + end + set_keymaps(tbl, bufnr) + ::continue:: + end +end + return M -- cgit v1.3.1