oof

src/actions/navigation.js

@@ -20,6 +20,7 @@ import {
 } from "../workers/parser";
 
 import { clearWasmStates } from "../utils/wasm";
+import { clearLoadSourceRequests } from "./sources/loadSourceText";
 
 import type { Action, ThunkArgs } from "./types";
 
@@ -41,6 +42,7 @@ export function willNavigate(event: Object) {
     clearASTs();
     clearScopes();
     clearSources();
+    clearLoadSourceRequests();
     dispatch(navigate(event.url));
   };
 }

src/actions/sources/loadSourceText.js

@@ -16,7 +16,11 @@ import type { ThunkArgs } from "../types";
 
 import type { Source } from "../../types";
 
-const requests = new Map();
+let requests = new Map();
+
+export function clearLoadSourceRequests() {
+  requests = new Map();
+}
 
 // Measures the time it takes for a source to load
 const loadSourceHistogram = "DEVTOOLS_DEBUGGER_LOAD_SOURCE_MS";
@@ -71,7 +75,6 @@ export function loadSourceText(source: Source) {
     }
 
     const newSource = getSourceFromId(getState(), source.id);
-
     if (isOriginalId(newSource.id) && !newSource.isWasm) {
       const generatedSource = getGeneratedSource(getState(), source);
       await dispatch(loadSourceText(generatedSource));

src/actions/sources/tests/select.spec.js

@@ -2,6 +2,7 @@
  * 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 { getSymbols } from "../../../reducers/ast";
 import {
   actions,
   selectors,
@@ -143,30 +144,42 @@ describe("sources", () => {
   });
 
   it("should keep the generated the viewing context", async () => {
-    const { dispatch, getState } = createStore(sourceThreadClient);
+    const store = createStore(sourceThreadClient);
+    const { dispatch, getState } = store;
     const baseSource = makeSource("base.js");
     await dispatch(actions.newSource(baseSource));
 
     await dispatch(
       actions.selectLocation({ sourceId: baseSource.id, line: 1 })
     );
+
     expect(getSelectedSource(getState()).id).toBe(baseSource.id);
+    await waitForState(store, state => getSymbols(state, baseSource));
   });
 
   it("should keep the original the viewing context", async () => {
     const { dispatch, getState } = createStore(
       sourceThreadClient,
       {},
-      { getOriginalLocation: async location => ({ ...location, line: 12 }) }
+      {
+        getOriginalLocation: async location => ({ ...location, line: 12 }),
+        getGeneratedLocation: async location => ({ ...location, line: 12 }),
+        getOriginalSourceText: async () => ({ source: "" })
+      }
     );
 
-    const baseSource = makeOriginalSource("base.js");
+    const baseSource = makeSource("base.js");
     await dispatch(actions.newSource(baseSource));
-    await dispatch(actions.selectSource(baseSource.id));
 
-    await dispatch(
-      actions.selectLocation({ sourceId: baseSource.id, line: 1 })
-    );
+    const originalBaseSource = makeOriginalSource("base.js");
+    await dispatch(actions.newSource(originalBaseSource));
+
+    await dispatch(actions.selectSource(originalBaseSource.id));
+
+    const fooSource = makeSource("foo.js");
+    await dispatch(actions.newSource(fooSource));
+    await dispatch(actions.selectLocation({ sourceId: fooSource.id, line: 1 }));
+
     expect(getSelectedLocation(getState()).line).toBe(12);
   });
 

src/reducers/sources.js

@@ -249,14 +249,6 @@ export function getGeneratedSource(state: OuterState, source: Source): Source {
   return getSourceFromId(state, originalToGeneratedId(source.id));
 }
 
-export function getOriginalSource(state: OuterState, id: string) {
-  if (!isGeneratedId(source.id)) {
-    return source;
-  }
-
-  return getSourceInSources(getSources(state), generatedToOriginalId(id));
-}
-
 export function getPendingSelectedLocation(state: OuterState) {
   return state.sources.pendingSelectedLocation;
 }

src/test/tests-setup.js

@@ -9,6 +9,7 @@ import getConfig from "../../bin/getConfig";
 import { readFileSync } from "fs";
 import Enzyme from "enzyme";
 import Adapter from "enzyme-adapter-react-16";
+import { clearLoadSourceRequests } from "../actions/sources/loadSourceText";
 import { setupHelper } from "../utils/dbg";
 
 import { startSourceMapWorker, stopSourceMapWorker } from "devtools-source-map";
@@ -75,9 +76,10 @@ afterAll(() => {
 
 afterEach(() => {});
 
-beforeEach(() => {
+beforeEach(async () => {
   clearASTs();
-  clearSymbols();
+  clearLoadSourceRequests();
+  await clearSymbols();
   clearHistory();
   clearDocuments();