Skip to content

Commit b2972cf

Browse files
author
Bozhidar Batsov
committed
Replace some inlined code with wrap-ns middleware usage
1 parent e7523cf commit b2972cf

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

cider-browse-ns.el

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@
9595
"List all NAMESPACE's vars in BUFFER."
9696
(interactive (list (completing-read "Browse namespace: " (cider--all-ns))))
9797
(with-current-buffer (cider-popup-buffer cider-browse-ns-buffer t)
98-
(let* ((form "(sort (map name (keys (ns-publics (quote %s)))))")
99-
(vars (cider-sync-eval-and-parse (format form namespace))))
98+
(let ((vars (cider--ns-vars namespace)))
10099
(cider-browse-ns-list (current-buffer)
101100
namespace
102101
(mapcar (lambda (var)
@@ -110,11 +109,7 @@
110109
"List all loaded namespaces in BUFFER."
111110
(interactive)
112111
(with-current-buffer (cider-popup-buffer cider-browse-ns-buffer t)
113-
(let ((names (cider-sync-eval-and-parse
114-
"(->> (all-ns)
115-
(map ns-name)
116-
(map name)
117-
(sort))")))
112+
(let ((names (cider--all-ns)))
118113
(cider-browse-ns-list (current-buffer)
119114
"All loaded namespaces"
120115
(mapcar (lambda (name)

cider-interaction.el

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ which will use the default REPL connection."
151151
"inspect-start" "inspect-refresh"
152152
"inspect-pop" "inspect-push" "inspect-reset"
153153
"macroexpand" "macroexpand-1" "macroexpand-all"
154+
"ns-list" "ns-vars"
154155
"resource" "stacktrace" "toggle-trace" "undef")
155156
"A list of nREPL ops required by CIDER to function properly.
156157
@@ -1448,6 +1449,18 @@ See command `cider-mode'."
14481449
(unless (cider-connected-p)
14491450
(cider-disable-on-existing-clojure-buffers)))
14501451

1452+
(defun cider--all-ns ()
1453+
"Get a list of the available namespaces."
1454+
(-> (list "op" "ns-list")
1455+
(nrepl-send-sync-request)
1456+
(plist-get :value)))
1457+
1458+
(defun cider--ns-vars (ns)
1459+
"Get a list of the vars in NS."
1460+
(-> (list "op" "ns-vars" "ns" ns)
1461+
(nrepl-send-sync-request)
1462+
(plist-get :value)))
1463+
14511464
(defun cider-fetch-vars-form (ns)
14521465
"Construct a Clojure form to read vars inside for NS."
14531466
`(concat (if (find-ns (symbol ,ns))

cider-repl.el

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -654,11 +654,6 @@ text property `cider-old-input'."
654654
(insert
655655
(propertize ";;; output cleared" 'face 'font-lock-comment-face)))))))
656656

657-
(defun cider--all-ns ()
658-
"Get a list of the available namespaces."
659-
(cider-sync-eval-and-parse
660-
"(clojure.core/map clojure.core/str (clojure.core/all-ns))"))
661-
662657
(defun cider-repl-set-ns (ns)
663658
"Switch the namespace of the REPL buffer to NS.
664659

0 commit comments

Comments
 (0)