Revert clojure.string alias back to str

Author: alexander-yakushev

.clj-kondo/config.edn

@@ -4,6 +4,5 @@
  :linters           {:unused-private-var {:level   :warning
                                           :exclude [orchard.query-test/a-private orchard.query-test/docd-fn]}
                      :unresolved-symbol  {:exclude [(clojure.test/is [match?])]}
-                     :consistent-alias   {:aliases {clojure.string string}}
                      ;; Enable this opt-in linter:
                      :unsorted-required-namespaces {:level :warning}}}

src/orchard/cljs/analysis.cljc

@@ -4,7 +4,7 @@
    :added "0.5"}
   (:refer-clojure :exclude [all-ns find-ns find-var ns-aliases ns-resolve])
   (:require
-   [clojure.string :as string]
+   [clojure.string :as str]
    [orchard.misc :as misc]))
 
 (defn all-ns [{namespaces :cljs.analyzer/namespaces}]
@@ -210,7 +210,7 @@
   * a var that is alias-qualified e.g. `foo/bar`."
   [env ns sym]
   (let [[referred-var-ns referred-var-symbol :as referred]
-        (some-> env (referred-vars ns) (get sym) (str) (string/split #"/") (->> (map symbol)))]
+        (some-> env (referred-vars ns) (get sym) (str) (str/split #"/") (->> (map symbol)))]
     (if referred
       (find-symbol-meta env referred-var-ns referred-var-symbol)
       (let [sym-ns (some-> sym namespace symbol)

src/orchard/indent.clj

@@ -2,7 +2,7 @@
   "`:style/indent` inference."
   (:require
    [clojure.set :as set]
-   [clojure.string :as string])
+   [clojure.string :as str])
   (:import
    (java.util List)))
 
@@ -115,7 +115,7 @@
                                                                            (find clojure-mode-indents-fuzzy macro-name)
                                                                            (->> clojure-mode-indents-fuzzy
                                                                                 (some (fn [[k _v :as entry]]
-                                                                                        (when (string/includes? macro-name k)
+                                                                                        (when (str/includes? macro-name k)
                                                                                           entry)))))
         one-arglist? (-> arglists count (= 1))
         def-like? (re-find #"^def" macro-name)

src/orchard/inspect.clj

@@ -10,7 +10,7 @@
   Pretty wild, right?"
   (:require
    [clojure.core.protocols :refer [datafy nav]]
-   [clojure.string :as string]
+   [clojure.string :as str]
    [orchard.print :as print])
   (:import
    (java.lang.reflect Constructor Field Method Modifier)
@@ -556,7 +556,7 @@
 (defn- render-indent-str-lines [inspector s]
   (reduce #(-> (render-indent %1 (str %2))
                (render-ln))
-          inspector (string/split-lines s)))
+          inspector (str/split-lines s)))
 
 (defmethod inspect :string [inspector ^java.lang.String obj]
   (-> (render-class-name inspector obj)
@@ -581,13 +581,13 @@
   ;; Ugly as hell, but easier than reimplementing all custom printing that
   ;; java.lang.reflect does.
   (as-> member-string s
-    (string/replace s #"[\w\.]+\.(\w+\()" "$1") ;; remove class from method name
-    (string/replace s #"[\w\.]+\.(\w+)$" "$1") ;; remove class from field name
+    (str/replace s #"[\w\.]+\.(\w+\()" "$1") ;; remove class from method name
+    (str/replace s #"[\w\.]+\.(\w+)$" "$1") ;; remove class from field name
     ;; Class might not have a canonical name, as per `.getCanonicalName` doc.
     (if-let [canonical (.getCanonicalName class)]
-      (string/replace s canonical (.getSimpleName class))
+      (str/replace s canonical (.getSimpleName class))
       s)
-    (string/replace s #"java.lang.([A-Z])" "$1")))
+    (str/replace s #"java.lang.([A-Z])" "$1")))
 
 (defmethod inspect :default [inspector obj]
   (let [class-chain (loop [c (class obj), res ()]
@@ -763,7 +763,7 @@
     (if (and (seq path) (not-any? #(= % '<unknown>) path))
       (-> (render-section-header inspector "Path")
           (indent)
-          (render-indent (string/join " " (:path inspector)))
+          (render-indent (str/join " " (:path inspector)))
           (unindent))
       inspector)))
 

src/orchard/java.clj

@@ -4,7 +4,7 @@
   (:require
    [clojure.java.javadoc :as javadoc]
    [clojure.reflect :as reflect]
-   [clojure.string :as string]
+   [clojure.string :as str]
    [orchard.java.resource :as resource]
    [orchard.java.source-files :as src-files]
    [orchard.misc :as misc]
@@ -71,8 +71,8 @@
 (defn javadoc-url
   "Return the relative `.html` javadoc path and member fragment."
   ([class]
-   (let [url (str (-> (string/replace (str class) "." "/")
-                      (string/replace "$" "."))
+   (let [url (str (-> (str/replace (str class) "." "/")
+                      (str/replace "$" "."))
                   ".html")
          ;; As of Java 11, Javadoc URLs begin with the module name.
          module (module-name class)]
@@ -82,8 +82,8 @@
    (str (javadoc-url class) "#" member
         (when argtypes
           (if (< misc/java-api-version 11) ; argtypes were munged before Java 11
-            (str "-" (string/join "-" (map #(string/replace % #"\[\]" ":A") argtypes)) "-")
-            (str "(" (string/join "," argtypes) ")"))))))
+            (str "-" (str/join "-" (map #(str/replace % #"\[\]" ":A") argtypes)) "-")
+            (str "(" (str/join "," argtypes) ")"))))))
 
 ;;; ## Class Metadata Assembly
 ;;
@@ -105,7 +105,7 @@
   ;; make the format match with that of `parser-next`:
   (mapv #(some-> %
                  str
-                 (string/replace "$" ".")
+                 (str/replace "$" ".")
                  symbol
                  typesym)
         argtypes))
@@ -193,12 +193,12 @@
         sb (StringBuilder.)
         package-re (when package
                      (re-pattern (str "^"
-                                      (string/replace package "." "\\.")
+                                      (str/replace package "." "\\.")
                                       "\\.")))
         shorten (fn [s]
                   (cond-> s
-                    package (string/replace package-re "")
-                    true (string/replace #"^java\.lang\." "")))
+                    package (str/replace package-re "")
+                    true (str/replace #"^java\.lang\." "")))
         fill-arglist!
         (fn []
           (into []

src/orchard/java/parser_next.clj

@@ -21,7 +21,7 @@
   {:added "0.15.0"}
   (:require
    [clojure.java.io :as io]
-   [clojure.string :as string]
+   [clojure.string :as str]
    [orchard.java.modules :as modules]
    [orchard.java.source-files :as src-files]
    [orchard.misc :as misc])
@@ -126,12 +126,12 @@
   "Using parse tree info, return the type's name equivalently to the `typesym`
   function in `orchard.java`."
   ([n ^DocletEnvironment env]
-   (let [t (string/replace (str n) #"<.*>" "") ; drop generics
+   (let [t (str/replace (str n) #"<.*>" "") ; drop generics
          util (.getElementUtils env)]
      (if-let [c (.getTypeElement util t)]
        (let [pkg (str (.getPackageOf util c) ".")
-             cls (-> (string/replace-first t pkg "")
-                     (string/replace "." "$"))]
+             cls (-> (str/replace-first t pkg "")
+                     (str/replace "." "$"))]
          (symbol (str pkg cls))) ; classes
        (symbol t)))))            ; primitives
 
@@ -294,15 +294,15 @@
           xs))
 
 (defn remove-left-margin [s]
-  (->> (string/split s #"\r?\n" -1) ;; split-lines without losing trailing newlines
+  (->> (str/split s #"\r?\n" -1) ;; split-lines without losing trailing newlines
        (map-indexed (fn [i s]
                       (let [first? (zero? i)
-                            blank? (string/blank? s)]
+                            blank? (str/blank? s)]
                         (cond-> s
                           (and (not first?)
                                (not blank?))
-                          (string/replace #"^ +" "")))))
-       (string/join "\n")))
+                          (str/replace #"^ +" "")))))
+       (str/join "\n")))
 
 (defn cleanup-whitespace [fragments]
   (into []
@@ -311,13 +311,13 @@
                    :as x}]
                (let [text? (= content-type "text")]
                  (assoc x :content (-> content
-                                       (string/replace #"^  +" " ")
-                                       (string/replace #"  +$" " ")
-                                       (string/replace #"\s*\n+\s*\n+\s*" "\n\n")
-                                       (string/replace #"\n +$" "\n")
+                                       (str/replace #"^  +" " ")
+                                       (str/replace #"  +$" " ")
+                                       (str/replace #"\s*\n+\s*\n+\s*" "\n\n")
+                                       (str/replace #"\n +$" "\n")
                                        (cond-> text? remove-left-margin
-                                               text? (string/replace #"^ +\." ".")
-                                               text? (string/replace #"^ +," ",")))))))
+                                               text? (str/replace #"^ +\." ".")
+                                               text? (str/replace #"^ +," ",")))))))
         fragments))
 
 (defn docstring
@@ -345,7 +345,7 @@
                                                             :found-closing-tags-types
                                                             found-closing-tags-types))
                                 :result)]
-    {:doc (some-> env .getElementUtils (.getDocComment e) string/trim)
+    {:doc (some-> env .getElementUtils (.getDocComment e) str/trim)
      :doc-first-sentence-fragments (-> first-sentence coalesce cleanup-whitespace)
      :doc-fragments (-> full-body coalesce cleanup-whitespace)
      :doc-block-tags-fragments (-> block-tags coalesce cleanup-whitespace)}))
@@ -382,12 +382,12 @@
                                       (= kind TypeKind/TYPEVAR)
                                       (upper-bound type))
                                 str
-                                (string/replace #"<.*>" "") ;; Remove generics
+                                (str/replace #"<.*>" "") ;; Remove generics
                                 symbol)]
                (some-> (or best
                            (type->sym element))
                        str
-                       (string/replace "$" ".")
+                       (str/replace "$" ".")
                        symbol)))
            parameters)
      :argnames (mapv #(-> ^VariableElement % .getSimpleName str symbol) (.getParameters m))}))

src/orchard/java/source_files.clj

@@ -4,7 +4,7 @@
   {:author "Oleksandr Yakushev"
    :added "0.29"}
   (:require [clojure.java.io :as io]
-            [clojure.string :as string]
+            [clojure.string :as str]
             [orchard.misc :as misc])
   (:import (java.io File IOException)
            (java.net URL)))
@@ -44,14 +44,14 @@
   (let [module (when (>= misc/java-api-version 11)
                  ((requiring-resolve 'orchard.java.modules/module-name) klass))
         classfile-name (-> (.getName klass)
-                           (string/replace #"\$.*" "") ;; Drop internal class.
-                           (string/replace "." "/")
+                           (str/replace #"\$.*" "") ;; Drop internal class.
+                           (str/replace "." "/")
                            (str ".class"))]
     (cond->> classfile-name
       module (format "%s/%s" module))))
 
 (defn- classfile-path->sourcefile-path [classfile-name]
-  (string/replace classfile-name #"\.class$" ".java"))
+  (str/replace classfile-name #"\.class$" ".java"))
 
 (defn class->sourcefile-path
   "Infer a relative path to a source file of the given `klass`."
@@ -82,7 +82,7 @@
   ;; function that prefixes the URL with jar:. This is fine.
   (try
     (let [uri-str (str (.toURI archive))]
-      (when (string/starts-with? uri-str "file:")
+      (when (str/starts-with? uri-str "file:")
         (io/as-url (format "jar:%s!/%s" uri-str relative-filename))))
     ;; Exceptions might happen when creating an URL, protect users from them.
     (catch java.net.MalformedURLException _)))
@@ -169,7 +169,7 @@
                             (recur (cons name acc) parent)
                             acc)))]
       {:artifact artifact
-       :group    (string/join "." group-parts)
+       :group    (str/join "." group-parts)
        :version  version})))
 
 #_(infer-maven-coordinates-for-class clojure.lang.PersistentVector)
@@ -192,14 +192,14 @@
 #_(download-sources-using-invoke-tool (infer-maven-coordinates-for-class clojure.lang.PersistentVector))
 
 (defn- run-subprocess [args]
-  (println "[Orchard] Invoking subprocess:" (string/join " " args))
+  (println "[Orchard] Invoking subprocess:" (str/join " " args))
   (let [process (.start (ProcessBuilder. ^java.util.List args))]
     (.waitFor process)
     (let [out (slurp (.getInputStream process))
           err (slurp (.getErrorStream process))]
-      (when-not (string/blank? out)
+      (when-not (str/blank? out)
         (println out))
-      (when-not (string/blank? err)
+      (when-not (str/blank? err)
         (binding [*out* *err*] (println err))))
     (.exitValue process)))
 

src/orchard/meta.clj

@@ -3,7 +3,7 @@
   (:require
    [clojure.java.io :as io]
    [clojure.pprint :as pprint]
-   [clojure.string :as string]
+   [clojure.string :as str]
    [clojure.walk :as walk]
    [orchard.cljs.analysis :as cljs-ana]
    [orchard.clojuredocs :as cljdocs]
@@ -21,13 +21,13 @@
   (if (seq? description)
     (str "(" (->> description
                   (map #(with-out-str (pprint/pprint %)))
-                  string/join
-                  string/trim-newline)
+                  str/join
+                  str/trim-newline)
          ")")
     (->>  description
           pprint/pprint
           with-out-str
-          string/trim-newline)))
+          str/trim-newline)))
 
 (defn format-spec
   "Return sequence of [role spec-description] pairs."
@@ -52,7 +52,7 @@
   entry pointing to https://clojure.org/..."
   [info]
   (if-let [url (cond
-                 (not (string/blank? (:url info)))
+                 (not (str/blank? (:url info)))
                  (str "https://clojure.org/" (:url info))
 
                  (:special-form info)
@@ -128,10 +128,10 @@
   - some.ns$eval1234$closing_over_fn__12345.invoke"
   [sym]
   (let [demunged (-> (Compiler/demunge (str sym))
-                     (string/replace #"--\d+" ""))
+                     (str/replace #"--\d+" ""))
         [_ wo-method] (re-matches #"(.+?)(?:\.(?:invoke|invokeStatic|doInvoke))?"
                                   demunged)
-        [ns-str name-str] (->> (string/split wo-method #"/")
+        [ns-str name-str] (->> (str/split wo-method #"/")
                                (remove #(re-matches #"eval\d+" %)))
         ns (some-> ns-str symbol find-ns)
         resolved (when (and ns name-str)
@@ -297,10 +297,10 @@
        "(not documented)"))
   ([n v]
    (->> (-> (var-doc v)
-            (string/replace #"\s+" " ") ; normalize whitespace
-            (string/split #"(?<=\.) ")) ; split sentences
+            (str/replace #"\s+" " ") ; normalize whitespace
+            (str/split #"(?<=\.) ")) ; split sentences
         (take n)
-        (string/join " "))))
+        (str/join " "))))
 
 (defn var-code
   "Find the source of the var `v`.

src/orchard/misc.clj

@@ -3,7 +3,7 @@
   (:refer-clojure :exclude [update-keys update-vals])
   (:require
    [clojure.java.io :as io]
-   [clojure.string :as string]
+   [clojure.string :as str]
    [orchard.util.io :as util.io])
   (:import
    (java.util.concurrent.locks ReentrantLock)))
@@ -105,7 +105,7 @@
   "Parse a Java version string according to JEP 223 and return the appropriate
   version."
   [java-ver]
-  (try (let [[major minor _] (string/split java-ver #"\.")
+  (try (let [[major minor _] (str/split java-ver #"\.")
              major (Integer/parseInt major)]
          (if (> major 1)
            major
@@ -129,7 +129,7 @@
   [sym]
   (some-> sym
           str
-          (string/replace #"\$macros" "")
+          (str/replace #"\$macros" "")
           symbol))
 
 (defn ns-obj?