refactor: move text object mappings

JRasmusBm · Apr 6, 2024 · debad75 · debad75
1 parent 11e77aa
commit debad75
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/vim/ftplugin/markdown.lua b/vim/ftplugin/markdown.lua
@@ -2,31 +2,18 @@ vim.cmd [[
 command! PR norm gg/Ticketf[yi]/#f[v2f]p0WysaW]Wdw
 ]]
 
-local function with_textobject(action)
-  return function()
-    local old_func = vim.go.operatorfunc
-    _G.op_func_helper = function()
-      _G.op_func_helper = nil
-      vim.go.operatorfunc = old_func
-      local start = vim.api.nvim_buf_get_mark(0, "[")
-      local end_ = vim.api.nvim_buf_get_mark(0, "]")
-      action(start, end_)
-    end
-    vim.go.operatorfunc = "v:lua.op_func_helper"
-    vim.api.nvim_feedkeys("g@", "n", false)
-  end
-end
-
 local replace_in_textobject = function(regex_)
-  return with_textobject(function(start_position, end_position)
-    vim.cmd(
-      "silent keeppatterns"
-      .. start_position[1]
-      .. ","
-      .. end_position[1]
-      .. regex_
-    )
-  end)
+  return require("jrasmusbm.utils.mappings").with_textobject(
+    function(start_position, end_position)
+      vim.cmd(
+        "silent keeppatterns"
+          .. start_position[1]
+          .. ","
+          .. end_position[1]
+          .. regex_
+      )
+    end
+  )
 end
 
 vim.keymap.set(

diff --git a/vim/lua/jrasmusbm/utils/mappings.lua b/vim/lua/jrasmusbm/utils/mappings.lua
@@ -8,4 +8,19 @@ M.feedkeys = function(keys)
   )
 end
 
+M.with_textobject = function(action)
+  return function()
+    local old_func = vim.go.operatorfunc
+    _G.op_func_helper = function()
+      _G.op_func_helper = nil
+      vim.go.operatorfunc = old_func
+      local start = vim.api.nvim_buf_get_mark(0, "[")
+      local end_ = vim.api.nvim_buf_get_mark(0, "]")
+      action(start, end_)
+    end
+    vim.go.operatorfunc = "v:lua.op_func_helper"
+    vim.api.nvim_feedkeys("g@", "n", false)
+  end
+end
+
 return M