Revert "Revert "Fix previewing a file w/ no functions (#5390)""

This reverts commit cc1a9eb.

Author: jasonLaster

src/test/mochitest/browser.ini

@@ -100,6 +100,7 @@ support-files =
   examples/doc-minified.html
   examples/big-sourcemap.html
   examples/doc-minified2.html
+  examples/doc-on-load.html
   examples/doc-sourcemaps.html
   examples/doc-sourcemaps2.html
   examples/doc-sourcemaps3.html
@@ -116,6 +117,7 @@ support-files =
   examples/long.js
   examples/math.min.js
   examples/nested/nested-source.js
+  examples/top-level.js
   examples/opts.js
   examples/output.js
   examples/simple1.js
@@ -173,6 +175,8 @@ skip-if = os == "win"
 [browser_dbg-pretty-print-paused.js]
 [browser_dbg-preview.js]
 skip-if = os == "win"
+[browser_dbg-preview-module.js]
+skip-if = os == "win"
 [browser_dbg-preview-source-maps.js]
 skip-if = os == "win"
 [browser_dbg-returnvalues.js]

src/test/mochitest/browser_dbg-preview-module.js

@@ -0,0 +1,37 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test hovering in a script that is paused on load
+// and doesn't have functions.
+add_task(async function() {
+  const dbg = await initDebugger("doc-scripts.html");
+  const { selectors: { getSelectedSource }, getState } = dbg;
+
+  navigate(dbg, "doc-on-load.html");
+
+  // wait for `top-level.js` to load and to pause at a debugger statement
+  await waitForSelectedSource(dbg);
+  await waitForPaused(dbg);
+
+  const popupPreviewed = waitForDispatch(dbg, "SET_PREVIEW");
+  hoverAtPos(dbg, { line: 1, ch: 6 });
+  await popupPreviewed;
+  await assertPreviewPopup(dbg, {
+    field: "foo",
+    value: "1",
+    expression: "obj"
+  });
+  await assertPreviewPopup(dbg, {
+    field: "bar",
+    value: "2",
+    expression: "obj"
+  });
+
+  // hover over an empty position so that the popup closes
+  hoverAtPos(dbg, { line: 1, ch: 40 });
+
+  const tooltipPreviewed = waitForDispatch(dbg, "SET_PREVIEW");
+  hoverAtPos(dbg, { line: 2, ch: 7 });
+  await tooltipPreviewed;
+  await assertPreviewTooltip(dbg, { result: "3", expression: "func" });
+});

src/test/mochitest/browser_dbg-preview-source-maps.js

@@ -21,7 +21,7 @@ function hoverAtPos(dbg, { line, ch }) {
   return previewed;
 }
 
-function assertTooltip(dbg, { result, expression }) {
+function assertPreviewTooltip(dbg, { result, expression }) {
   const previewEl = findElement(dbg, "tooltip");
   is(previewEl.innerText, result, "Preview text shown to user");
 
@@ -31,7 +31,7 @@ function assertTooltip(dbg, { result, expression }) {
   is(preview.expression, expression, "Preview.expression");
 }
 
-function assertPopup(dbg, { field, value, expression }) {
+function assertPreviewPopup(dbg, { field, value, expression }) {
   const previewEl = findElement(dbg, "popup");
   is(previewEl.innerText, "", "Preview text shown to user");
 

src/test/mochitest/browser_dbg-preview.js

@@ -1,46 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-function getCoordsFromPosition(cm, { line, ch }) {
-  return cm.charCoords({ line: ~~line, ch: ~~ch });
-}
-
-function hoverAtPos(dbg, { line, ch }) {
-  const cm = getCM(dbg);
-  const coords = getCoordsFromPosition(cm, { line: line - 1, ch });
-  const tokenEl = dbg.win.document.elementFromPoint(coords.left, coords.top);
-  tokenEl.dispatchEvent(
-    new MouseEvent("mouseover", {
-      bubbles: true,
-      cancelable: true,
-      view: dbg.win
-    })
-  );
-}
-
-async function assertTooltip(dbg, { result, expression }) {
-  const previewEl = await waitForElement(dbg, "tooltip");
-  is(previewEl.innerText, result, "Preview text shown to user");
-
-  const preview = dbg.selectors.getPreview(dbg.getState());
-  is(`${preview.result}`, result, "Preview.result");
-  is(preview.updating, false, "Preview.updating");
-  is(preview.expression, expression, "Preview.expression");
-}
-
-async function assertPreviewPopup(dbg, { field, value, expression }) {
-  const previewEl = await waitForElement(dbg, "popup");
-  const preview = dbg.selectors.getPreview(dbg.getState());
-
-  is(
-    `${preview.result.preview.ownProperties[field].value}`,
-    value,
-    "Preview.result"
-  );
-  is(preview.updating, false, "Preview.updating");
-  is(preview.expression, expression, "Preview.expression");
-}
-
+// Test hovering on an object, which will show a popup and on a
+// simple value, which will show a tooltip.
 add_task(async function() {
   const dbg = await initDebugger("doc-scripts.html");
   const { selectors: { getSelectedSource }, getState } = dbg;
@@ -56,7 +18,7 @@ add_task(async function() {
   const tooltipPreviewed = waitForDispatch(dbg, "SET_PREVIEW");
   hoverAtPos(dbg, { line: 5, ch: 12 });
   await tooltipPreviewed;
-  await assertTooltip(dbg, { result: "3", expression: "result" });
+  await assertPreviewTooltip(dbg, { result: "3", expression: "result" });
 
   const popupPreviewed = waitForDispatch(dbg, "SET_PREVIEW");
   hoverAtPos(dbg, { line: 2, ch: 10 });

src/test/mochitest/examples/doc-on-load.html

@@ -0,0 +1,21 @@
+ <!-- This Source Code Form is subject to the terms of the Mozilla Public
+    - License, v. 2.0. If a copy of the MPL was not distributed with this
+    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
+
+    <script src="top-level.js"></script>
+    <script>
+      // This inline script allows this HTML page to show up as a
+      // source. It also needs to introduce a new global variable so
+      // it's not immediately garbage collected.
+      inline_script = function () { var x = 5; };
+    </script>
+  </body>
+</html>

src/test/mochitest/examples/top-level.js

@@ -0,0 +1,3 @@
+var obj = { foo: 1, bar: 2 };
+var func = 3;
+debugger;