Skip to content

Commit 80681e1

Browse files
committed
Use inf-clojure--merge-repl-features for all REPL types
cljs, planck, and joker now merge overrides onto the shared base instead of listing all features manually. This removes duplicate reload/reload-all entries and ensures new base features propagate automatically. Use nil to explicitly exclude unsupported features (e.g. load for cljs, source/apropos/ns-vars for joker).
1 parent ad29d27 commit 80681e1

1 file changed

Lines changed: 38 additions & 34 deletions

File tree

inf-clojure.el

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -101,45 +101,49 @@ Individual REPL types override specific entries (e.g. `arglists')
101101
via `inf-clojure--merge-repl-features'.")
102102

103103
(defvar inf-clojure-repl-features
104-
`((cljs . ((doc . "(cljs.repl/doc %s)")
105-
(source . "(cljs.repl/source %s)")
106-
(arglists . "(try (->> '%s cljs.core/resolve cljs.core/meta :arglists) (catch :default _ nil))")
107-
(apropos . "(cljs.repl/apropos \"%s\")")
108-
(ns-vars . "(cljs.repl/dir %s)")
109-
(set-ns . "(in-ns '%s)")
110-
(macroexpand . "(cljs.core/macroexpand '%s)")
111-
(macroexpand-1 . "(cljs.core/macroexpand-1 '%s)")
112-
(reload . "(require '%s :reload)")
113-
(reload-all . "(require '%s :reload-all)")
114-
(var-meta . "(cljs.core/meta (cljs.core/resolve '%s))")))
115-
(planck . ((load . "(load-file \"%s\")")
116-
(doc . "(planck.repl/doc %s)")
117-
(source . "(planck.repl/source %s)")
118-
(arglists . "(planck.repl/get-arglists \"%s\")")
119-
(apropos . "(doseq [var (sort (planck.repl/apropos \"%s\"))] (println (str var)))")
120-
(ns-vars . "(planck.repl/dir %s)")
121-
(set-ns . "(in-ns '%s)")
122-
(macroexpand . "(macroexpand '%s)")
123-
(macroexpand-1 . "(macroexpand-1 '%s)")
124-
(completion . "(seq (js->clj (#'planck.repl/get-completions \"%s\")))")
125-
(reload . "(require '%s :reload)")
126-
(reload-all . "(require '%s :reload-all)")
127-
(var-meta . "(cljs.core/meta (cljs.core/resolve '%s))")))
128-
(joker . ((load . "(load-file \"%s\")")
129-
(doc . "(joker.repl/doc %s)")
130-
(arglists .
131-
"(try
104+
`((cljs . ,(inf-clojure--merge-repl-features
105+
inf-clojure--clojure-repl-base-features
106+
'((load . nil)
107+
(doc . "(cljs.repl/doc %s)")
108+
(source . "(cljs.repl/source %s)")
109+
(arglists . "(try (->> '%s cljs.core/resolve cljs.core/meta :arglists) (catch :default _ nil))")
110+
(apropos . "(cljs.repl/apropos \"%s\")")
111+
(ns-vars . "(cljs.repl/dir %s)")
112+
(set-ns . "(in-ns '%s)")
113+
(macroexpand . "(cljs.core/macroexpand '%s)")
114+
(macroexpand-1 . "(cljs.core/macroexpand-1 '%s)")
115+
(var-meta . "(cljs.core/meta (cljs.core/resolve '%s))"))))
116+
(planck . ,(inf-clojure--merge-repl-features
117+
inf-clojure--clojure-repl-base-features
118+
'((load . "(load-file \"%s\")")
119+
(doc . "(planck.repl/doc %s)")
120+
(source . "(planck.repl/source %s)")
121+
(arglists . "(planck.repl/get-arglists \"%s\")")
122+
(apropos . "(doseq [var (sort (planck.repl/apropos \"%s\"))] (println (str var)))")
123+
(ns-vars . "(planck.repl/dir %s)")
124+
(set-ns . "(in-ns '%s)")
125+
(macroexpand . "(macroexpand '%s)")
126+
(macroexpand-1 . "(macroexpand-1 '%s)")
127+
(completion . "(seq (js->clj (#'planck.repl/get-completions \"%s\")))")
128+
(var-meta . "(cljs.core/meta (cljs.core/resolve '%s))"))))
129+
(joker . ,(inf-clojure--merge-repl-features
130+
inf-clojure--clojure-repl-base-features
131+
'((load . "(load-file \"%s\")")
132+
(doc . "(joker.repl/doc %s)")
133+
(source . nil)
134+
(apropos . nil)
135+
(ns-vars . nil)
136+
(arglists .
137+
"(try
132138
(:arglists
133139
(joker.core/meta
134140
(joker.core/resolve
135141
(joker.core/read-string \"%s\"))))
136142
(catch Error _ nil))")
137-
(set-ns . "(in-ns '%s)")
138-
(macroexpand . "(macroexpand '%s)")
139-
(macroexpand-1 . "(macroexpand-1 '%s)")
140-
(reload . "(require '%s :reload)")
141-
(reload-all . "(require '%s :reload-all)")
142-
(var-meta . "(joker.core/meta (joker.core/resolve '%s))")))
143+
(set-ns . "(in-ns '%s)")
144+
(macroexpand . "(macroexpand '%s)")
145+
(macroexpand-1 . "(macroexpand-1 '%s)")
146+
(var-meta . "(joker.core/meta (joker.core/resolve '%s))"))))
143147
(babashka . ,(copy-alist inf-clojure--clojure-repl-base-features))
144148
(node-babashka . ,(copy-alist inf-clojure--clojure-repl-base-features))
145149
(clojure . ,(copy-alist inf-clojure--clojure-repl-base-features))

0 commit comments

Comments
 (0)