firefox-devtools · jasonLaster · Oct 3, 2017 · Oct 2, 2017
diff --git a/src/actions/sources.js b/src/actions/sources.js
@@ -67,6 +67,7 @@ async function checkPendingBreakpoint(
   const sameSource = sourceUrl && sourceUrl === source.url;
 
   if (sameSource) {
+    await dispatch(loadSourceText(source));
     await dispatch(syncBreakpoint(source.id, pendingBreakpoint));
   }
 }

diff --git a/src/test/mochitest/browser.ini b/src/test/mochitest/browser.ini
@@ -19,6 +19,9 @@ support-files =
   examples/sum/sum.js
   examples/sum/sum.min.js
   examples/sum/sum.min.js.map
+  examples/reload/code_reload_1.js
+  examples/reload/code_reload_2.js
+  examples/reload/doc_reload.html
   examples/doc-async.html
   examples/doc-asm.html
   examples/doc-scripts.html
@@ -53,6 +56,7 @@ support-files =
   examples/script-switching-02.js
   examples/script-switching-01.js
   examples/times2.js
+  examples/reload/sjs_code_reload.sjs
 
 [browser_dbg-asm.js]
 [browser_dbg-async-stepping.js]
@@ -103,3 +107,4 @@ skip-if = true # Bug 1393121, 1393299
 [browser_dbg-tabs.js]
 [browser_dbg-toggling-tools.js]
 [browser_dbg-wasm-sourcemaps.js]
+[browser_dbg-reload.js]
diff --git a/src/test/mochitest/browser_dbg-reload.js b/src/test/mochitest/browser_dbg-reload.js
@@ -0,0 +1,30 @@
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/*
+ * Test reloading:
+ * 1. reload the source
+ * 2. re-sync breakpoints
+ */
+
+add_task(async function() {
+  const dbg = await initDebugger("reload/doc_reload.html", "sjs_code_reload");
+
+
+  const sym = waitForDispatch(dbg, "SET_SYMBOLS");
+  await selectSource(dbg, "sjs_code_reload")
+  await sym;
+
+  await addBreakpoint(dbg, "sjs_code_reload", 2);
+
+  const sync = waitForDispatch(dbg, "SYNC_BREAKPOINT")
+  await reload(dbg,  "sjs_code_reload")
+  await sync;
+
+  const breakpoints = dbg.selectors.getBreakpoints(dbg.getState())
+  const breakpointList = breakpoints.valueSeq().toJS();
+  const breakpoint = breakpointList[0];
+
+  is(breakpointList.length, 1);
+  is(breakpoint.location.line, 6);
+});
diff --git a/src/test/mochitest/examples/reload/code_reload_1.js b/src/test/mochitest/examples/reload/code_reload_1.js
@@ -0,0 +1,3 @@
+function foo(n) {
+  console.log("yo")
+}
diff --git a/src/test/mochitest/examples/reload/code_reload_2.js b/src/test/mochitest/examples/reload/code_reload_2.js
@@ -0,0 +1,7 @@
+/*
+ * comments
+ */
+
+function foo() {
+  console.log("YO")
+}
diff --git a/src/test/mochitest/examples/reload/doc_reload.html b/src/test/mochitest/examples/reload/doc_reload.html
@@ -0,0 +1,15 @@
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
+<html>
+  <script src="sjs_code_reload.sjs"></script>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Empty test page 1</title>
+  </head>
+
+  <body>
+  </body>
+
+</html>
diff --git a/src/test/mochitest/examples/reload/sjs_code_reload.sjs b/src/test/mochitest/examples/reload/sjs_code_reload.sjs
@@ -0,0 +1,32 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/* globals getState, setState */
+/* exported handleRequest */
+
+"use strict";
+
+function _getUrl(request, counter) {
+  const { scheme, host, path } = request;
+
+  const newPath = path.substr(0, path.lastIndexOf("/") + 1);
+  const index = counter < 3 ? 1 : 2;
+  return `${scheme}://${host}${newPath}/code_reload_${index}.js`
+}
+
+function handleRequest(request, response) {
+  response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+  response.setHeader("Pragma", "no-cache");
+  response.setHeader("Expires", "0");
+  response.setHeader("Access-Control-Allow-Origin", "*", false);
+  response.setHeader("Content-Type", "text/javascript", false);
+
+  // Redirect to a different file each time.
+  let counter = 1 + +getState("counter");
+
+  const newUrl = _getUrl(request, counter);
+
+  response.setStatusLine(request.httpVersion, 302, "Found");
+  response.setHeader("Location", newUrl);
+  setState("counter", "" + counter);
+}
diff --git a/src/workers/parser/utils/ast.js b/src/workers/parser/utils/ast.js
@@ -59,9 +59,10 @@ export function getAst(source: Source) {
   }
 
   let ast = {};
-  if (source.contentType == "text/html") {
+  const { contentType } = source;
+  if (contentType == "text/html") {
     ast = parseScriptTags(source.text, htmlParser) || {};
-  } else if (source.contentType == "text/javascript") {
+  } else if (contentType && contentType.includes("javascript")) {
     ast = parse(source.text);
   }