feat(nvim): filetype-specific lsp keymaps, tweaked some existing keymaps

3 files changed, 42 insertions, 30 deletions

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', '<cmd>ClangdSwitchSourceHeader<cr>', { 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', '<leader>dR', '<cmd>DapRestartFrame<cr>', { desc = '[D]ebug [R]estart' } },
     { 'n', '<leader>dt', '<cmd>DapRestartFrame<cr>', { desc = '[D]ebug [R]estart' } },
     { 'n', '<leader>dp', '<cmd>DapToggleBreakpoint<cr>', { desc = '[D]ebug Break[p]oint' } },
-    { 'n', 'H', '<cmd>lua require("dap.ui.widgets").hover()<cr>', { desc = '[H]over (debug)' } },
+    { 'n', '<leader>dh', '<cmd>lua require("dap.ui.widgets").hover()<cr>', { desc = '[D]ebug [H]over' } },
     { 'n', '<leader>si', '<<cmd>DapStepInto<cr>', { desc = '[S]tep [I]nto' } },
     { 'n', '<leader>so', '<<cmd>DapStepOver<cr>', { desc = '[S]tep [O]ver' } },
     { 'n', '<leader>sO', '<<cmd>DapStepOut<cr>', { 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',         '<cmd>Lspsaga goto_definition<cr>',       { desc = '[G]oto [D]efinition' } },
+    { 'n', 'gd', '<cmd>Lspsaga goto_definition<cr>', { desc = '[G]oto [D]efinition' } },
     -- { 'n',          'gu',         '<cmd>Telescope lsp_references<cr>',        { desc = '[G]oto [U]sages' } },
-    { 'n',          'gu',         '<cmd>Lspsaga finder<cr>',        { desc = '[G]oto [U]sages' } },
-    { 'n',          'gi',         '<cmd>Telescope lsp_implementations<cr>',   { desc = '[G]oto [I]mplementations' } },
-    { 'n',          'gt',         '<cmd>Telescope lsp_type_definitions<cr>',  { desc = '[G]oto [T]ype Definitions' } },
-    { 'n',          '<leader>ds', '<cmd>Telescope lsp_document_symbols<cr>',  { desc = '[D]ocument [S]symbols' } },
-    { 'n',          '<leader>ps', '<cmd>Telescope lsp_workspace_symbols<cr>', { desc = '[P]roject [S]ymbols' } },
-    { { 'n', 'i' }, '<C-p>',      vim.lsp.buf.signature_help,                 { desc = 'Show [P]arameters' } },
-    { 'n',          'K',          '<cmd>Lspsaga hover_doc<cr>',               { desc = 'Documentation' } },
-    { 'n',          'R',          '<cmd>Lspsaga rename<cr>',                  { desc = '[R]ename' } },
-    { { 'n', 'i' }, '<M-Enter>',  '<cmd>Lspsaga code_action<cr>',             { desc = 'Code Actions' } },
-    { 'n',          '<leader>ca', '<cmd>Lspsaga code_action<cr><Esc>',        { 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',          '<leader>D',  cursor_diagnostics,                         { desc = '[D]iagnostics under cursor' } },
+    { 'n', 'gu', '<cmd>Lspsaga finder<cr>', { desc = '[G]oto [U]sages' } },
+    { 'n', 'gi', '<cmd>Telescope lsp_implementations<cr>', { desc = '[G]oto [I]mplementations' } },
+    { 'n', 'gt', '<cmd>Telescope lsp_type_definitions<cr>', { desc = '[G]oto [T]ype Definitions' } },
+    { 'n', '<leader>ds', '<cmd>Telescope lsp_document_symbols<cr>', { desc = '[D]ocument [S]symbols' } },
+    { 'n', '<leader>ps', '<cmd>Telescope lsp_workspace_symbols<cr>', { desc = '[P]roject [S]ymbols' } },
+    { { 'n', 'i' }, '<C-p>', vim.lsp.buf.signature_help, { desc = 'Show [P]arameters' } },
+    { 'n', 'K', '<cmd>Lspsaga hover_doc<cr>', { desc = 'Documentation' } },
+    { 'n', 'R', '<cmd>Lspsaga rename<cr>', { desc = '[R]ename' } },
+    { { 'n', 'i' }, '<M-Enter>', '<cmd>Lspsaga code_action<cr>', { desc = 'Code Actions' } },
+    { 'n', '<leader>ca', '<cmd>Lspsaga code_action<cr><Esc>', { 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', '<leader>D', cursor_diagnostics, { desc = '[D]iagnostics under cursor' } },
 }
 
-local M = {}
+for _, ft in ipairs({ 'c', 'h', 'cpp', 'hpp' }) do
+    keymaps[ft] = {
+        { 'n', 'H', '<cmd>ClangdSwitchSourceHeader<cr>', { desc = '[H]eader and Source Switcher' } },
+        { 'n', 'K', '<cmd>lua require("pretty_hover").hover()<cr>', { 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