addresses #1 continuing to improve/cleanup clj-kondo support

Signed-off-by: Sean Corfield <[email protected]>

Author: seancorfield

…kondo/clj_commons/slingshot/try_plus.clj …shot/clj_kondo/clj_commons/slingshot.cljresources/clj-kondo.exports/org.clj-commons/slingshot/clj_kondo/clj_commons/slingshot/try_plus.clj renamed to resources/clj-kondo.exports/org.clj-commons/slingshot/clj_kondo/clj_commons/slingshot.clj resources/clj-kondo.exports/org.clj-commons/slingshot/clj_kondo/clj_commons/slingshot/try_plus.clj renamed to resources/clj-kondo.exports/org.clj-commons/slingshot/clj_kondo/clj_commons/slingshot.clj

@@ -1,5 +1,6 @@
-(ns clj-kondo.clj-commons.slingshot.try-plus
-  (:require [clj-kondo.hooks-api :as api]))
+(ns clj-kondo.clj-commons.slingshot
+  (:require [clj-kondo.hooks-api :as api]
+            [clojure.walk]))
 
 (defn expand-catch [catch-node]
   (let [[catch catchee & exprs] (:children catch-node)
@@ -45,7 +46,39 @@
                    (api/vector-node
                     [(api/token-node '&throw-context) (api/token-node nil)])
                    (api/token-node '&throw-context) ;; use throw-context to avoid warning
-                   (with-meta (api/list-node (list* (api/token-node 'try)
-                                                    (concat body catches)))
+                   (with-meta (api/list-node
+                               (list* (api/token-node (if (seq catches) 'try 'do))
+                                      (concat body catches)))
                      (meta node))])]
     {:node new-node}))
+
+(defn- contains-%?
+  "Returns true if % appears within coll at any nesting depth"
+  [coll]
+  (let [result (atom false)]
+    (clojure.walk/postwalk
+     (fn [t]
+       (when (= '% t)
+         (reset! result true)))
+     coll)
+    @result))
+
+(defn throw+ [{:keys [node]}]
+  (if-let [children (seq (rest (:children node)))]
+    (if (contains-%? (map api/sexpr children))
+      (let [new-node (api/list-node
+                      [(api/token-node 'throw)
+                       (api/list-node
+                        [(api/token-node 'new)
+                         (api/token-node 'Exception)
+                         (api/list-node
+                          [(api/token-node 'str)
+                           (api/list-node
+                            [(api/token-node 'fn)
+                             (api/vector-node [(api/token-node '%)])
+                             (api/list-node
+                              (list* (api/token-node 'str)
+                                     children))])])])])]
+        {:node new-node})
+      {:node node})
+    {:node node}))

resources/clj-kondo.exports/org.clj-commons/slingshot/config.edn

@@ -1,3 +1,5 @@
 {:hooks
  {:analyze-call {clj-commons.slingshot/try+
-                 clj-kondo.clj-commons.slingshot.try-plus/try+}}}
+                 clj-kondo.clj-commons.slingshot/try+
+                 clj-commons.slingshot/throw+
+                 clj-kondo.clj-commons.slingshot/throw+}}}

src/clj_commons/slingshot/support.clj

@@ -43,7 +43,7 @@
   corresponding context with t assoc'd as the value for :wrapper, else
   returns nil"
   [^Throwable t]
-  (if-let [data (ex-data t)]
+  (when-let [data (ex-data t)]
     (assoc (make-context t)
       :object (if (::wrapper? (meta data)) (:object data) data)
       :wrapper t)))
@@ -55,7 +55,7 @@
   returns nil."
   [^Throwable t]
   (or (unwrap t)
-      (if-let [cause (.getCause t)]
+      (when-let [cause (.getCause t)]
         (recur cause))))
 
 (defn get-throwable
@@ -131,9 +131,9 @@
   [catch-clauses throw-sym threw?-sym]
   (letfn
       [(class-selector? [selector]
-         (if (symbol? selector)
+         (when (symbol? selector)
            (let [resolved (resolve selector)]
-             (if (class? resolved)
+             (when (class? resolved)
                resolved))))
        (cond-test [selector]
          (letfn
@@ -185,7 +185,7 @@
             (try
               (when-not @~threw?-sym
                 ~@(rest else-clause))
-              ~(if finally-clause
+              ~(when finally-clause
                  finally-clause))))
         finally-clause
         (list finally-clause)))
@@ -196,7 +196,7 @@
   "Expands to sym if it names a local in the current environment or
   nil otherwise"
   [sym]
-  (if (contains? &env sym)
+  (when (contains? &env sym)
     sym))
 
 (defn stack-trace

test/clj_commons/slingshot_test.clj

@@ -353,9 +353,9 @@
   [throw? catch? finally? broken-else?]
   (let [rec-sym (gensym "rec")
         body (gen-body rec-sym throw?)
-        catch-clause (if catch? (gen-catch-clause rec-sym))
+        catch-clause (when catch? (gen-catch-clause rec-sym))
         else-clause (gen-else-clause rec-sym broken-else?)
-        finally-clause (if finally? (gen-finally-clause rec-sym))]
+        finally-clause (when finally? (gen-finally-clause rec-sym))]
     `(let [~rec-sym (atom [])]
        (try+
         ~(remove nil? `(try+
@@ -379,14 +379,14 @@
             actual (eval try-else-form)
             expected (vec (remove nil?
                                   [:body
-                                   (if (and throw? catch?) :catch)
-                                   (if (not throw?) :else)
-                                   (if finally? :finally)
+                                   (when (and throw? catch?) :catch)
+                                   (when (not throw?) :else)
+                                   (when finally? :finally)
                                    ;; expect an escaped exception when either:
                                    ;;  a) the else clause runs, and throws
                                    ;;  b) the body throws, and is not caught
-                                   (if (or (and (not throw?) broken-else?)
-                                           (and throw? (not catch?))) :bang!)]))]
+                                   (when (or (and (not throw?) broken-else?)
+                                             (and throw? (not catch?))) :bang!)]))]
         (is (= actual expected))))))
 
 (deftest test-reflection