Merge in stack trace changes for Clojure 1.8+?

Fixes #4

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

Author: seancorfield

CHANGELOG.md

@@ -1,7 +1,8 @@
 ## CHANGES
 
 * v0.13.next in progress
-  * address [clj-commons/slingshot#3](https://github.com/clj-commons/slingshot/issues/3) by merging `and` optimizations from original PR [#55](https://github.com/scgilardi/slingshot/pull/55) by [jbouwman](https://github.com/jbouwman).
+  * address [clj-commons/slingshot#4](https://github.com/clj-commons/slingshot/issues/4) by merging stacktrace changes from [a20748f](https://github.com/clj-commons/slingshot/commit/a20748fd2d6d4a9020d296a3798e82f136e2bfe2) by [@scgilardi](https://github.com/scgilardi).
+  * address [clj-commons/slingshot#3](https://github.com/clj-commons/slingshot/issues/3) by merging `and` optimizations from original PR [#55](https://github.com/scgilardi/slingshot/pull/55) by [@jbouwman](https://github.com/jbouwman).
 
 * v0.13.0 -- 2025-09-20
   - add clj-kondo config export

src/clj_commons/slingshot/support.clj

@@ -204,8 +204,20 @@
 (defn stack-trace
   "Returns the current stack trace beginning at the caller's frame"
   []
-  (let [trace (.getStackTrace (Thread/currentThread))]
-    (java.util.Arrays/copyOfRange trace 2 (alength trace))))
+  (let [trace (.getStackTrace (Thread/currentThread))
+       len (alength trace)
+       limit (min (dec len) 4)
+       offset (loop [offset 0]
+                (if (> offset limit)
+                  0
+                  (let [^StackTraceElement element (aget trace offset)
+                        class-name (.getClassName element)]
+                    (if (or (= class-name "java.lang.Thread")
+                            (= class-name "slingshot.support$stack_trace"))
+                      (recur (inc offset))
+                      offset))))]
+   (java.util.Arrays/copyOfRange ^"[Ljava.lang.StackTraceElement;" trace
+                                 ^int offset len)))
 
 (defn parse-throw+
   "Returns a vector containing the message and cause that result from

test/clj_commons/slingshot/support_test.clj

@@ -49,7 +49,7 @@
 
 (deftest test-stack-trace
   (let [{:keys [methodName className]} (-> (stack-trace-fn) first bean)]
-    (is (= methodName "invoke"))
+    (is (re-find #"^invoke" methodName))
     (is (re-find #"stack_trace(_fn)?$" className))))
 
 (deftest test-resolve-local