Bug 1775203 - [devtools] Remove "loading" state of symbols state obje…

…ct. r=bomsy

This helps reduce the number of state changes and the number of renders.
We now switch from null symbols which means they are loading,
to an object with the loaded symbols.

Differential Revision: https://phabricator.services.mozilla.com/D149855

devtools/client/debugger/bin/module-manifest.json

@@ -2445,7 +2445,7 @@
         "byName": {},
         "byBlocks": {},
         "usedIds": {
-          "0": 0
+          "1": 1
         }
       }
     }
@@ -2466,7 +2466,7 @@
         "byName": {},
         "byBlocks": {},
         "usedIds": {
-          "0": 0
+          "1": 1
         }
       }
     }

devtools/client/debugger/dist/parser-worker.js

@@ -14695,7 +14695,6 @@ function extractSymbols(sourceId) {
     literals: [],
     hasJsx: false,
     hasTypes: false,
-    loading: false,
     framework: undefined
   };
   const state = {

devtools/client/debugger/src/actions/pause/highlightCalls.js

@@ -53,7 +53,7 @@ export function highlightCalls(cx) {
 
     const symbols = getSymbols(getState(), source);
 
-    if (!symbols || symbols.loading) {
+    if (!symbols) {
       return;
     }
 

devtools/client/debugger/src/actions/preview.js

@@ -31,7 +31,7 @@ function findExpressionMatch(state, codeMirror, tokenPos) {
   const symbols = getSymbols(state, source);
 
   let match;
-  if (!symbols || symbols.loading) {
+  if (!symbols) {
     match = getExpressionFromCoords(codeMirror, tokenPos);
   } else {
     match = findBestMatchExpression(symbols, tokenPos);

devtools/client/debugger/src/actions/sources/symbols.js

@@ -36,7 +36,7 @@ export const setSymbols = memoizeableAction("setSymbols", {
     }
 
     const symbols = getSymbols(getState(), source);
-    if (!symbols || symbols.loading) {
+    if (!symbols) {
       return null;
     }
 

devtools/client/debugger/src/actions/tests/__snapshots__/ast.spec.js.snap

@@ -76,7 +76,6 @@ Object {
   ],
   "imports": Array [],
   "literals": Array [],
-  "loading": false,
   "memberExpressions": Array [],
   "objectProperties": Array [],
 }

devtools/client/debugger/src/components/PrimaryPanes/Outline.js

@@ -101,7 +101,7 @@ export class Outline extends Component {
     let classes = [];
     let functions = [];
 
-    if (symbols && !symbols.loading) {
+    if (symbols) {
       ({ classes, functions } = symbols);
     }
 
@@ -221,7 +221,7 @@ export class Outline extends Component {
   renderClassFunctions(klass, functions) {
     const { symbols } = this.props;
 
-    if (!symbols || symbols.loading || klass == null || functions.length == 0) {
+    if (!symbols || klass == null || functions.length == 0) {
       return null;
     }
 
@@ -310,7 +310,7 @@ export class Outline extends Component {
       return this.renderPlaceholder();
     }
 
-    if (!symbols || symbols.loading) {
+    if (!symbols) {
       return this.renderLoading();
     }
 

devtools/client/debugger/src/components/test/Outline.spec.js

@@ -81,15 +81,6 @@ describe("Outline", () => {
         });
         expect(component).toMatchSnapshot();
       });
-
-      it("if symbols are loading", () => {
-        const { component } = render({
-          symbols: {
-            loading: true,
-          },
-        });
-        expect(component).toMatchSnapshot();
-      });
     });
 
     it("renders ignore anonymous functions", async () => {

devtools/client/debugger/src/components/test/__snapshots__/Outline.spec.js.snap

@@ -384,14 +384,6 @@ exports[`Outline renders outline renders ignore anonymous functions 1`] = `
 </div>
 `;
 
-exports[`Outline renders outline renders loading if symbols are loading 1`] = `
-<div
-  className="outline-pane-info"
->
-  Loading…
-</div>
-`;
-
 exports[`Outline renders outline renders loading if symbols is not defined 1`] = `
 <div
   className="outline-pane-info"

devtools/client/debugger/src/reducers/ast.js

@@ -21,10 +21,7 @@ function update(state = initialASTState(), action) {
     case "SET_SYMBOLS": {
       const { sourceId } = action;
       if (action.status === "start") {
-        return {
-          ...state,
-          symbols: { ...state.symbols, [sourceId]: { loading: true } },
-        };
+        return state;
       }
 
       const value = action.value;

devtools/client/debugger/src/selectors/ast.js

@@ -13,22 +13,11 @@ export function getSymbols(state, source) {
 }
 
 export function hasSymbols(state, source) {
-  const symbols = getSymbols(state, source);
-
-  if (!symbols) {
-    return false;
-  }
-
-  return !symbols.loading;
+  return !!getSymbols(state, source);
 }
 
 export function isSymbolsLoading(state, source) {
-  const symbols = getSymbols(state, source);
-  if (!symbols) {
-    return false;
-  }
-
-  return symbols.loading;
+  return !getSymbols(state, source);
 }
 
 export function getInScopeLines(state, location) {

devtools/client/debugger/src/utils/ast.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
 
 export function findBestMatchExpression(symbols, tokenPos) {
-  if (symbols.loading) {
+  if (!symbols) {
     return null;
   }
 
@@ -81,15 +81,15 @@ function findClosestofSymbol(declarations, location) {
 }
 
 export function findClosestFunction(symbols, location) {
-  if (!symbols || symbols.loading) {
+  if (!symbols) {
     return null;
   }
 
   return findClosestofSymbol(symbols.functions, location);
 }
 
 export function findClosestClass(symbols, location) {
-  if (!symbols || symbols.loading) {
+  if (!symbols) {
     return null;
   }
 

devtools/client/debugger/src/utils/quick-open.js

@@ -80,7 +80,7 @@ export function formatSymbol(symbol) {
 }
 
 export function formatSymbols(symbols) {
-  if (!symbols || symbols.loading) {
+  if (!symbols) {
     return { functions: [] };
   }
 

devtools/client/debugger/src/utils/source.js

@@ -500,7 +500,7 @@ export function getSourceClassnames(source, symbols) {
     return "blackBox";
   }
 
-  if (symbols && !symbols.loading && symbols.framework) {
+  if (symbols && symbols.framework) {
     return symbols.framework.toLowerCase();
   }
 

devtools/client/debugger/src/utils/tests/source.spec.js

@@ -40,7 +40,6 @@ const defaultSymbolDeclarations = {
   literals: [],
   hasJsx: false,
   hasTypes: false,
-  loading: false,
   framework: undefined,
 };
 

devtools/client/debugger/src/workers/parser/getSymbols.js

@@ -107,7 +107,6 @@ function extractSymbols(sourceId) {
     literals: [],
     hasJsx: false,
     hasTypes: false,
-    loading: false,
     framework: undefined,
   };