addresses #1 improve clj-kondo support

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

Author: seancorfield

deps.edn

@@ -1,4 +1,4 @@
-{:paths ["src"]
+{:paths ["src" "resources"]
  :deps {org.clojure/clojure {:mvn/version "1.8.0"}}
 
  :aliases

resources/clj-kondo.exports/org.clj-commons/slingshot/clj_kondo/clj_commons/slingshot/try_plus.clj

@@ -13,13 +13,14 @@
                       (api/vector-node [selector (api/token-node nil)])
                       exprs))]))
           (seq? catchee-sexpr)
-          (api/list-node
-           (list* catch (api/token-node 'Exception) (api/token-node '_e#)
-                  (api/list-node
-                   (list (api/token-node 'fn)
-                         (api/vector-node [(api/token-node '%)])
-                         catchee))
-                  exprs))
+          (let [[v & exprs] exprs]
+            (api/list-node
+             (list* catch (api/token-node 'Exception) v
+                    (api/list-node
+                     (list (api/token-node 'fn)
+                           (api/vector-node [(api/token-node '%)])
+                           catchee))
+                    exprs)))
           :else catch-node)))
 
 (defn try+ [{:keys [node]}]

src/clj_commons/slingshot/test.clj

@@ -22,6 +22,12 @@
                                     (pr-str e#) '~selector)})
         e#))))
 
+(defmacro thrown+?
+  "(is (thrown+? selector expr))"
+  [_selector _expr]
+  (throw (IllegalStateException.
+          "thrown+? must be used inside an 'is' form")))
+
 (defmethod assert-expr 'thrown+-with-msg? [msg form]
   ;; (is (thrown+-with-msg? s re expr))
   ;; Asserts that evaluating expr throws an object that matches
@@ -47,3 +53,9 @@
                     :actual (format "thrown+-with-msg?: %s did not match %s"
                                     (pr-str e#) '~selector)})
         e#))))
+
+(defmacro thrown+-with-msg?
+  "(is (thrown+-with-msg? selector pattern expr))"
+  [_selector _pattern _expr]
+  (throw (IllegalStateException.
+          "thrown+-with-msg? must be used inside an 'is' form")))

test/clj_commons/slingshot/support_test.clj

@@ -1,7 +1,8 @@
 (ns clj-commons.slingshot.support-test
   (:require
    [clj-commons.slingshot :refer [throw+ try+]]
-   [clj-commons.slingshot.support :refer :all]
+   [clj-commons.slingshot.support :refer [*catch-hook* *throw-hook* parse-try+
+                                          resolve-local stack-trace wrap]]
    [clojure.test :refer [deftest is]]))
 
 (deftest test-parse-try+
@@ -54,6 +55,7 @@
 (deftest test-resolve-local
   (let [a 4]
     (is (= 4 (resolve-local a)))
+    #_{:clj-kondo/ignore [:unresolved-symbol]}
     (is (nil? (resolve-local b)))))
 
 (deftest test-wrap
@@ -80,7 +82,7 @@
     (is (= (set (keys @test-hooked))
            (set [:object :message :cause :stack-trace])))
     (is (= "throw-hook-string" (:object @test-hooked))))
-  (binding [*throw-hook* (fn [x] 42)]
+  (binding [*throw-hook* (fn [_] 42)]
     (is (= (throw+ "something") 42))))
 
 (def catch-hooked (atom nil))

test/clj_commons/slingshot/test_test.clj

@@ -1,7 +1,7 @@
 (ns clj-commons.slingshot.test-test
   (:require
    [clj-commons.slingshot :refer [throw+]]
-   [clj-commons.slingshot.test]
+   [clj-commons.slingshot.test :refer [thrown+? thrown+-with-msg?]]
    [clojure.test :refer [deftest is]]))
 
 (deftest test-slingshot-test-macros

test/clj_commons/slingshot_test.clj

@@ -81,6 +81,7 @@
              (try (throw exception-1)
                   (catch Exception e [:class-exception e])))))
     (testing "IllegalArgumentException thrown by clojure/core"
+      #_{:clj-kondo/ignore [:type-mismatch]}
       (is (= :class-iae (first (mega-try (str/replace "foo" 1 1)))))))
 
   (testing "catch by java class generically"