Fix kondo suggestions

Author: solar05

.clj-kondo/config.edn

@@ -0,0 +1,2 @@
+{:output {:progress true
+          :exclude-files ["analysis.cljc" "meta.cljc"]}}

.gitignore

@@ -12,3 +12,4 @@ pom.xml.asc
 .cljs_nashorn_repl/
 nashorn_code_cache/
 .cljs_node_repl/
+.clj-kondo/.cache

src/orchard/eldoc.clj

@@ -21,7 +21,7 @@
   (map #(mapv str %) raw-arglists))
 
 (defn- extract-ns-or-class
-  [{:keys [ns class candidates] :as info}]
+  [{:keys [ns class candidates]}]
   (cond
     ns {:ns (str ns)}
     class {:class [(str class)]}

src/orchard/info.clj

@@ -2,7 +2,6 @@
   "Retrieve the info map from var and symbols."
   (:refer-clojure :exclude [qualified-symbol?])
   (:require
-   [clojure.edn :as edn]
    [clojure.java.io :as io]
    [orchard.cljs.analysis :as cljs-ana]
    [orchard.cljs.meta :as cljs-meta]
@@ -186,7 +185,7 @@
   (let [[resource-relative resource-full] (resource/resource-path-tuple path)]
     (merge {:file (or (file-path path) resource-full path)}
            ;; Classpath-relative path if possible
-           (if resource-relative
+           (when resource-relative
              {:resource resource-relative}))))
 
 (defn javadoc-info

src/orchard/inspect.clj

@@ -133,7 +133,7 @@
   "Evaluate the given expression where `v` is bound to the currently inspected
   value. Open the evaluation result in the inspector."
   [inspector expr]
-  (let [{:keys [index path current-page page-size value]} inspector
+  (let [{:keys [current-page value]} inspector
         eval-fn `(fn [~'v] ~(read-string expr))
         result ((eval eval-fn) value)]
     (-> (update inspector :stack conj value)
@@ -204,7 +204,7 @@
 
 (defmulti inspect-value #'value-types)
 
-(defmethod inspect-value nil [value]
+(defmethod inspect-value nil [_value]
   "nil")
 
 (defmethod inspect-value :atom [value]
@@ -360,7 +360,7 @@
     inspector))
 
 ;; Inspector multimethod
-(defn known-types [ins obj]
+(defn known-types [_ins obj]
   (cond
     (nil? obj) :nil
     (map? obj) :coll
@@ -375,12 +375,12 @@
     (instance? List obj) :coll
     (instance? Map obj) :coll
     (.isArray (class obj)) :array
-    :default (or (:inspector-tag (meta obj))
-                 (type obj))))
+    :else (or (:inspector-tag (meta obj))
+              (type obj))))
 
 (defmulti inspect #'known-types)
 
-(defmethod inspect :nil [inspector obj]
+(defmethod inspect :nil [inspector _obj]
   (-> inspector
       (render-ln "nil")))
 
@@ -459,14 +459,6 @@
           (render-fields "Fields:" non-static)
           (render-fields "Static fields:" static)))))
 
-(defn- render-class-section [inspector obj section]
-  (let [method (symbol (str ".get" (name section)))
-        elements (eval (list method obj))]
-    (if (seq elements)
-      `(~(name section) ": " (:newline)
-                        ~@(mapcat (fn [f]
-                                    `("  " (:value ~f) (:newline))) elements)))))
-
 (defn- render-section [obj inspector section]
   (let [method (symbol (str ".get" (name section)))
         elements (eval (list method obj))]
@@ -517,7 +509,7 @@
           (render-ln inspector "Var: #'" ns "/" sym)
           (= type :expr)
           (render-ln inspector "Expr: " expr)
-          :default
+          :else
           inspector)))
 
 (defn render-path [inspector]

src/orchard/java.clj

@@ -14,7 +14,7 @@
    (clojure.lang IPersistentMap)
    (clojure.reflect Constructor Field JavaReflector Method)
    (java.io File)
-   (java.net JarURLConnection URI)))
+   (java.net JarURLConnection)))
 
 ;;; ## Java Class/Member Info
 ;;

src/orchard/java/classpath.clj

@@ -11,7 +11,7 @@
    [orchard.misc :as misc])
   (:import
    (java.io File)
-   (java.net URI URL)
+   (java.net URL)
    (java.nio.file Paths)
    (java.util.jar JarFile JarEntry)))
 

src/orchard/java/legacy_parser.clj

@@ -8,13 +8,12 @@
    (com.sun.javadoc ClassDoc ConstructorDoc Doc FieldDoc MethodDoc
                     Parameter RootDoc Tag Type)
    (com.sun.source.tree ClassTree)
-   (com.sun.tools.javac.util Abort Context List Options)
+   (com.sun.tools.javac.util Abort Context List)
    (com.sun.tools.javadoc DocEnv JavadocEnter JavadocTool Messager
                           ModifierFilter RootDocImpl)
    (com.sun.tools.javac.tree JCTree)
    (java.io StringReader)
    (java.net URI)
-   (java.util Locale)
    (javax.swing.text.html HTML$Tag HTMLEditorKit$ParserCallback)
    (javax.swing.text.html.parser ParserDelegator)
    (javax.tools JavaFileObject$Kind SimpleJavaFileObject)))
@@ -69,7 +68,6 @@
   (when-let [res (io/resource path)]
     (let [access   (ModifierFilter. ModifierFilter/ALL_ACCESS)
           context  (doto (Context.) (Messager/preRegister "orchard-javadoc"))
-          options  (doto (Options/instance context) (.put "ignore.symbol.file" "y"))
           compiler (JavadocTool/make0 context)
           enter    (JavadocEnter/instance0 context)
           docenv   (doto (DocEnv/instance context)

src/orchard/java/parser.clj

@@ -6,15 +6,12 @@
    [clojure.java.io :as io]
    [clojure.string :as str])
   (:import
-   (java.net URI)
    (java.io StringReader StringWriter)
    (javax.lang.model.element Element ElementKind ExecutableElement
                              TypeElement VariableElement)
    (javax.swing.text.html HTML$Tag HTMLEditorKit$ParserCallback)
    (javax.swing.text.html.parser ParserDelegator)
-   (javax.tools DocumentationTool JavaFileObject$Kind
-                SimpleJavaFileObject ToolProvider)
-   (javax.tools JavaFileObject$Kind SimpleJavaFileObject)
+   (javax.tools ToolProvider)
    (jdk.javadoc.doclet Doclet DocletEnvironment)))
 
 ;;; ## JDK Compatibility

src/orchard/java/resource.clj

@@ -44,14 +44,14 @@
   "If it's a resource, return a tuple of the relative path and the full
   resource path."
   [path]
-  (or (if-let [full (resource-full-path path)]
+  (or (when-let [full (resource-full-path path)]
         [path full])
-      (if-let [[_ relative] (re-find #".*jar!/(.*)" path)]
-        (if-let [full (resource-full-path relative)]
+      (when-let [[_ relative] (re-find #".*jar!/(.*)" path)]
+        (when-let [full (resource-full-path relative)]
           [relative full]))
       ;; handles load-file on jar resources from a cider buffer
-      (if-let [[_ relative] (re-find #".*jar:(.*)" path)]
-        (if-let [full (resource-full-path relative)]
+      (when-let [[_ relative] (re-find #".*jar:(.*)" path)]
+        (when-let [full (resource-full-path relative)]
           [relative full]))))
 
 (defn resource-path