From b689e60b602be547c701094ba76fe3a545cad70d Mon Sep 17 00:00:00 2001
From: Nayeem Rahman <nayeemrmn99@gmail.com>
Date: Thu, 1 Oct 2020 10:25:34 +0100
Subject: fix(cli/console): Catch and format getter errors (#7766)

---
 cli/rt/02_console.js | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

(limited to 'cli/rt/02_console.js')

diff --git a/cli/rt/02_console.js b/cli/rt/02_console.js
index b5cab7617..913ea44f2 100644
--- a/cli/rt/02_console.js
+++ b/cli/rt/02_console.js
@@ -762,29 +762,33 @@
       );
     }
 
+    const red = maybeColor(colors.red, inspectOptions);
+
     for (const key of stringKeys) {
-      entries.push(
-        `${maybeQuoteString(key)}: ${
-          inspectValueWithQuotes(
-            value[key],
-            ctx,
-            level + 1,
-            inspectOptions,
-          )
-        }`,
-      );
+      let propertyValue;
+      let error = null;
+      try {
+        propertyValue = value[key];
+      } catch (error_) {
+        error = error_;
+      }
+      const inspectedValue = error == null
+        ? inspectValueWithQuotes(propertyValue, ctx, level + 1, inspectOptions)
+        : red(`[Thrown ${error.name}: ${error.message}]`);
+      entries.push(`${maybeQuoteString(key)}: ${inspectedValue}`);
     }
     for (const key of symbolKeys) {
-      entries.push(
-        `[${maybeQuoteSymbol(key)}]: ${
-          inspectValueWithQuotes(
-            value[key],
-            ctx,
-            level + 1,
-            inspectOptions,
-          )
-        }`,
-      );
+      let propertyValue;
+      let error;
+      try {
+        propertyValue = value[key];
+      } catch (error_) {
+        error = error_;
+      }
+      const inspectedValue = error == null
+        ? inspectValueWithQuotes(propertyValue, ctx, level + 1, inspectOptions)
+        : red(`Thrown ${error.name}: ${error.message}`);
+      entries.push(`[${maybeQuoteSymbol(key)}]: ${inspectedValue}`);
     }
     // Making sure color codes are ignored when calculating the total length
     const totalLength = entries.length + level +
-- 
cgit v1.2.3