[Tabs] Display pretty source after reload (firefox-devtools#4963)

Author: AnshulMalik

src/actions/sources/newSources.js

@@ -11,7 +11,9 @@
 
 import { syncBreakpoint } from "../breakpoints";
 import { loadSourceText } from "./loadSourceText";
+import { togglePrettyPrint } from "./prettyPrint";
 import { selectLocation } from "../sources";
+import { getRawSourceURL, isPrettyURL } from "../../utils/source";
 
 import { prefs } from "../../utils/prefs";
 
@@ -66,11 +68,22 @@ function loadSourceMap(generatedSource) {
 
 // If a request has been made to show this source, go ahead and
 // select it.
-function checkSelectedSource(source) {
+function checkSelectedSource(source: Source) {
   return async ({ dispatch, getState }: ThunkArgs) => {
     const pendingLocation = getPendingSelectedLocation(getState());
 
-    if (pendingLocation && !!source.url && pendingLocation.url === source.url) {
+    if (!pendingLocation || !pendingLocation.url || !source.url) {
+      return;
+    }
+
+    const pendingUrl = pendingLocation.url;
+    const rawPendingUrl = getRawSourceURL(pendingUrl);
+
+    if (rawPendingUrl === source.url) {
+      if (isPrettyURL(pendingUrl)) {
+        return await dispatch(togglePrettyPrint(source.id));
+      }
+
       await dispatch(
         selectLocation({ ...pendingLocation, sourceId: source.id })
       );

src/test/mochitest/browser.ini

@@ -120,6 +120,7 @@ skip-if = true # regular failures during release in Bug 1415300
 [browser_dbg-sourcemaps-bogus.js]
 [browser_dbg-sources.js]
 [browser_dbg-tabs.js]
+[browser_dbg-tabs-pretty-print.js]
 [browser_dbg-toggling-tools.js]
 skip-if = true # Bug 1414124
 [browser_dbg-wasm-sourcemaps.js]

src/test/mochitest/browser_dbg-tabs-pretty-print.js

@@ -0,0 +1,18 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests re-opening pretty printed tabs on load
+
+add_task(async function() {
+  const dbg = await initDebugger("doc-minified.html");
+
+  await selectSource(dbg, "math.min.js");
+  clickElement(dbg, "prettyPrintButton");
+  await waitForSource(dbg, "math.min.js:formatted");
+  // Test reloading the debugger
+  await waitForSelectedSource(dbg, "math.min.js:formatted");
+  await reload(dbg);
+
+  await waitForSelectedSource(dbg, "math.min.js:formatted");
+  ok(true, "Pretty printed source is selected on reload");
+});

src/test/mochitest/browser_dbg-tabs.js

@@ -8,7 +8,7 @@ function countTabs(dbg) {
 }
 
 add_task(async function() {
-  let dbg = await initDebugger("doc-scripts.html");
+  const dbg = await initDebugger("doc-scripts.html");
 
   await selectSource(dbg, "simple1");
   await selectSource(dbg, "simple2");
@@ -26,7 +26,7 @@ add_task(async function() {
 });
 
 add_task(async function() {
-  let dbg = await initDebugger("doc-scripts.html", "simple1", "simple2");
+  const dbg = await initDebugger("doc-scripts.html", "simple1", "simple2");
 
   await selectSource(dbg, "simple1");
   await selectSource(dbg, "simple2");

src/utils/source.js

@@ -83,6 +83,10 @@ export function isJavaScript(source: SourceRecord): boolean {
  */
 export function isPretty(source: SourceRecord): boolean {
   const url = source.get("url");
+  return isPrettyURL(url);
+}
+
+export function isPrettyURL(url: string): boolean {
   return url ? /formatted$/.test(url) : false;
 }
 

src/utils/test-head.js

@@ -82,19 +82,17 @@ function makeSymbolDeclaration(name: string, line: number) {
  * @static
  */
 function waitForState(store: any, predicate: any): Promise<void> {
-  if (predicate(store.getState())) {
-    return Promise.resolve();
-  }
-
   return new Promise(resolve => {
-    if (predicate(store.getState())) {
-      resolve();
+    let ret = predicate(store.getState());
+    if (ret) {
+      resolve(ret);
     }
 
     const unsubscribe = store.subscribe(() => {
-      if (predicate(store.getState())) {
+      ret = predicate(store.getState());
+      if (ret) {
         unsubscribe();
-        resolve();
+        resolve(ret);
       }
     });
   });