Normalize references to the orchard.misc ns

Author: bbatsov

src/orchard/apropos.clj

@@ -4,7 +4,7 @@
   (:require
    [orchard.meta :refer [var-name var-doc] :as m]
    [orchard.query :as query]
-   [orchard.misc :as u])
+   [orchard.misc :as misc])
   (:import
    [clojure.lang MultiFn]))
 
@@ -48,8 +48,8 @@
                  :manipulate-vars
                  (fn [nss vars]
                    (if (first (filter #(= (find-ns 'clojure.core) %) nss))
-                     (concat (keys (or (u/require-and-resolve 'clojure.repl/special-doc-map)
-                                       (u/require-and-resolve 'cljs.repl/special-doc-map)))
+                     (concat (keys (or (misc/require-and-resolve 'clojure.repl/special-doc-map)
+                                       (misc/require-and-resolve 'cljs.repl/special-doc-map)))
                              '[& catch finally]
                              vars)
                      vars))))

src/orchard/cljs/analysis.cljc

@@ -2,7 +2,7 @@
       :author "Gary Trakhman"
       :added "0.6.0"}
  orchard.cljs.analysis
-  (:require [orchard.misc :as u])
+  (:require [orchard.misc :as misc])
   (:refer-clojure :exclude [find-ns find-var all-ns ns-aliases]))
 
 (defn all-ns
@@ -154,8 +154,8 @@
   [m]
   (-> m
       (assoc :ns (or (:ns m) (:name m)))
-      (update :ns u/namespace-sym)
-      (update :name u/name-sym)))
+      (update :ns misc/namespace-sym)
+      (update :name misc/name-sym)))
 
 (defn var-meta
   "Return meta for the var, we wrap it in order to support both JVM and
@@ -164,37 +164,37 @@
   (cond-> {}
     (map? var) (merge var)
     (var? var) (-> (merge (meta var))
-                   (update :ns #(cond-> % (u/ns-obj? %) ns-name)))
+                   (update :ns #(cond-> % (misc/ns-obj? %) ns-name)))
     true sanitize-ns
-    #?@(:cljs [true (-> (update :ns u/remove-macros)
-                        (update :name u/remove-macros))])))
+    #?@(:cljs [true (-> (update :ns misc/remove-macros)
+                        (update :name misc/remove-macros))])))
 
 (defn ns-meta
   "Return meta for the var, we wrap it in order to support both JVM and
   self-host."
   [var]
   (cond-> {}
     (map? var) (merge var)
-    (u/ns-obj? var) (merge {:ns (ns-name var)
+    (misc/ns-obj? var) (merge {:ns (ns-name var)
                             :name (ns-name var)})
     true sanitize-ns
-    #?@(:cljs [true (-> (update :ns u/remove-macros)
-                        (update :name u/remove-macros))])))
+    #?@(:cljs [true (-> (update :ns misc/remove-macros)
+                        (update :name misc/remove-macros))])))
 
 (defn find-symbol-meta
   "Given a namespace-qualified var name, gets the analyzer metadata for that
   var."
   [env sym]
-  (let [ns (find-ns env (u/namespace-sym sym))]
+  (let [ns (find-ns env (misc/namespace-sym sym))]
     (some-> (:defs ns)
-            (get (u/name-sym sym))
+            (get (misc/name-sym sym))
             var-meta)))
 
 (defn special-meta
   "Given a special symbol, gets the analyzer metadata."
   [_ sym]
-  (when-let [meta #?(:clj (or (get (u/require-and-resolve 'cljs.repl/special-doc-map) sym)
-                              (get (u/require-and-resolve 'cljs.repl/repl-special-doc-map) sym))
+  (when-let [meta #?(:clj (or (get (misc/require-and-resolve 'cljs.repl/special-doc-map) sym)
+                              (get (misc/require-and-resolve 'cljs.repl/repl-special-doc-map) sym))
                      :cljs (or (get special/special-doc-map sym)
                                (get special/repl-special-doc-map sym)))]
     (merge {:name sym

src/orchard/cljs/meta.cljc

@@ -3,7 +3,7 @@
       :added "0.6.0"}
  orchard.cljs.meta
   (:require [orchard.cljs.analysis :as a #?@(:cljs [:include-macros true])]
-            [orchard.misc :as u #?@(:cljs [:include-macros true])]))
+            [orchard.misc :as misc #?@(:cljs [:include-macros true])]))
 
 (defn normalize-ns-meta
   "Normalize cljs namespace metadata to look like a clj."
@@ -27,7 +27,7 @@
                                   a/var-meta
                                   :file)
                      :cljs (some-> env
-                                   (a/ns-interns-from-env (u/add-ns-macros ns))
+                                   (a/ns-interns-from-env (misc/add-ns-macros ns))
                                    first
                                    val
                                    :file))
@@ -56,16 +56,16 @@
 (defn scoped-var-meta
   [env sym & [context-ns]]
   (or (a/find-symbol-meta env sym)
-      (let [scope (u/namespace-sym sym)
+      (let [scope (misc/namespace-sym sym)
             aliased-ns (a/ns-alias env scope context-ns)
-            sym (symbol (str (or aliased-ns context-ns) "/" (u/name-sym sym)))]
+            sym (symbol (str (or aliased-ns context-ns) "/" (misc/name-sym sym)))]
         (a/find-symbol-meta env sym))))
 
 (defn macro-namespace
   "Compute the namespace of a macro symbol."
   [env sym & [context-ns]]
   {:pre [(symbol? sym)]}
-  (let [ns-from-sym (u/as-sym (namespace sym))]
+  (let [ns-from-sym (misc/as-sym (namespace sym))]
     (or (a/macro-ns-alias env ns-from-sym context-ns)
         ns-from-sym
         context-ns)))
@@ -77,7 +77,7 @@
     (when (and ns (find-ns ns))
       (some-> env
               (a/public-macros #?(:clj ns
-                                  :cljs (u/add-ns-macros ns)))
+                                  :cljs (misc/add-ns-macros ns)))
               (get sym)
               a/var-meta))))
 
@@ -92,7 +92,7 @@
          :cljs (let [referred-ns (symbol (namespace referred))
                      referred-sym (symbol (name referred))]
                  (-> env
-                     (a/ns-interns-from-env (u/add-ns-macros referred-ns))
+                     (a/ns-interns-from-env (misc/add-ns-macros referred-ns))
                      (get referred-sym)
                      a/var-meta))))))
 
@@ -101,7 +101,7 @@
   (let [ns (macro-namespace env sym context-ns)]
     (some-> env
             (a/macro-ns-alias sym ns)
-            #?(:cljs u/add-ns-macros)
+            #?(:cljs misc/add-ns-macros)
             find-ns)))
 
 (defn special-sym-meta

src/orchard/info.clj

@@ -9,7 +9,7 @@
    [orchard.cljs.meta :as cljs-meta]
    [orchard.java :as java]
    [orchard.meta :as m]
-   [orchard.misc :as u]
+   [orchard.misc :as misc]
    [orchard.java.resource :as resource]))
 
 (defn normalize-ns-meta
@@ -58,8 +58,8 @@
       ;;   (name 'mount.core) ;;=> "mount.core
       (qualified-symbol? sym)
       (assoc :qualified-sym sym
-             :unqualified-sym (u/name-sym sym)
-             :computed-ns (u/namespace-sym sym))
+             :unqualified-sym (misc/name-sym sym)
+             :computed-ns (misc/namespace-sym sym))
 
       (and sym (not (qualified-symbol? sym)))
       (assoc :unqualified-sym (-> sym name symbol))
@@ -181,7 +181,7 @@ resolved (real) namespace and name here"}
 
      (merge (when-let [file-path (:file meta)]
               {:file (cond-> file-path
-                       (u/boot-project?) cp/classpath-file-relative-path)})))))
+                       (misc/boot-project?) cp/classpath-file-relative-path)})))))
 
 (defn info
   "Provide the info map for the input ns and sym.

src/orchard/java.clj

@@ -7,7 +7,7 @@
    [clojure.reflect :as r]
    [clojure.string :as str]
    [orchard.java.classpath :as cp]
-   [orchard.misc :as util]
+   [orchard.misc :as misc]
    [orchard.java.resource :as resource])
   (:import
    (clojure.lang IPersistentMap)
@@ -62,7 +62,7 @@
   "The `tools.jar` path, for JDK8 and earlier. If found on the existing
   classpath, this is the corresponding classpath entry. Otherwise, if available,
   this is added to the classpath."
-  (when (<= util/java-api-version 8)
+  (when (<= misc/java-api-version 8)
     (or (some-> (io/resource "com/sun/javadoc/Doc.class")
                 (.. openConnection getJarFileURL))
         (some-> (jdk-find "tools.jar") cp/add-classpath!))))
@@ -74,7 +74,7 @@
 ;; N.b. Where a method's bytecode signature differs from its declared signature
 ;; (other than collection generics), the javadoc method URL can't be inferred as
 ;; done below. (Specifically, this applies to varargs and non-collection
-;; generics, e.g. `java/util/Arrays.html#asList(T...)`.) Since the member is
+;; generics, e.g. `java/misc/Arrays.html#asList(T...)`.) Since the member is
 ;; just a URL fragment, the javadoc link will simply navigate to the parent
 ;; class in these cases.
 
