Only add mappings for Clojure files

This commit is contained in:
Walter Leibbrandt 2021-08-01 01:49:56 +02:00
parent 458c4761f1
commit a6750d64a1
2 changed files with 43 additions and 22 deletions

View File

@ -22,7 +22,7 @@
(fn [r] (fn [r]
(log.append [(.. "; " orig) r] {:break? true}))) (log.append [(.. "; " orig) r] {:break? true})))
(defn conjure-macroexpand [expand-cmd] (defn clj-macroexpand [expand-cmd]
(let [form (current-form) (let [form (current-form)
me-form (.. "(" (or expand-cmd "clojure.walk/macroexpand-all") " '" form ")")] me-form (.. "(" (or expand-cmd "clojure.walk/macroexpand-all") " '" form ")")]
(clj-client eval.eval-str (clj-client eval.eval-str
@ -31,19 +31,24 @@
:passive? true :passive? true
:on-result (output-expanded me-form)}))) :on-result (output-expanded me-form)})))
(defn add-buf-mappings []
(mapping.buf :n nil "cm" ":ConjureCljMacroexpand<CR>")
(mapping.buf :n nil "c0" ":ConjureCljMacroexpand0<CR>")
(mapping.buf :n nil "c1" ":ConjureCljMacroexpand1<CR>"))
(defn init [] (defn init []
(nvim.ex.command_ (nvim.ex.command_
"ConjureMacroexpand" "ConjureCljMacroexpand"
(bridge.viml->lua :conjure-macroexpand.main :conjure-macroexpand)) (bridge.viml->lua :conjure-macroexpand.main :clj-macroexpand))
(nvim.ex.command_ (nvim.ex.command_
"ConjureMacroexpand0" "ConjureCljMacroexpand0"
(bridge.viml->lua :conjure-macroexpand.main :conjure-macroexpand {:args "\"clojure.core/macroexpand\""})) (bridge.viml->lua :conjure-macroexpand.main :clj-macroexpand {:args "\"clojure.core/macroexpand\""}))
(nvim.ex.command_ (nvim.ex.command_
"ConjureMacroexpand1" "ConjureCljMacroexpand1"
(bridge.viml->lua :conjure-macroexpand.main :conjure-macroexpand {:args "\"clojure.core/macroexpand-1\""})) (bridge.viml->lua :conjure-macroexpand.main :clj-macroexpand {:args "\"clojure.core/macroexpand-1\""}))
(when (or (not nvim.g.conjure_macroexpand_disable_mappings) (when (or (not nvim.g.conjure_macroexpand_disable_mappings)
(= 0 nvim.g.conjure_macroexpand_disable_mappings)) (= 0 nvim.g.conjure_macroexpand_disable_mappings))
(mapping.buf :n nil "cm" ":ConjureMacroexpand<CR>") (nvim.ex.autocmd
(mapping.buf :n nil "c0" ":ConjureMacroexpand0<CR>") :FileType "clojure"
(mapping.buf :n nil "c1" ":ConjureMacroexpand1<CR>"))) (bridge.viml->lua :conjure-macroexpand.main :add-buf-mappings))))

View File

@ -88,23 +88,41 @@ do
t_0_["output-expanded"] = v_0_ t_0_["output-expanded"] = v_0_
output_expanded = v_0_ output_expanded = v_0_
end end
local conjure_macroexpand local clojure_macroexpand
do do
local v_0_ local v_0_
do do
local v_0_0 local v_0_0
local function conjure_macroexpand0(expand_cmd) local function clojure_macroexpand0(expand_cmd)
local form = current_form() local form = current_form()
local me_form = ("(" .. (expand_cmd or "clojure.walk/macroexpand-all") .. " '" .. form .. ")") local me_form = ("(" .. (expand_cmd or "clojure.walk/macroexpand-all") .. " '" .. form .. ")")
return clj_client(eval["eval-str"], {["on-result"] = output_expanded(me_form), ["passive?"] = true, code = me_form, origin = "conjure-macroexpand"}) return clj_client(eval["eval-str"], {["on-result"] = output_expanded(me_form), ["passive?"] = true, code = me_form, origin = "conjure-macroexpand"})
end end
v_0_0 = conjure_macroexpand0 v_0_0 = clojure_macroexpand0
_0_["conjure-macroexpand"] = v_0_0 _0_["clojure-macroexpand"] = v_0_0
v_0_ = v_0_0 v_0_ = v_0_0
end end
local t_0_ = (_0_)["aniseed/locals"] local t_0_ = (_0_)["aniseed/locals"]
t_0_["conjure-macroexpand"] = v_0_ t_0_["clojure-macroexpand"] = v_0_
conjure_macroexpand = v_0_ clojure_macroexpand = v_0_
end
local add_buf_mappings
do
local v_0_
do
local v_0_0
local function add_buf_mappings0()
mapping.buf("n", nil, "cm", ":ConjureCljMacroexpand<CR>")
mapping.buf("n", nil, "c0", ":ConjureCljMacroexpand0<CR>")
return mapping.buf("n", nil, "c1", ":ConjureCljMacroexpand1<CR>")
end
v_0_0 = add_buf_mappings0
_0_["add-buf-mappings"] = v_0_0
v_0_ = v_0_0
end
local t_0_ = (_0_)["aniseed/locals"]
t_0_["add-buf-mappings"] = v_0_
add_buf_mappings = v_0_
end end
local init local init
do do
@ -112,13 +130,11 @@ do
do do
local v_0_0 local v_0_0
local function init0() local function init0()
nvim.ex.command_("ConjureMacroexpand", bridge["viml->lua"]("conjure-macroexpand.main", "conjure-macroexpand")) nvim.ex.command_("ConjureCljMacroexpand", bridge["viml->lua"]("conjure-macroexpand.main", "clojure-macroexpand"))
nvim.ex.command_("ConjureMacroexpand0", bridge["viml->lua"]("conjure-macroexpand.main", "conjure-macroexpand", {args = "\"clojure.core/macroexpand\""})) nvim.ex.command_("ConjureCljMacroexpand0", bridge["viml->lua"]("conjure-macroexpand.main", "clojure-macroexpand", {args = "\"clojure.core/macroexpand\""}))
nvim.ex.command_("ConjureMacroexpand1", bridge["viml->lua"]("conjure-macroexpand.main", "conjure-macroexpand", {args = "\"clojure.core/macroexpand-1\""})) nvim.ex.command_("ConjureCljMacroexpand1", bridge["viml->lua"]("conjure-macroexpand.main", "clojure-macroexpand", {args = "\"clojure.core/macroexpand-1\""}))
if (not nvim.g.conjure_macroexpand_disable_mappings or (0 == nvim.g.conjure_macroexpand_disable_mappings)) then if (not nvim.g.conjure_macroexpand_disable_mappings or (0 == nvim.g.conjure_macroexpand_disable_mappings)) then
mapping.buf("n", nil, "cm", ":ConjureMacroexpand<CR>") return nvim.ex.autocmd("FileType", "clojure", bridge["viml->lua"]("conjure-macroexpand.main", "add-buf-mappings"))
mapping.buf("n", nil, "c0", ":ConjureMacroexpand0<CR>")
return mapping.buf("n", nil, "c1", ":ConjureMacroexpand1<CR>")
end end
end end
v_0_0 = init0 v_0_0 = init0