From 77e283bd9c33166937756250918b12e349caf050 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Mon, 2 Aug 2021 23:42:56 +0200 Subject: [Refactor] Allow editing default keymaps (#1213) --- lua/keymappings.lua | 252 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 150 insertions(+), 102 deletions(-) (limited to 'lua/keymappings.lua') diff --git a/lua/keymappings.lua b/lua/keymappings.lua index 9ef37a39..038ebed4 100644 --- a/lua/keymappings.lua +++ b/lua/keymappings.lua @@ -1,109 +1,157 @@ -local opts = { - insert_mode = { noremap = true, silent = true }, - normal_mode = { noremap = true, silent = true }, - visual_mode = { noremap = true, silent = true }, - visual_block_mode = { noremap = true, silent = true }, - term_mode = { silent = true }, -} +local M = {} + +local generic_opts_any = { noremap = true, silent = true } -local keymaps = { - insert_mode = { - -- I hate escape - ["jk"] = { "" }, - ["kj"] = { "" }, - ["jj"] = { "" }, - -- Move current line / block with Alt-j/k ala vscode. - [""] = { ":m .+1==gi" }, - [""] = { ":m .-2==gi" }, - -- navigation - [""] = { "k" }, - [""] = { "j" }, - [""] = { "h" }, - [""] = { "l" }, - }, - - normal_mode = { - -- Better window movement - [""] = { "h" }, - [""] = { "j" }, - [""] = { "k" }, - [""] = { "l" }, - - -- Resize with arrows - [""] = { ":resize -2" }, - [""] = { ":resize +2" }, - [""] = { ":vertical resize -2" }, - [""] = { ":vertical resize +2" }, - - -- Tab switch buffer - -- { "", ":bnext" }, - -- { "", ":bprevious" }, - - -- Move current line / block with Alt-j/k a la vscode. - [""] = { ":m .+1==" }, - [""] = { ":m .-2==" }, - - -- QuickFix - ["]q"] = { ":cnext" }, - ["[q"] = { ":cprev" }, - [""] = { ":call QuickFixToggle()" }, - - -- {'', 'compe#complete()', {noremap = true, silent = true, expr = true}}, - - -- LSP - ["gd"] = { "lua vim.lsp.buf.definition()" }, - ["gD"] = { "lua vim.lsp.buf.declaration()" }, - ["gr"] = { "lua vim.lsp.buf.references()" }, - ["gi"] = { "lua vim.lsp.buf.implementation()" }, - ["gl"] = { "lua vim.lsp.diagnostic.show_line_diagnostics({ show_header = false, border = 'single' })" }, - ["gs"] = { "lua vim.lsp.buf.signature_help()" }, - ["gp"] = { "lua require'lsp.peek'.Peek('definition')" }, - ["K"] = { "lua vim.lsp.buf.hover()" }, - [""] = { "lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = lvim.lsp.popup_border}})" }, - [""] = { "lua vim.lsp.diagnostic.goto_next({popup_opts = {border = lvim.lsp.popup_border}})" }, - }, - - term_mode = { - -- Terminal window navigation - [""] = { "h" }, - [""] = { "j" }, - [""] = { "k" }, - [""] = { "l" }, - }, - - visual_mode = { - -- Better indenting - ["<"] = { ""] = { ">gv" }, - - -- { "p", '"0p', { silent = true } }, - -- { "P", '"0P', { silent = true } }, - }, - - visual_block_mode = { - -- Move selected line / block of text in visual mode - ["K"] = { ":move '<-2gv-gv" }, - ["J"] = { ":move '>+1gv-gv" }, - - -- Move current line / block with Alt-j/k ala vscode. - [""] = { ":m '>+1gv-gv" }, - [""] = { ":m '<-2gv-gv" }, - }, +local mode_adapters = { + insert_mode = "i", + normal_mode = "n", + term_mode = "t", + visual_mode = "v", + visual_block_mode = "x", } -if vim.fn.has "mac" == 1 then - -- TODO: fix this - keymaps.normal_mode[""] = keymaps.normal_mode[""] - keymaps.normal_mode[""] = keymaps.normal_mode[""] - keymaps.normal_mode[""] = keymaps.normal_mode[""] - keymaps.normal_mode[""] = keymaps.normal_mode[""] +-- Append key mappings to lunarvim's defaults for a given mode +-- @param keymaps The table of key mappings containing a list per mode (normal_mode, insert_mode, ..) +function M.append_to_defaults(keymaps) + for mode, mappings in pairs(keymaps) do + for k, v in ipairs(mappings) do + lvim.keys[mode][k] = v + end + end +end + +-- Load key mappings for a given mode +-- @param mode The keymap mode, can be one of the keys of mode_adapters +-- @param keymaps The list of key mappings +-- @param opts The mapping options +function M.load_mode(mode, keymaps, opts) + mode = mode_adapters[mode] and mode_adapters[mode] or mode + for k, v in pairs(keymaps) do + vim.api.nvim_set_keymap(mode, k, v, opts) + end +end + +-- Load key mappings for all provided modes +-- @param keymaps A list of key mappings for each mode +-- @param opts The mapping options for each mode +function M.load(keymaps, opts) + for mode, mapping in pairs(keymaps) do + M.load_mode(mode, mapping, opts[mode]) + end end -vim.g.mapleader = (lvim.leader == "space" and " ") or lvim.leader +function M.config() + lvim.keys = { + ---@usage change or add keymappings for insert mode + insert_mode = { + -- 'jk' for quitting insert mode + ["jk"] = "", + -- 'kj' for quitting insert mode + ["kj"] = "", + -- 'jj' for quitting insert mode + ["jj"] = "", + -- Move current line / block with Alt-j/k ala vscode. + [""] = ":m .+1==gi", + -- Move current line / block with Alt-j/k ala vscode. + [""] = ":m .-2==gi", + -- navigation + [""] = "k", + [""] = "j", + [""] = "h", + [""] = "l", + }, + + ---@usage change or add keymappings for normal mode + normal_mode = { + -- Better window movement + [""] = "h", + [""] = "j", + [""] = "k", + [""] = "l", + + -- Resize with arrows + [""] = ":resize -2", + [""] = ":resize +2", + [""] = ":vertical resize -2", + [""] = ":vertical resize +2", + + -- Tab switch buffer + [""] = ":BufferNext", + [""] = ":BufferPrevious", + + -- Move current line / block with Alt-j/k a la vscode. + [""] = ":m .+1==", + [""] = ":m .-2==", + + -- QuickFix + ["]q"] = ":cnext", + ["[q"] = ":cprev", + [""] = ":call QuickFixToggle()", + }, + + ---@usage change or add keymappings for terminal mode + term_mode = { + -- Terminal window navigation + [""] = "h", + [""] = "j", + [""] = "k", + [""] = "l", + }, + + ---@usage change or add keymappings for visual mode + visual_mode = { + -- Better indenting + ["<"] = ""] = ">gv", + + -- ["p"] = '"0p', + -- ["P"] = '"0P', + }, + + ---@usage change or add keymappings for visual block mode + visual_block_mode = { + -- Move selected line / block of text in visual mode + ["K"] = ":move '<-2gv-gv", + ["J"] = ":move '>+1gv-gv", + + -- Move current line / block with Alt-j/k ala vscode. + [""] = ":m '>+1gv-gv", + [""] = ":m '<-2gv-gv", + }, + } + + if vim.fn.has "mac" == 1 then + lvim.keys.normal_mode[""] = lvim.keys.normal_mode[""] + lvim.keys.normal_mode[""] = lvim.keys.normal_mode[""] + lvim.keys.normal_mode[""] = lvim.keys.normal_mode[""] + lvim.keys.normal_mode[""] = lvim.keys.normal_mode[""] + end +end --- navigate tab completion with and --- runs conditionally -vim.cmd 'inoremap pumvisible() ? "\\" : "\\"' -vim.cmd 'inoremap pumvisible() ? "\\" : "\\"' +function M.print(mode) + print "List of LunarVim's default keymappings (not including which-key)" + if mode then + print(vim.inspect(lvim.keys[mode])) + else + print(vim.inspect(lvim.keys)) + end +end + +function M.setup() + -- navigate tab completion with and + -- runs conditionally + vim.cmd 'inoremap pumvisible() ? "\\" : "\\"' + vim.cmd 'inoremap pumvisible() ? "\\" : "\\"' + local generic_opts = { + insert_mode = generic_opts_any, + normal_mode = generic_opts_any, + visual_mode = generic_opts_any, + visual_block_mode = generic_opts_any, + term_mode = { silent = true }, + } + + vim.g.mapleader = (lvim.leader == "space" and " ") or lvim.leader + M.load(lvim.keys, generic_opts) +end -return { keymaps = keymaps, opts = opts } +return M -- cgit v1.2.3