@@ -84,7 +84,7 @@
 (defn javadoc-url
   "Return the relative `.html` javadoc path and member fragment."
   ([class]
-   (let [maybe-module (when (>= util/java-api-version 11)
+   (let [maybe-module (when (>= misc/java-api-version 11)
                         (some-> (module-name class) (str "/")))]
      (str maybe-module
           (-> (str/replace (str class) "." "/")
@@ -93,7 +93,7 @@
   ([class member argtypes]
    (str (javadoc-url class) "#" member
         (when argtypes
-          (if (<= util/java-api-version 9) ; argtypes were munged before Java 10
+          (if (<= misc/java-api-version 9) ; argtypes were munged before Java 10
             (str "-" (str/join "-" (map #(str/replace % #"\[\]" ":A") argtypes)) "-")
             (str "(" (str/join "," argtypes) ")"))))))
 
@@ -108,7 +108,7 @@
 (def source-info
   "When a Java parser is available, return class info from its parsed source;
   otherwise return nil."
-  (if (>= util/java-api-version 9)
+  (if (>= misc/java-api-version 9)
     (do (require '[orchard.java.parser :as src])
         (resolve 'src/source-info))
     (if jdk-tools
@@ -120,7 +120,7 @@
   "On JDK9+, return module name from the class if present; otherwise return nil"
   ;; NOTE This function exists in the parser namespace for conditional
   ;; loading on JDK9+; it does not require parsing.
-  (if (>= util/java-api-version 9)
+  (if (>= misc/java-api-version 9)
     (resolve 'src/module-name)
     (constantly nil)))
 
@@ -192,7 +192,7 @@
                            (catch Exception _)
                            (catch LinkageError _))]
     (let [r (JavaReflector. (.getClassLoader c))] ; for dynamically loaded classes
-      (util/deep-merge (reflect-info (r/reflect c :reflector r))
+      (misc/deep-merge (reflect-info (r/reflect c :reflector r))
                        (source-info class)
                        {:name       (-> c .getSimpleName symbol)
                         :class      (-> c .getName symbol)
@@ -355,8 +355,8 @@
       ;; 8, so we try our own thing first.
       (when (re-find #"^(java|javax|jdk|org.omg|org.w3c.dom|org.xml.sax)/" path)
         (apply str ["https://docs.oracle.com"
-                    (if (>= util/java-api-version 11) "/en/java/javase/" "/javase/")
-                    util/java-api-version
+                    (if (>= misc/java-api-version 11) "/en/java/javase/" "/javase/")
+                    misc/java-api-version
                     "/docs/api/"
                     path]))
       ;; If that didn't work, _then_ we fallback on `*remote-javadocs*`.

src/orchard/java/classpath.clj

@@ -4,7 +4,7 @@
    [clojure.java.io :as io]
    [clojure.string :as str]
    [dynapath.util :as dp]
-   [orchard.misc :as u])
+   [orchard.misc :as misc])
   (:import
    (java.io File)
    (java.net URI URL)
@@ -79,7 +79,7 @@
   as relative paths"
   [^URL url]
   (let [f (io/as-file url)]
-    (if (u/archive? url)
+    (if (misc/archive? url)
       (->> (enumeration-seq (.entries (JarFile. f)))
            (filter #(not (.isDirectory ^JarEntry %)))
            (map #(.getName ^JarEntry %)))
@@ -107,7 +107,7 @@
 
 (defn boot-aware-classloader
   []
-  (if (u/boot-project?)
+  (if (misc/boot-project?)
     (boot-classloader)
     (context-classloader)))
 

src/orchard/meta.clj

@@ -6,7 +6,7 @@
    [clojure.string :as str]
    [clojure.walk :as walk]
    [orchard.namespace :as ns]
-   [orchard.misc :as u]
+   [orchard.misc :as misc]
    [orchard.spec :as spec]
    [orchard.cljs.meta :as cljs-meta])
   (:import
@@ -107,9 +107,9 @@
 (defn repl-special-meta*
   "Return the REPL specials info."
   [sym]
-  (or (when-let [f (u/require-and-resolve 'clojure.repl/special-doc)]
+  (or (when-let [f (misc/require-and-resolve 'clojure.repl/special-doc)]
         (f sym))
-      (when-let [f (u/require-and-resolve 'cljs.repl/special-doc)]
+      (when-let [f (misc/require-and-resolve 'cljs.repl/special-doc)]
         (f sym))))
 
 (def repl-special-meta

src/orchard/namespace.clj

@@ -5,7 +5,7 @@
    [clojure.java.io :as io]
    [clojure.string :as str]
    [orchard.java.classpath :as cp]
-   [orchard.misc :as u])
+   [orchard.misc :as misc])
   (:import
    (clojure.lang Namespace)
    (java.io File PushbackReader)))
@@ -50,7 +50,7 @@
 (defn in-project?
   "Whether the URL is in the current project's directory"
   [url]
-  (let [path (if (u/os-windows?) (comp str/lower-case str) str)]
+  (let [path (if (misc/os-windows?) (comp str/lower-case str) str)]
     (.startsWith (path url) (path project-root))))
 
 (defn inlined-dependency?
@@ -90,7 +90,7 @@
   classpath URLs"
   ([classpath-urls]
    (->> (mapcat cp/classpath-seq classpath-urls)
-        (filter u/clj-file?)
+        (filter misc/clj-file?)
         (map (comp read-namespace io/resource))
         (filter identity)
         (sort)))
@@ -101,7 +101,7 @@
   "Returns all namespaces defined in sources within the current project."
   []
   (->> (cp/classpath)
-       (filter (every-pred u/directory? in-project?))
+       (filter (every-pred misc/directory? in-project?))
        (classpath-namespaces)))
 
 (defn loaded-project-namespaces

test/orchard/java/classpath_test.clj

@@ -5,7 +5,7 @@
    [clojure.string :as str]
    [clojure.test :refer :all]
    [orchard.java.classpath :as cp]
-   [orchard.misc :as u])
+   [orchard.misc :as misc])
   (:import
    (java.io File)
    (java.net URL)))
@@ -25,7 +25,7 @@
                   (cp/classpath))))
     (testing "directory paths have a trailing slash"
       (is (->> (cp/classpath)
-               (filter u/directory?)
+               (filter misc/directory?)
                (every? #(.endsWith (.getPath %) "/")))))
     (testing "contains expected entries"
       (let [project-root (System/getProperty "user.dir")]

test/orchard/java_test.clj

@@ -4,9 +4,9 @@
    [clojure.test :refer :all]
    [dynapath.util :as dp]
    [orchard.java :refer :all]
-   [orchard.misc :as u]))
+   [orchard.misc :as misc]))
 
-(def jdk-parser? (or (>= u/java-api-version 9) jdk-tools))
+(def jdk-parser? (or (>= misc/java-api-version 9) jdk-tools))
 
 (deftest resources-test
   ;; If the JDK resources we wish to load dynamically are present on the file
@@ -161,7 +161,7 @@
 (deftest javadoc-urls-test
   (testing "Javadoc URL"
     (testing "for Java < 11" ; JDK8 - JDK11
-      (with-redefs [u/java-api-version 8
+      (with-redefs [misc/java-api-version 8
                     cache (atom {})]
         (testing "of a class"
           (is (= (:javadoc (class-info 'java.lang.String))
@@ -196,9 +196,9 @@
                    "java/util/Hashtable.html#putAll-java.util.Map-"))))))
 
     ;; Java 11+ URLs require module information, which is only available on Java 9+.
-    (when (>= u/java-api-version 9)
+    (when (>= misc/java-api-version 9)
       (testing "for Java 11+"
-        (with-redefs [u/java-api-version 11
+        (with-redefs [misc/java-api-version 11
                       cache (atom {})]
           (testing "of a class"
             (is (= (:javadoc (class-info 'java.lang.String))