[ci] Fix clj-kondo config and warnings

Author: alexander-yakushev

.clj-kondo/config.edn

@@ -1,10 +1,9 @@
-{:output            {:progress      true
-                     :exclude-files ["analysis.cljc" "meta.cljc" "inspect_test.clj" "print_test.clj"]}
+{:output            {:progress true}
  :config-in-comment {:linters {:unused-value         {:level :off}
                                :unresolved-namespace {:level :off}}}
  :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}}}
+                     :unsorted-required-namespaces {:level :warning}}}

src/orchard/cljs/analysis.cljc

@@ -92,6 +92,7 @@
   (and (:impls var)
        (not (:protocol-symbol var))))
 
+#_{:clj-kondo/ignore [:unused-private-var]}
 (defn- macro?
   [[_ var]]
   (:macro (meta var)))
@@ -112,6 +113,7 @@
        (filter (every-pred named? public? (complement foreign-protocol?)))
        (into {})))
 
+#_{:clj-kondo/ignore [:unused-binding]}
 (defn public-macros
   "Given a namespace return all the public var analysis maps. Analogous to
   clojure.core/ns-publics but returns var analysis maps not vars.
@@ -218,6 +220,7 @@
                    (get aliases sym-ns sym-ns)))]
         (find-symbol-meta env ns (misc/name-sym sym))))))
 
+#_{:clj-kondo/ignore [:unresolved-namespace]}
 (defn special-meta
   "Given a special symbol, gets the analyzer metadata."
   [_ sym]

src/orchard/cljs/meta.cljc

@@ -31,6 +31,7 @@
           :name (:name meta)
           :ns (:name meta)}))
 
+#_{:clj-kondo/ignore [:unused-binding]}
 (defn normalize-macro-ns
   "Normalize cljs namespace macro metadata to look like clj."
   [env var]
@@ -66,8 +67,8 @@
   "Normalize cljs macro metadata to look like a clj var."
   [meta]
   (-> meta
-      (merge (:meta meta))
-      (merge (select-keys meta [:file :ns :name])) ;; :file is more accurate than in :meta
+      (merge (:meta meta)
+             (select-keys meta [:file :ns :name])) ;; :file is more accurate than in :meta
       (update :arglists unquote-1)))
 
 (defn scoped-var-meta

test/orchard/inspect_test.clj

@@ -1,24 +1,15 @@
 (ns orchard.inspect-test
   (:require
-   [clojure.data :as data]
-   [clojure.edn :as edn]
-   [clojure.java.io :as io]
-   [clojure.java.shell :as shell]
-   [clojure.pprint :as pprint]
    [clojure.string :as string]
-   [clojure.test :as t :refer [are deftest is testing]]
+   [clojure.test :refer [deftest is testing]]
    [clojure.walk :as walk]
    [matcher-combinators.matchers :as matchers]
    [orchard.inspect :as inspect]
-   [orchard.meta :as m]
-   [orchard.misc :refer [java-api-version]]
-   [orchard.misc :as misc])
+   [orchard.misc :as misc :refer [java-api-version]])
   (:import
-   (java.io File)
    (orchard.java PrivateFieldClass)))
 
-;; for `match?`
-(require 'matcher-combinators.test)
+(require 'matcher-combinators.test) ;; for `match?`
 
 (defn- demunge-str [s]
   (-> s
@@ -35,65 +26,6 @@
                      form))
                  rendered)))
 
-(defn- render-plain [x]
-  (cond (and (seq? x) (keyword? (first x)))
-        (let [[type value & args] x]
-          (case type
-            :newline "\n"
-            :value (format "%s <%s>" value (string/join "," args))))
-        (seq? x)
-        (string/join "" (map render-plain x))
-        :else (str x)))
-
-(defn- diff-text [expected actual]
-  (when (zero? (:exit (shell/sh "git" "--version")))
-    (let [actual-file (File/createTempFile "actual" ".txt")
-          expected-file (File/createTempFile "expected" ".txt")]
-      (spit actual-file (render-plain actual))
-      (spit expected-file (render-plain expected))
-      (try (let [{:keys [exit out err] :as result}
-                 (shell/sh "git" "diff"
-                           (if (= "dumb" (System/getenv "TERM")) "--no-color" "--color")
-                           "--minimal"
-                           "--no-index"
-                           (str actual-file) (str expected-file))]
-             (case exit
-               (0 1) out
-               (ex-info "Failed to call diff" result)))
-           (finally
-             (io/delete-file actual-file)
-             (io/delete-file expected-file))))))
-
-(defn- test-message [msg expected actual]
-  (let [expected-text (render-plain expected)
-        actual-text (render-plain actual)]
-    (with-out-str
-      (println (format "Inspect test failed" (when msg (str ": " msg))))
-      (let [diff (diff-text expected actual)]
-        (when-not (string/blank? diff)
-          (println)
-          (println "=== Text Diff ===\n")
-          (println diff)))
-      (let [[only-in-expected only-in-actual both] (data/diff expected actual)]
-        (when (seq only-in-expected)
-          (println)
-          (println "=== Expected data diff ===\n")
-          (pprint/pprint only-in-expected))
-        (when (seq only-in-actual)
-          (println)
-          (println "=== Actual data diff ===\n")
-          (pprint/pprint only-in-actual)))
-      (when-not (= expected-text actual-text)
-        (when expected
-          (println)
-          (println "=== Expected text ===\n")
-          (println expected-text))
-        (when actual
-          (println)
-          (println "=== Actual text ===\n")
-          (println actual-text)
-          (println))))))
-
 (def nil-result
   '("nil" (:newline)))