Remove the weird omnifunc function string mapping, use a lua reference

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

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/fnl/conjure/mapping.fnl b/fnl/conjure/mapping.fnl
@@ -198,7 +198,10 @@
   (when (= :function (type (client.get :completions)))
     (let [fn-name (config.get-in [:completion :omnifunc])]
       (when fn-name
-        (vim.api.nvim_command (.. "setlocal omnifunc=" fn-name)))))
+        (set _G._conjure_omnifunc
+             (fn [find-start base]
+               (M.omnifunc (= find-start 1) base)))
+        (set vim.bo.omnifunc "v:lua._conjure_omnifunc"))))
 
   (client.optional-call :on-filetype))
 
@@ -302,12 +305,6 @@
                     "\\k\\+$"))))
     (eval.completions-sync base)))
 
-(vim.api.nvim_command
-  (->> ["function! ConjureOmnifunc(findstart, base)"
-        "return luaeval(\"require('conjure.mapping')['omnifunc'](_A[1] == 1, _A[2])\", [a:findstart, a:base])"
-        "endfunction"]
-       (str.join "\n")))
-
 (vim.api.nvim_create_user_command
   "ConjureEval"
   #(M.eval-ranged-command (. $ :line1) (. $ :line2) (. $ :args))

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