Use Lua function directly for the opfunc

Olical · Feb 15, 2025 · 2ff8013 · 2ff8013
1 parent 2939310
commit 2ff8013
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 35 deletions.
diff --git a/fnl/conjure/mapping.fnl b/fnl/conjure/mapping.fnl
@@ -115,7 +115,8 @@
   (M.buf
     :EvalMotion (cfg :eval_motion)
     (fn []
-      (set vim.o.opfunc :ConjureEvalMotionOpFunc)
+      (set _G._conjure_opfunc (fn [...] (eval.selection ...)))
+      (set vim.o.opfunc "v:lua._conjure_opfunc")
 
       ;; Doesn't work unless we schedule it :( this might break some things.
       (client.schedule #(vim.api.nvim_feedkeys "g@" :m false)))
@@ -301,13 +302,6 @@
                     "\\k\\+$"))))
     (eval.completions-sync base)))
 
-;; TOOD Maybe we don't need this now we can pass fn refs?
-(vim.api.nvim_command
-  (->> ["function! ConjureEvalMotionOpFunc(kind)"
-        "call luaeval(\"require('conjure.eval')['selection'](_A)\", a:kind)"
-        "endfunction"]
-       (str.join "\n")))
-
 (vim.api.nvim_command
   (->> ["function! ConjureOmnifunc(findstart, base)"
         "return luaeval(\"require('conjure.mapping')['omnifunc'](_A[1] == 1, _A[2])\", [a:findstart, a:base])"

diff --git a/lua/conjure/mapping.lua b/lua/conjure/mapping.lua