Fix functions lists for nil returns

flow-storm · Mar 5, 2024 · b7843f7 · b7843f7
1 parent 469e430
commit b7843f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@
         
 ### Bugs fixed
 
+    - Fix functions lists for nil returns
+
 ## 3.12.1 (05-03-2024)
 
 ### New Features

diff --git a/src-inst/flow_storm/runtime/debuggers_api.cljc b/src-inst/flow_storm/runtime/debuggers_api.cljc
@@ -145,11 +145,12 @@
                      :print-meta?  false
                      :pprint?      false}
         render-frame (fn [{:keys [args-vec ret throwable] :as fn-frame}]
-                       (cond-> fn-frame
-                         true      reference-frame-data!
-                         true      (assoc :args-vec-str  (:val-str (rt-values/val-pprint args-vec (assoc pprint-opts :nth-elems render-args))))
-                         ret       (assoc :ret-str       (:val-str (rt-values/val-pprint ret pprint-opts)))
-                         throwable (assoc :throwable-str (ex-message throwable))))
+                       (let [fr (-> fn-frame
+                                    reference-frame-data!
+                                    (assoc :args-vec-str  (:val-str (rt-values/val-pprint args-vec (assoc pprint-opts :nth-elems render-args)))))]
+                         (if throwable
+                           (assoc fr :throwable-str (ex-message throwable))
+                           (assoc fr :ret-str       (:val-str (rt-values/val-pprint ret pprint-opts))))))
         frames (into [] (map render-frame) fn-frames)]
     frames))