Fix previewing generated locations (#5701)

* [Preview] support generated locations

* test

Author: jasonLaster

src/reducers/ast.js

@@ -212,6 +212,10 @@ export function getSourceMetaData(state: OuterState, sourceId: string) {
   return state.ast.getIn(["sourceMetaData", sourceId]) || emptySourceMetaData;
 }
 
+export function hasSourceMetaData(state: OuterState, sourceId: string) {
+  return state.ast.hasIn(["sourceMetaData", sourceId]);
+}
+
 export function getInScopeLines(state: OuterState) {
   return state.ast.get("inScopeLines");
 }

src/selectors/isSelectedFrameVisible.js

@@ -2,9 +2,16 @@
  * 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/>. */
 
+import { originalToGeneratedId, isOriginalId } from "devtools-source-map";
 import { getSelectedFrame } from "../reducers/pause";
 import { getSelectedLocation } from "../reducers/sources";
 
+function visibleSourceId(location) {
+  return isOriginalId(location.sourceId)
+    ? originalToGeneratedId(location.sourceId)
+    : location.sourceId;
+}
+
 /*
  * Checks to if the selected frame's source is currently
  * selected.
@@ -13,9 +20,12 @@ export function isSelectedFrameVisible(state) {
   const selectedLocation = getSelectedLocation(state);
   const selectedFrame = getSelectedFrame(state);
 
+  if (!selectedFrame || !selectedLocation) {
+    return false;
+  }
+
   return (
-    selectedFrame &&
-    selectedLocation &&
-    selectedFrame.location.sourceId == selectedLocation.sourceId
+    visibleSourceId(selectedLocation) ===
+    visibleSourceId(selectedFrame.location)
   );
 }

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

@@ -6,16 +6,19 @@ function getCoordsFromPosition(cm, { line, ch }) {
 }
 
 function hoverAtPos(dbg, { line, ch }) {
+  info(`Hovering at (${line}, ${ch})\n`);
   const cm = getCM(dbg);
   const coords = getCoordsFromPosition(cm, { line: line - 1, ch });
   const tokenEl = dbg.win.document.elementFromPoint(coords.left, coords.top);
+  const previewed = waitForDispatch(dbg, "SET_PREVIEW");
   tokenEl.dispatchEvent(
     new MouseEvent("mouseover", {
       bubbles: true,
       cancelable: true,
       view: dbg.win
     })
   );
+  return previewed;
 }
 
 function assertTooltip(dbg, { result, expression }) {
@@ -55,9 +58,12 @@ add_task(async function() {
   await waitForPaused(dbg);
   await waitForSelectedSource(dbg, "times2");
 
-  const tooltipPreviewed = waitForDispatch(dbg, "SET_PREVIEW");
-  hoverAtPos(dbg, { line: 2, ch: 9 });
+  await hoverAtPos(dbg, { line: 2, ch: 9 });
+  assertPreviewTooltip(dbg, { result: 4, expression: "x" });
 
-  await tooltipPreviewed;
-  assertTooltip(dbg, { result: 4, expression: "x" });
+  await dbg.actions.jumpToMappedSelectedLocation();
+  await waitForSelectedSource(dbg, "bundle.js");
+
+  await hoverAtPos(dbg, { line: 70, ch: 10 });
+  assertPreviewTooltip(dbg, { result: 4, expression: "x" });
 });

src/test/mochitest/head.js

@@ -264,7 +264,9 @@ function waitForSelectedSource(dbg, url) {
       }
 
       // wait for async work to be done
-      return dbg.selectors.hasSymbols(state, source.toJS());
+      const hasSymbols = dbg.selectors.hasSymbols(state, source);
+      const hasSourceMetaData = dbg.selectors.hasSourceMetaData(state, source.id);
+      return hasSymbols && hasSourceMetaData;
     },
     "selected source"
   );

src/utils/makeRecord.js

@@ -22,6 +22,7 @@ export type Record<T: Object> = {
   equals<A>(other: A): boolean,
   get<A>(key: $Keys<T>, notSetValue?: any): A,
   getIn<A>(keyPath: Array<any>, notSetValue?: any): A,
+  hasIn<A>(keyPath: Array<any>): boolean,
   set<A>(key: $Keys<T>, value: A): Record<T>,
   setIn(keyPath: Array<any>, ...iterables: Array<any>): Record<T>,
   merge(values: $Shape<T>): Record<T>,