Fix self-lint warnings

tomdl89 · Dec 9, 2024 · ee0689d · ee0689d
1 parent a5c7328
commit ee0689d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/src/clj_kondo/impl/analyzer.clj b/src/clj_kondo/impl/analyzer.clj
@@ -69,10 +69,9 @@
                         :top-level? top-level?
                         :arg-types (if add-new-arg-types?
                                      (let [[k v] (first callstack)]
-                                       (if (and (symbol? k)
-                                                (symbol? v))
-                                         (atom [])
-                                         nil))
+                                       (when (and (symbol? k)
+                                                  (symbol? v))
+                                         (atom [])))
                                      (:arg-types ctx))
                         :len len)]
          (into []
@@ -1971,10 +1970,10 @@
                                                        keep keep-indexed])
         arg-count (if (and transducer-eligable?
                            (zero? arg-count)) ;; transducer
-                    (if (and core-ns?
-                             (or (= 'map hof-resolved-name)
-                                 (= 'mapcat hof-resolved-name)))
-                      nil 1)
+                    (when-not (and core-ns?
+                                   (or (= 'map hof-resolved-name)
+                                       (= 'mapcat hof-resolved-name)))
+                      1)
                     arg-count)
         ctx (update ctx :callstack
                     (fn [cs]
@@ -2113,9 +2112,8 @@
   ;; see https://clojure.org/reference/java_interop#dot
   (findings/warn-reflection ctx expr)
   (let [[instance meth & args] children]
-    (if instance (analyze-expression** ctx instance)
-        ;; TODO, warning, instance is required
-        nil)
+    ;; TODO, warning if no instance. Instance is required
+    (when instance (analyze-expression** ctx instance))
     (when meth
       (if (and (identical? :list (utils/tag meth)) (not args))
         (let [[meth & children] (:children meth)]
@@ -2246,10 +2244,9 @@
                   (update ctx :config config/merge-config! cfg)
                   ctx)
             prev-callstack (:callstack ctx)
-            arg-types (if (and resolved-namespace resolved-name
-                               (not (linter-disabled? ctx :type-mismatch)))
-                        (atom [])
-                        nil)
+            arg-types (when (and resolved-namespace resolved-name
+                                 (not (linter-disabled? ctx :type-mismatch)))
+                        (atom []))
             ctx (assoc ctx :arg-types arg-types)]
         (cond unresolved-ns
               (do
@@ -2715,9 +2712,8 @@
         expr-meta (meta expr)
         resolved-namespace :clj-kondo/unknown-namespace
         ctx (update ctx :callstack conj [nil :token])
-        arg-types (if (not (linter-disabled? ctx :type-mismatch))
-                    (atom [])
-                    nil)
+        arg-types (when-not (linter-disabled? ctx :type-mismatch)
+                    (atom []))
         ctx (assoc ctx :arg-types arg-types)
         analyzed
         (let [next-ctx ctx]
@@ -3234,10 +3230,9 @@
            update base-lang into (:used-namespaces init-ns))
     (loop [ctx init-ctx
            [expression & rest-expressions] expressions]
-      (if expression
+      (when expression
         (let [ctx (analyze-expression* ctx expression)]
-          (recur ctx rest-expressions))
-        nil))))
+          (recur ctx rest-expressions))))))
 
 ;;;; processing of string input
 

diff --git a/src/clj_kondo/impl/linters.clj b/src/clj_kondo/impl/linters.clj
@@ -519,8 +519,7 @@
                                   :message (str
                                             (format "#'%s is deprecated"
                                                     (str fn-ns "/" fn-name))
-                                            (if (true? deprecated)
-                                              nil
+                                            (when-not (true? deprecated)
                                               (str " since " deprecated)))})))
       (when called-fn
         (when-let [loc (:redundant-fn-wrapper-parent-loc call)]