Bug 1786805 - [devtools] Disable instant evaluation for top-level awa…

…it expressions. r=jdescottes. Differential Revision: https://phabricator.services.mozilla.com/D155687
dothq · Aug 26, 2022 · e3dc5f6 · e3dc5f6
1 parent d72e2d4
commit e3dc5f6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/devtools/client/webconsole/actions/input.js b/devtools/client/webconsole/actions/input.js
@@ -416,6 +416,15 @@ function terminalInputChanged(expression, force = false) {
     let mapped;
     ({ expression, mapped } = await getMappedExpression(hud, expression));
 
+    // We don't want to evaluate top-level await expressions (see Bug 1786805)
+    if (mapped?.await) {
+      return dispatch({
+        type: SET_TERMINAL_EAGER_RESULT,
+        expression,
+        result: null,
+      });
+    }
+
     const response = await commands.scriptCommand.execute(expression, {
       frameActor: hud.getSelectedFrameActorID(),
       selectedNodeActor: webConsoleUI.getSelectedNodeActorID(),

diff --git a/devtools/client/webconsole/test/browser/browser_jsterm_eager_evaluation.js b/devtools/client/webconsole/test/browser/browser_jsterm_eager_evaluation.js
@@ -108,6 +108,9 @@ add_task(async function() {
   setInputValue(hud, "4 + 7");
   await waitForEagerEvaluationResult(hud, "11");
 
+  // go back to inline layout.
+  await toggleLayout(hud);
+
   setInputValue(hud, "typeof new Proxy({}, {})");
   await waitForEagerEvaluationResult(hud, `"object"`);
 
@@ -236,8 +239,10 @@ add_task(async function() {
   setInputValue(hud, "array");
   await waitForEagerEvaluationResult(hud, "Array(3) [ 1, 2, 3 ]");
 
-  // go back to inline layout.
-  await toggleLayout(hud);
+  info("Check that top-level await expression are not evaluated");
+  setInputValue(hud, "await 1; 2 + 3;");
+  await waitForNoEagerEvaluationResult(hud);
+  ok(true, "instant evaluation is disabled for top-level await expressions");
 });
 
 // Test that the currently selected autocomplete result is eagerly evaluated.