luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
Michiel Borkent 2022-02-11 21:23:16 +01:00
parent 6f10796622
commit 00ef12dfa5
2 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/babashka/impl/error_handler.clj
View file

@ -139,10 +139,6 @@
(ruler "Context") (ruler "Context")
(println ec) (println ec)
(println)) (println))
(when-let [locals (and (:debug opts) (not-empty (:locals d)))]
(ruler "Locals")
(print-locals locals)
(println))
(when sci-error? (when sci-error?
(when-let (when-let
[st (let [st (with-out-str [st (let [st (with-out-str

24
test/babashka/error_test.clj
View file

@ -208,9 +208,6 @@ Location: <expr>:1:12
1: (let [x 1] (/ x 0)) 1: (let [x 1] (/ x 0))
^--- Divide by zero ^--- Divide by zero
----- Locals -------------------------------------------------------------------
x: 1
----- Stack trace -------------------------------------------------------------- ----- Stack trace --------------------------------------------------------------
clojure.core// - <built-in> clojure.core// - <built-in>
user - <expr>:1:12 user - <expr>:1:12
@ -219,13 +216,13 @@ user - <expr>:1:12
clojure.lang.ExceptionInfo: Divide by zero clojure.lang.ExceptionInfo: Divide by zero
{:type :sci/error, :line 1, :column 12, :message \"Divide by zero\","))))) {:type :sci/error, :line 1, :column 12, :message \"Divide by zero\",")))))
(deftest macro-locals-print-test (deftest macro-test
(testing "exception during macro call includes &form and &env locals" (let [output (try (tu/bb nil "--debug" "(defmacro foo [x] (subs nil 1) `(do ~x ~x)) (foo 1)")
(let [output (try (tu/bb nil "--debug" "(defmacro foo [x] (subs nil 1) `(do ~x ~x)) (foo 1)") (is false)
(is false) (catch Exception e (ex-message e)))
(catch Exception e (ex-message e)))] output (tu/normalize output)]
(is (str/includes? (tu/normalize output) (is (str/includes? output
"----- Error -------------------------------------------------------------------- "----- Error --------------------------------------------------------------------
Type: java.lang.NullPointerException Type: java.lang.NullPointerException
Location: <expr>:1:19 Location: <expr>:1:19
Phase: macroexpand Phase: macroexpand
@ -234,11 +231,6 @@ Phase: macroexpand
1: (defmacro foo [x] (subs nil 1) `(do ~x ~x)) (foo 1) 1: (defmacro foo [x] (subs nil 1) `(do ~x ~x)) (foo 1)
^--- ^---
----- Locals -------------------------------------------------------------------
&form: (foo 1)
&env: {}
x: 1
----- Stack trace -------------------------------------------------------------- ----- Stack trace --------------------------------------------------------------
clojure.core/subs - <built-in> clojure.core/subs - <built-in>
user/foo - <expr>:1:19 user/foo - <expr>:1:19
@ -247,7 +239,7 @@ user - <expr>:1:45
----- Exception ---------------------------------------------------------------- ----- Exception ----------------------------------------------------------------
clojure.lang.ExceptionInfo: null clojure.lang.ExceptionInfo: null
{:type :sci/error, :line 1, :column 19,"))))) {:type :sci/error, :line 1, :column 19"))))
(deftest native-stacktrace-test (deftest native-stacktrace-test
(let [output (try (tu/bb nil "(merge 1 2 3)") (let [output (try (tu/bb nil "(merge 1 2 3)")