vim-dev: use new vim.keymap API

1 files changed, 26 insertions, 31 deletions

diff --git a/dotfiles/vim-dev.lua b/dotfiles/vim-dev.lua
index ab04bf8..d59fbb6 100644
--- a/dotfiles/vim-dev.lua
+++ b/dotfiles/vim-dev.lua
@@ -1,54 +1,49 @@
 local lspconfig = require("lspconfig")
 
 local function on_attach(client, bufnr)
-        local function buf_set_keymap(...)
-                vim.api.nvim_buf_set_keymap(bufnr, ...)
-        end
+        local opts = { noremap = true, silent = true, buffer = bufnr }
 
-        local opts = { noremap = true, silent = true }
+        local telescope_builtin = require("telescope.builtin")
 
-        buf_set_keymap('n', 'gD', '<Cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-        buf_set_keymap('n', 'gd', '<Cmd>Telescope lsp_definitions<CR>', opts)
-        buf_set_keymap('n', 'K', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts)
+        local cursor_theme = require("telescope.themes").get_cursor()
 
-        buf_set_keymap('n', 'gr', '<cmd>Telescope lsp_references<CR>', opts)
+        local function cursor(callback)
+                return function() callback(cursor_theme) end
+        end
 
-        -- TODO: replace these with vim.keymap.set once neovim 0.7 is out
-        local cursor_style = [[require("telescope.themes").get_dropdown()]]
+        local function desc(tbl1, description)
+                return vim.tbl_extend("force", tbl1, { desc = description })
+        end
 
-        local function telescope_builtin(builtin, style)
-                if not style then
-                        style = ""
-                end
+        vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, desc(opts, "LSP declaration"))
+        vim.keymap.set('n', 'gd', telescope_builtin.lsp_definitions, desc(opts, "LSP Definitions"))
+        vim.keymap.set('n', 'K', vim.lsp.buf.hover, desc(opts, "LSP Hover"))
 
-                return '<cmd>lua require("telescope.builtin").' .. builtin .. '(' .. cursor_style ..')<CR>'
-        end
+        vim.keymap.set('n', 'gr', telescope_builtin.lsp_references, desc(opts, "LSP References"))
 
-        buf_set_keymap('n', '<leader>sa', telescope_builtin('lsp_code_actions', cursor_style), opts)
-        buf_set_keymap('n', '<leader>se', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
-        buf_set_keymap('n', '<leader>sE', '<cmd>Telescope diagnostics<CR>', opts)
-        buf_set_keymap('n', '<leader>sl', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
-        buf_set_keymap('n', '<leader>sq', '<cmd>lua vim.diagnostic.setqflist()<CR>', opts)
-        buf_set_keymap('n', '<leader>sr', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-        buf_set_keymap('n', '<leader>ss', '<cmd>Telescope lsp_document_symbols<CR>', opts)
-        buf_set_keymap('n', '<leader>sS', '<cmd>Telescope lsp_workspace_symbols<CR>', opts)
+        vim.keymap.set('n', '<leader>sa', cursor(telescope_builtin.lsp_code_actions), desc(opts, "LSP Code Actions"))
+        vim.keymap.set('n', '<leader>se', vim.diagnostic.open_float, desc(opts, "Local Diagnostics"))
+        vim.keymap.set('n', '<leader>sE', telescope_builtin.diagnostics, desc(opts, "Global Diagnostics"))
+        vim.keymap.set('n', '<leader>sl', vim.diagnostic.setloclist, desc(opts, "Diagnostics set LocList"))
+        vim.keymap.set('n', '<leader>sq', vim.diagnostic.setqflist, desc(opts, "Diagnostics set QFList"))
+        vim.keymap.set('n', '<leader>sr', vim.lsp.buf.rename, desc(opts, "LSP Rename"))
+        vim.keymap.set('n', '<leader>ss', telescope_builtin.lsp_document_symbols, desc(opts, "LSP Document Symbols"))
+        vim.keymap.set('n', '<leader>sS', telescope_builtin.lsp_workspace_symbols, desc(opts, "LSP Workspace Symbols"))
 
-        buf_set_keymap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
-        buf_set_keymap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
+        vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, desc(opts, "Goto Next Diagnostic"))
+        vim.keymap.set('n', ']d', vim.diagnostic.goto_next, desc(opts, "Goto Prev Diagnostic"))
 
         -- Capability specific
 
-        -- print(vim.inspect(client.resolved_capabilities))
-
         if client.resolved_capabilities.document_formatting then
-                buf_set_keymap("n", "<leader>sf", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
+                vim.keymap.set("n", "<leader>sf", vim.lsp.buf.formatting, desc(opts, "Format buffer"))
         end
         if client.resolved_capabilities.document_range_formatting then
-                buf_set_keymap("v", "<leader>sf", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
+                vim.keymap.set("v", "<leader>sf", vim.lsp.buf.range_formatting, desc(opts, "Format Range"))
         end
 
         -- Rust specific
-        buf_set_keymap("n", "<leader>sh", "<cmd>RustToggleInlayHints<CR>", opts)
+        vim.keymap.set("n", "<leader>sh", "<cmd>RustToggleInlayHints<CR>", opts)
 
         require("lsp_signature").on_attach({
                 hint_prefix = "param: "