Normalize references to the orchard.misc ns

Author: bbatsov

src/cider/nrepl/middleware/complete.clj

@@ -5,7 +5,7 @@
    [cljs-tooling.complete :as cljs-complete]
    [compliment.core :as jvm-complete]
    [compliment.utils :as jvm-complete-utils]
-   [orchard.misc :as u]
+   [orchard.misc :as misc]
    [suitable.complete-for-nrepl :as suitable]))
 
 (defn- cljs-complete
@@ -16,7 +16,7 @@
 
 (defn complete
   [{:keys [ns symbol context extra-metadata] :as msg}]
-  (let [ns (u/as-sym ns)
+  (let [ns (misc/as-sym ns)
         prefix (str symbol)
         extra-metadata (set (map keyword extra-metadata))]
     (if-let [cljs-env (cljs/grab-cljs-env msg)]
@@ -28,7 +28,7 @@
 (defn completion-doc
   [{:keys [ns symbol] :as msg}]
   (when-not (cljs/grab-cljs-env msg)
-    (jvm-complete/documentation (str symbol) (u/as-sym ns))))
+    (jvm-complete/documentation (str symbol) (misc/as-sym ns))))
 
 (defn complete-reply [msg]
   {:completions (complete msg)})

src/cider/nrepl/middleware/info.clj

@@ -7,7 +7,7 @@
    [clojure.string :as str]
    [orchard.eldoc :as eldoc]
    [orchard.info :as info]
-   [orchard.misc :as u]))
+   [orchard.misc :as misc]))
 
 (declare format-response)
 
