tweak pause points

Author: jasonLaster

src/test/mochitest/browser_dbg-editor-select.js

@@ -26,6 +26,7 @@ add_task(async function() {
 
   // Step through to another file and make sure it's paused in the
   // right place.
+  await stepOver(dbg);
   await stepIn(dbg);
   await waitForSelectedSource(dbg, "simple2");
   assertPausedLocation(dbg);

src/test/mochitest/browser_dbg-sourcemaps.js

@@ -61,12 +61,6 @@ add_task(async function() {
     "Original source text loaded correctly"
   );
 
-  // Test that breakpoint sliding is not attempted. The breakpoint
-  // should not move anywhere.
-  await addBreakpoint(dbg, entrySrc, 13);
-  is(getBreakpoints(getState()).size, 1, "One breakpoint exists");
-  assertBreakpointExists(dbg, entrySrc, 13);
-
   // Test breaking on a breakpoint
   await addBreakpoint(dbg, "entry.js", 15);
   is(getBreakpoints(getState()).size, 2, "Two breakpoints exist");
@@ -76,6 +70,7 @@ add_task(async function() {
   await waitForPaused(dbg);
   assertPausedLocation(dbg);
 
+  await stepIn(dbg);
   await stepIn(dbg);
   assertPausedLocation(dbg);
 

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, 42309);
+  assertDebugLine(dbg, 42264);
   assertPausedLocation(dbg);
 });

src/workers/parser/pausePoints.js

@@ -36,17 +36,24 @@ function formatNode(location, types) {
 function onEnter(node, ancestors, state) {
   const parent = ancestors[ancestors.length - 1];
 
-  if (
-    isAssignment(node) ||
-    isImport(node) ||
-    isControlFlow(node) ||
-    isReturn(node)
-  ) {
+  if (isAssignment(node) || isImport(node) || isControlFlow(node)) {
     state.push(
       formatNode(node.loc.start, { breakpoint: true, stepOver: true })
     );
   }
 
+  if (isReturn(node)) {
+    if (t.isCallExpression(node.argument)) {
+      state.push(
+        formatNode(node.loc.start, { breakpoint: false, stepOver: false })
+      );
+    } else {
+      state.push(
+        formatNode(node.loc.start, { breakpoint: true, stepOver: true })
+      );
+    }
+  }
+
   if (t.isCallExpression(node)) {
     state.push(
       formatNode(node.loc.start, {

src/workers/parser/tests/__snapshots__/pausePoints.spec.js.snap

@@ -43,6 +43,13 @@ else {
 /*bs 21*/while (x) {
 
 }
-var /*bs 22*/a = 3;/*bs 23*/
+
+/*b 22*/function ret() {
+  /*bs 23*/console.log(\\"...\\")
+  /* 24*/return /*bs 25*/func()
+/*bs 26*/}
+
+
+var /*bs 27*/a = 3;/*bs 28*/
 "
 `;

src/workers/parser/tests/fixtures/pause-points.js

@@ -40,4 +40,11 @@ for (var i=0; i< 5; i++ ) {
 while (x) {
 
 }
+
+function ret() {
+  console.log("...")
+  return func()
+}
+
+
 var a = 3;