Bug 1884717 - [devtools] Only log "returns" when logging exit frames …

…without tracing values. r=devtools-reviewers,bomsy We were logging "returns undefined" everywhere. Differential Revision: https://phabricator.services.mozilla.com/D204301
dothq · Mar 13, 2024 · 6f71357 · 6f71357
1 parent fac318f
commit 6f71357
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/devtools/client/webconsole/components/Output/message-types/JSTracerTrace.js b/devtools/client/webconsole/components/Output/message-types/JSTracerTrace.js
@@ -120,9 +120,11 @@ function JSTracerTrace(props) {
   if (why) {
     messageBody.push(
       // Add a spaces in order to improve copy paste rendering
-      dom.span({ className: "jstracer-exit-frame-reason" }, " " + why + " "),
-      formatRep(messageBodyConfig, returnedValue)
+      dom.span({ className: "jstracer-exit-frame-reason" }, " " + why + " ")
     );
+    if (returnedValue !== undefined) {
+      messageBody.push(formatRep(messageBodyConfig, returnedValue));
+    }
   }
 
   if (prefix) {

diff --git a/devtools/client/webconsole/utils/messages.js b/devtools/client/webconsole/utils/messages.js
@@ -386,7 +386,6 @@ function transformTraceResource(traceResource) {
     args,
     sourceId,
 
-    returnedValue,
     relatedTraceId,
     why,
 
@@ -411,9 +410,10 @@ function transformTraceResource(traceResource) {
     parameters: args
       ? args.map(p => (p ? getAdHocFrontOrPrimitiveGrip(p, targetFront) : p))
       : null,
-    returnedValue: why
-      ? getAdHocFrontOrPrimitiveGrip(returnedValue, targetFront)
-      : null,
+    returnedValue:
+      why && "returnedValue" in traceResource
+        ? getAdHocFrontOrPrimitiveGrip(traceResource.returnedValue, targetFront)
+        : undefined,
     relatedTraceId,
     why,
     messageText: null,