Fix Console Hang

Author: jasonLaster

package.json

@@ -79,7 +79,7 @@
     "devtools-source-editor": "0.0.7",
     "devtools-source-map": "^0.14.5",
     "devtools-splitter": "^0.0.5",
-    "devtools-utils": "^0.0.9",
+    "devtools-utils": "^0.0.10",
     "fuzzaldrin-plus": "^0.4.1",
     "immutable": "^3.7.6",
     "lodash": "^4.17.4",

src/actions/ast.js

@@ -76,6 +76,9 @@ export function setSymbols(sourceId: SourceId) {
       source,
       symbols
     });
+
+    dispatch(setEmptyLines(source.id));
+    dispatch(setSourceMetaData(source.id));
   };
 }
 

src/actions/sources/loadSourceText.js

@@ -5,7 +5,7 @@
 // @flow
 
 import { PROMISE } from "../utils/middleware/promise";
-import { setEmptyLines, setSymbols, setSourceMetaData } from "../ast";
+import { setSymbols } from "../ast";
 import { getSource } from "../../selectors";
 import { setSource } from "../../workers/parser";
 import type { Source } from "../../types";
@@ -48,8 +48,6 @@ export function loadSourceText(source: Source) {
     }
 
     await setSource(newSource);
-    await dispatch(setSymbols(source.id));
-    await dispatch(setEmptyLines(source.id));
-    await dispatch(setSourceMetaData(source.id));
+    dispatch(setSymbols(source.id));
   };
 }

src/actions/tests/ast.spec.js

@@ -1,8 +1,11 @@
+/* eslint max-nested-callbacks: ["error", 6] */
+
 import {
   createStore,
   selectors,
   actions,
-  makeSource
+  makeSource,
+  waitForState
 } from "../../utils/test-head";
 
 import readFixture from "./helpers/readFixture";
@@ -48,42 +51,64 @@ const evaluationResult = {
 describe("ast", () => {
   describe("setEmptyLines", () => {
     it("scopes", async () => {
-      const { dispatch, getState } = createStore(threadClient);
+      const store = createStore(threadClient);
+      const { dispatch, getState } = store;
+
       const source = makeSource("scopes.js");
       await dispatch(actions.newSource(source));
       await dispatch(actions.loadSourceText({ id: "scopes.js" }));
 
+      await waitForState(store, state => {
+        const lines = getEmptyLines(state, source);
+        return lines && lines.length > 0;
+      });
+
       const emptyLines = getEmptyLines(getState(), source);
       expect(emptyLines).toMatchSnapshot();
     });
   });
   describe("setSourceMetaData", () => {
     it("should detect react components", async () => {
-      const { dispatch, getState } = createStore(threadClient);
+      const store = createStore(threadClient);
+      const { dispatch, getState } = store;
       const source = makeSource("reactComponent.js");
       await dispatch(actions.newSource(source));
+
       await dispatch(actions.loadSourceText({ id: "reactComponent.js" }));
+      await waitForState(store, state => {
+        const metaData = getSourceMetaData(state, source.id);
+        return metaData && metaData.isReactComponent;
+      });
 
       const sourceMetaData = getSourceMetaData(getState(), source.id);
       expect(sourceMetaData).toEqual({ isReactComponent: true });
     });
+
     it("should not give false positive on non react components", async () => {
-      const { dispatch, getState } = createStore(threadClient);
+      const store = createStore(threadClient);
+      const { dispatch, getState } = store;
       const source = makeSource("base.js");
       await dispatch(actions.newSource(source));
       await dispatch(actions.loadSourceText({ id: "base.js" }));
+      await waitForState(store, state => {
+        const metaData = getSourceMetaData(state, source.id);
+        return metaData && metaData.isReactComponent === false;
+      });
 
       const sourceMetaData = getSourceMetaData(getState(), source.id);
       expect(sourceMetaData).toEqual({ isReactComponent: false });
     });
   });
+
   describe("setSymbols", () => {
     describe("when the source is loaded", () => {
       it("should be able to set symbols", async () => {
-        const { dispatch, getState } = createStore(threadClient);
+        const store = createStore(threadClient);
+        const { dispatch, getState } = store;
         const base = makeSource("base.js");
         await dispatch(actions.newSource(base));
         await dispatch(actions.loadSourceText({ id: "base.js" }));
+        await waitForState(store, state => getSymbols(state, base));
 
         const baseSymbols = getSymbols(getState(), base);
         expect(baseSymbols).toMatchSnapshot();