[PausePoints] Add additional syntax (#5777)

Author: jasonLaster

src/actions/ast.js

@@ -19,7 +19,9 @@ import {
   getFramework,
   getPausePoints
 } from "../workers/parser";
+
 import { PROMISE } from "./utils/middleware/promise";
+import { isGeneratedId } from "devtools-source-map";
 
 import type { SourceId } from "../types";
 import type { ThunkArgs } from "./types";
@@ -100,7 +102,10 @@ export function setPausePoints(sourceId: SourceId) {
     }
 
     const pausePoints = await getPausePoints(source.id);
-    await client.setPausePoints(source.id, pausePoints);
+
+    if (isGeneratedId(source.id)) {
+      await client.setPausePoints(source.id, pausePoints);
+    }
 
     dispatch({
       type: "SET_PAUSE_POINTS",

src/actions/utils/middleware/log.js

@@ -11,6 +11,7 @@ const blacklist = [
   "SET_SYMBOLS",
   "OUT_OF_SCOPE_LOCATIONS",
   "MAP_SCOPES",
+  "MAP_FRAMES",
   "ADD_SCOPES",
   "IN_SCOPE_LINES",
   "SET_EMPTY_LINES"

src/client/firefox/commands.js

@@ -54,8 +54,8 @@ function setupCommands(dependencies: Dependencies): { bpClients: BPClients } {
   return { bpClients };
 }
 
-function sendPacket(packet: Object, callback?: Function) {
-  debuggerClient.request(packet).then(callback);
+function sendPacket(packet: Object, callback?: Function = r => r) {
+  return debuggerClient.request(packet).then(callback);
 }
 
 function resume(): Promise<*> {

src/reducers/ast.js

@@ -192,12 +192,13 @@ export function getEmptyLines(state: OuterState, source: Source) {
   return state.ast.getIn(["emptyLines", source.id]);
 }
 
-export function getPausePoints(state: OuterState, source: Source) {
-  if (!source) {
-    return null;
-  }
+export function getPausePoints(state: OuterState, sourceId: string) {
+  return state.ast.getIn(["pausePoints", sourceId]);
+}
 
-  return state.ast.getIn(["pausePoints", source.id]);
+export function hasPausePoints(state: OuterState, sourceId: string): boolean {
+  const pausePoints = getPausePoints(state, sourceId);
+  return !!pausePoints;
 }
 
 export function getOutOfScopeLocations(state: OuterState) {

src/test/mochitest/browser.ini

@@ -105,6 +105,7 @@ support-files =
   examples/doc-sourcemaps3.html
   examples/doc-sourcemap-bogus.html
   examples/doc-sources.html
+  examples/doc-pause-points.html
   examples/doc-return-values.html
   examples/doc-wasm-sourcemaps.html
   examples/asm.js
@@ -121,6 +122,7 @@ support-files =
   examples/simple2.js
   examples/simple3.js
   examples/frames.js
+  examples/pause-points.js
   examples/script-mutate.js
   examples/script-switching-02.js
   examples/script-switching-01.js
@@ -175,6 +177,7 @@ skip-if = os == "win"
 [browser_dbg-returnvalues.js]
 [browser_dbg-reload.js]
 [browser_dbg-replay.js]
+[browser_dbg-pause-points.js]
 [browser_dbg-scopes-mutations.js]
 [browser_dbg-search-file.js]
 skip-if = os == "win" # Bug 1393121

src/test/mochitest/browser_dbg-breakpoints-reloading.js

@@ -35,7 +35,7 @@ add_task(async function() {
 
   const syncedBps = waitForDispatch(dbg, "SYNC_BREAKPOINT", 2);
   await reload(dbg, "simple1");
-  await waitForSelectedSource(dbg);
+  await waitForSelectedSource(dbg, "simple1");
   await syncedBps;
 
   assertEditorBreakpoint(dbg, 4);

src/test/mochitest/browser_dbg-call-stack.js

@@ -41,7 +41,7 @@ add_task(async function() {
   // check to make sure that the toggle button isn't there
   let button = toggleButton(dbg);
   let frames = findAllElements(dbg, "frames");
-  is(button.innerText, "Expand rows", "toggle button should be expand");
+  is(button.innerText, "Expand rows", "toggle button should be 'expand'");
   is(frames.length, 7, "There should be at most seven frames");
 
   button.click();
@@ -50,4 +50,5 @@ add_task(async function() {
   frames = findAllElements(dbg, "frames");
   is(button.innerText, "Collapse rows", "toggle button should be collapsed");
   is(frames.length, 22, "All of the frames should be shown");
+  await waitForSelectedSource(dbg, "frames.js");
 });

src/test/mochitest/browser_dbg-pause-points.js

@@ -0,0 +1,59 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+ requestLongerTimeout(2);
+
+ async function stepOvers(dbg, count, onStep = () => {}) {
+   let i = 0;
+   while (i++ <= count) {
+     await dbg.actions.stepOver();
+     await waitForPaused(dbg);
+     onStep(dbg.getState());
+   }
+ }
+
+
+async function testCase(dbg, { name, count, steps }) {
+  invokeInTab(name);
+  let locations = []
+
+  await stepOvers(dbg, count, state => {
+    locations.push(dbg.selectors.getTopFrame(state).location)
+  });
+
+  const formattedSteps = locations.map(
+    ({line, column}) => `(${line},${column})`
+  ).join(", ")
+
+  is(formattedSteps, steps, name)
+
+  await resume(dbg);
+}
+
+add_task(async function test() {
+  const dbg = await initDebugger("doc-pause-points.html");
+
+  await testCase(dbg, {
+    name: "statements",
+    count: 7,
+    steps: "(9,2), (10,4), (10,13), (11,2), (11,21), (12,2), (12,12), (13,0)"
+  });
+
+  await testCase(dbg, {
+    name: "expressions",
+    count: 4,
+    steps: "(40,2), (41,2), (41,8), (42,8), (43,0)"
+  });
+
+  await testCase(dbg, {
+    name: "sequences",
+    count: 4,
+    steps: "(23,2), (25,8), (29,8), (34,2), (37,0)"
+  });
+
+  await testCase(dbg, {
+    name: "flow",
+    count: 8,
+    steps: "(16,2), (17,12), (18,6), (19,8), (19,17), (19,8), (19,17), (19,8), (20,0)"
+  });
+});

src/test/mochitest/browser_dbg-sources.js

@@ -51,9 +51,11 @@ add_task(async function() {
   ok(fourthNode.classList.contains("focused"), "4th node is focused");
   ok(
     selectedSource.includes("nested-source.js"),
-    "The right source is selected"
+    "nested-source is selected"
   );
 
+  await waitForSelectedSource(dbg, "nested-source");
+
   // Make sure new sources appear in the list.
   ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
     const script = content.document.createElement("script");

src/test/mochitest/browser_dbg-stepping.js

@@ -33,6 +33,6 @@ add_task(async function test() {
   await stepIn(dbg);
 
   assertSelectedFile(dbg, "bundle.js");
-  assertDebugLine(dbg, 42264);
+  assertDebugLine(dbg, 42309);
   assertPausedLocation(dbg);
 });