From 7a5be43600c37f786d97a46cb2dad615b19a8638 Mon Sep 17 00:00:00 2001 From: jdhao Date: Wed, 5 Oct 2022 22:40:57 +0800 Subject: [PATCH] use lua func in rhs instead of callback --- core/mappings.lua | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/core/mappings.lua b/core/mappings.lua index e49fbba..3f5a7b7 100644 --- a/core/mappings.lua +++ b/core/mappings.lua @@ -85,16 +85,15 @@ keymap.set("n", "ev", "tabnew $MYVIMRC tcd %:h", { desc = "open init.lua", }) -keymap.set("n", "sv", "", { - silent = true, - desc = "reload init.lua", - callback = function() - vim.cmd([[ +keymap.set("n", "sv", function() + vim.cmd([[ update $MYVIMRC source $MYVIMRC ]]) - vim.notify("Nvim config successfully reloaded!", vim.log.levels.INFO, { title = "nvim-config" }) - end, + vim.notify("Nvim config successfully reloaded!", vim.log.levels.INFO, { title = "nvim-config" }) +end, { + silent = true, + desc = "reload init.lua", }) -- Reselect the text that has just been pasted, see also https://stackoverflow.com/a/4317090/6064933. @@ -173,25 +172,23 @@ keymap.set({ "x", "o" }, "iu", "call text_obj#URL()", { desc = "URL tex keymap.set({ "x", "o" }, "iB", "call text_obj#Buffer()", { desc = "buffer text object" }) -- Do not move my cursor when joining lines. -keymap.set("n", "J", "", { - desc = "join line", - callback = function() - vim.cmd([[ +keymap.set("n", "J", function() + vim.cmd([[ normal! mzJ`z delmarks z ]]) - end, +end, { + desc = "join line", }) -keymap.set("n", "gJ", "mzgJ`z", { - desc = "join visual lines", - callback = function() - -- we must use `normal!`, otherwise it will trigger recursive mapping - vim.cmd([[ +keymap.set("n", "gJ", function() + -- we must use `normal!`, otherwise it will trigger recursive mapping + vim.cmd([[ normal! zmgJ`z delmarks z ]]) - end, +end, { + desc = "join visual lines", }) -- Break inserted text into smaller undo units when we insert some punctuation chars.