@@ -49,7 +49,7 @@
 
 (defn info
   [{:keys [ns symbol class member] :as msg}]
-  (let [[ns symbol class member] (map u/as-sym [ns symbol class member])
+  (let [[ns symbol class member] (map misc/as-sym [ns symbol class member])
         env (cljs/grab-cljs-env msg)
         info-params (merge {:dialect :clj
                             :ns ns

src/cider/nrepl/middleware/macroexpand.clj

@@ -8,7 +8,7 @@
    [clojure.pprint :as pp]
    [clojure.tools.reader :as reader]
    [clojure.walk :as walk]
-   [orchard.misc :as u])
+   [orchard.misc :as misc])
   (:import
    [clojure.lang Var]))
 
@@ -212,8 +212,8 @@
 (defn macroexpansion [{:keys [print-meta ns] :as msg}]
   (let [msg (merge {:expander "macroexpand" :display-namespaces "qualified"} msg)
         expansion (if (cljs/grab-cljs-env msg)
-                    (expand-cljs (assoc msg :ns (or (u/as-sym ns) 'cljs.user)))
-                    (expand-clj (assoc msg :ns (or (u/as-sym ns) 'user))))]
+                    (expand-cljs (assoc msg :ns (or (misc/as-sym ns) 'cljs.user)))
+                    (expand-clj (assoc msg :ns (or (misc/as-sym ns) 'user))))]
     (with-out-str
       (binding [*print-meta* (boolean print-meta)]
         (pp/write expansion :dispatch pp/code-dispatch)))))

src/cider/nrepl/middleware/ns.clj

@@ -8,7 +8,7 @@
    [cider.nrepl.middleware.util.meta :as um]
    [orchard.cljs.analysis :as cljs-analysis]
    [orchard.info :as info]
-   [orchard.misc :as u]
+   [orchard.misc :as misc]
    [orchard.namespace :as ns]
    [orchard.query :as query]))
 
@@ -59,8 +59,8 @@
                      (partial cljs-analysis/public-vars env))]
     (->> (symbol ns)
          fetch-vars
-         (u/update-vals (comp um/relevant-meta :meta))
-         (u/update-keys name)
+         (misc/update-vals (comp um/relevant-meta :meta))
+         (misc/update-keys name)
          (into (sorted-map)))))
 
 (defn ns-list [{:keys [filter-regexps] :as msg}]
@@ -109,7 +109,7 @@
 (defn- ns-aliases-clj [ns]
   (->> (symbol ns)
        (clojure.core/ns-aliases)
-       (u/update-vals ns-name)
+       (misc/update-vals ns-name)
        (util/transform-value)))
 
 (defn- ns-aliases-cljs [env ns]

src/cider/nrepl/middleware/refresh.clj

@@ -15,7 +15,7 @@
    [nrepl.middleware.print :as print]
    [nrepl.misc :refer [response-for]]
    [nrepl.transport :as transport]
-   [orchard.misc :as u]))
+   [orchard.misc :as misc]))
 
 (defonce ^:private refresh-tracker (volatile! (track/tracker)))
 
@@ -67,7 +67,7 @@
   has optional parameters and can be called with zero args, it is
   called. Returns whether the function was resolved."
   [sym {:keys [session] :as msg}]
-  (let [the-var (some-> sym u/as-sym resolve)]
+  (let [the-var (some-> sym misc/as-sym resolve)]
 
     (when (and (var? the-var)
                (not (zero-arity-callable? the-var)))

src/cider/nrepl/middleware/stacktrace.clj

@@ -12,7 +12,6 @@
    [nrepl.transport :as t]
    [orchard.info :as info]
    [orchard.java :as java]
-   [orchard.misc :as u]
    [orchard.namespace :as namespace]
    [orchard.resource :as resource])
   (:import

src/cider/nrepl/middleware/test.clj

@@ -13,7 +13,7 @@
    [nrepl.middleware.print :as print]
    [nrepl.misc :refer [response-for]]
    [nrepl.transport :as t]
-   [orchard.misc :as u]
+   [orchard.misc :as misc]
    [orchard.query :as query]))
 
 ;;; ## Overview
@@ -334,7 +334,7 @@
     (exec id
           (fn []
             (with-bindings (assoc @session #'ie/*msg* msg)
-              (let [[ns var] (map u/as-sym [ns var])]
+              (let [[ns var] (map misc/as-sym [ns var])]
                 (if-let [e (get-in @results [ns var index :error])]
                   (doseq [cause (st/analyze-causes e print-fn)]
                     (t/send transport (response-for msg cause)))

src/cider/nrepl/middleware/track_state.clj

@@ -11,7 +11,7 @@
    [nrepl.misc :refer [response-for]]
    [nrepl.transport :as transport]
    [orchard.classpath :as cp]
-   [orchard.misc :as u])
+   [orchard.misc :as misc])
   (:import
    (clojure.lang Namespace MultiFn)
    java.net.SocketException
@@ -56,7 +56,7 @@
   (cond
     ;; Clojure Namespaces
     (instance? Namespace object)
-    {:aliases (u/update-vals ns-name (ns-aliases object))
+    {:aliases (misc/update-vals ns-name (ns-aliases object))
      :interns (filter-core-and-get-meta (ns-map object))}
 
     ;; ClojureScript Namespaces
@@ -65,15 +65,15 @@
       {:aliases (merge require-macros requires)
        ;; For some reason, cljs (or piggieback) adds a :test key to the
        ;; var metadata stored in the namespace.
-       :interns (merge (u/update-vals #(dissoc (um/relevant-meta (cljs-meta-with-fn %)) :test)
+       :interns (merge (misc/update-vals #(dissoc (um/relevant-meta (cljs-meta-with-fn %)) :test)
                                       defs)
                        ;; FIXME: `uses` and `use-macros` are maps from
                        ;; symbols to namespace names:
                        ;;     {log reagent.debug, dbg reagent.debug}
                        ;; Since we don’t know the metadata for these
                        ;; vars, we resign to "guessing" them.
-                       (u/update-vals (constantly {:arglists '([])}) uses)
-                       (u/update-vals (constantly {:arglists '([]) :macro true}) use-macros))})
+                       (misc/update-vals (constantly {:arglists '([])}) uses)
+                       (misc/update-vals (constantly {:arglists '([]) :macro true}) use-macros))})
 
     :else {}))
 
@@ -82,7 +82,7 @@
     {:aliases {}
      :interns (->> (ns-map clojure-core)
                    (filter #(var? (second %)))
-                   (u/update-vals #(um/relevant-meta (var-meta-with-fn %))))}))
+                   (misc/update-vals #(um/relevant-meta (var-meta-with-fn %))))}))
 
 (defn calculate-changed-ns-map
   "Return a map of namespaces that changed between new-map and old-map.
@@ -152,7 +152,7 @@
 
 (def jar-namespaces
   (->> (cp/classpath)
-       (filter u/jar-file?)
+       (filter misc/jar-file?)
        (map #(JarFile. (io/as-file %)))
        (mapcat ns-find/find-namespaces-in-jarfile)
        (into #{})))

src/cider/nrepl/middleware/undef.clj

@@ -2,11 +2,11 @@
   "Undefine a symbol"
   (:require
    [cider.nrepl.middleware.util.error-handling :refer [with-safe-transport]]
-   [orchard.misc :as u]))
+   [orchard.misc :as misc]))
 
 (defn undef
   [{:keys [ns symbol]}]
-  (let [[ns symbol] (map u/as-sym [ns symbol])]
+  (let [[ns symbol] (map misc/as-sym [ns symbol])]
     (ns-unalias ns symbol)
     (ns-unmap ns symbol)
     symbol))

src/cider/nrepl/middleware/util/meta.clj

@@ -1,7 +1,7 @@
 (ns cider.nrepl.middleware.util.meta
   "Utility functions for extracting and manipulating metadata."
   (:require
-   [orchard.misc :as u]))
+   [orchard.misc :as misc]))
 
 (def relevant-meta-keys
   "Metadata keys that are useful to us.
@@ -15,4 +15,4 @@
   [m]
   (->> (select-keys m relevant-meta-keys)
        (filter second)
-       (u/update-vals pr-str)))
+       (misc/update-vals pr-str)))