Skip to content

Commit 26c5738

Browse files
Fix conditional require for nrepl stuff idempotent
1 parent 65da8bf commit 26c5738

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

src/refactor_nrepl/middleware.clj

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@
1010
;; Compatibility with the legacy tools.nrepl and the new nREPL 0.4.x.
1111
;; The assumption is that if someone is using old lein repl or boot repl
1212
;; they'll end up using the tools.nrepl, otherwise the modern one.
13-
(if (find-ns 'clojure.tools.nrepl)
14-
(require
15-
'[clojure.tools.nrepl.middleware :refer [set-descriptor!]]
16-
'[clojure.tools.nrepl.misc :refer [response-for]]
17-
'[clojure.tools.nrepl.transport :as transport])
18-
(require
19-
'[nrepl.middleware :refer [set-descriptor!]]
20-
'[nrepl.misc :refer [response-for]]
21-
'[nrepl.transport :as transport]))
13+
(when-not (resolve 'set-descriptor!)
14+
(if (find-ns 'clojure.tools.nrepl)
15+
(require
16+
'[clojure.tools.nrepl.middleware :refer [set-descriptor!]]
17+
'[clojure.tools.nrepl.misc :refer [response-for]]
18+
'[clojure.tools.nrepl.transport :as transport])
19+
(require
20+
'[nrepl.middleware :refer [set-descriptor!]]
21+
'[nrepl.misc :refer [response-for]]
22+
'[nrepl.transport :as transport])))
2223

2324
(defn- require-and-resolve [sym]
2425
(require (symbol (namespace sym)))

0 commit comments

Comments
 (0)