Use isOriginal and isGenerated instead of ID checks (firefox-devtools#6996)

darkwing · jasonLaster · commit 3f8d481b5e85 · 2018-09-19T19:00:06.000-04:00
diff --git a/src/actions/ast.js b/src/actions/ast.js
@@ -24,9 +24,8 @@ import {
 } from "../workers/parser";
 
 import { PROMISE } from "./utils/middleware/promise";
-import { isGeneratedId } from "devtools-source-map";
 import { features } from "../utils/prefs";
-import { isLoaded } from "../utils/source";
+import { isLoaded, isGenerated } from "../utils/source";
 
 import type { SourceId } from "../types";
 import type { ThunkArgs, Action } from "./types";
@@ -128,7 +127,7 @@ export function setPausePoints(sourceId: SourceId) {
     const pausePoints = await getPausePoints(sourceId);
     const compressed = compressPausePoints(pausePoints);
 
-    if (isGeneratedId(sourceId)) {
+    if (isGenerated(source)) {
       await client.setPausePoints(sourceId, compressed);
     }
 
diff --git a/src/actions/expressions.js b/src/actions/expressions.js
@@ -15,9 +15,9 @@ import {
   getSelectedFrameBindings
 } from "../selectors";
 import { PROMISE } from "./utils/middleware/promise";
-import { isGeneratedId } from "devtools-source-map";
 import { wrapExpression } from "../utils/expressions";
 import { features } from "../utils/prefs";
+import { isOriginal } from "../utils/source";
 
 import * as parser from "../workers/parser";
 import type { Expression } from "../types";
@@ -135,15 +135,10 @@ function evaluateExpression(expression: Expression) {
     if (frame) {
       const { location } = frame;
       const source = getSourceFromId(getState(), location.sourceId);
-      const sourceId = source.id;
 
       const selectedSource = getSelectedSource(getState());
 
-      if (
-        selectedSource &&
-        !isGeneratedId(sourceId) &&
-        !isGeneratedId(selectedSource.id)
-      ) {
+      if (selectedSource && isOriginal(source) && isOriginal(selectedSource)) {
         const mapResult = await dispatch(getMappedExpression(input));
         if (mapResult) {
           input = mapResult.expression || mapResult;
diff --git a/src/actions/pause/mapScopes.js b/src/actions/pause/mapScopes.js
@@ -10,7 +10,7 @@ import { PROMISE } from "../utils/middleware/promise";
 
 import { features } from "../../utils/prefs";
 import { log } from "../../utils/log";
-import { isGeneratedId } from "devtools-source-map";
+import { isGenerated } from "../../utils/source";
 import type { Frame, Scope } from "../../types";
 
 import type { ThunkArgs } from "../types";
@@ -36,7 +36,7 @@ export function mapScopes(scopes: Promise<Scope>, frame: Frame) {
           !generatedSource ||
           generatedSource.isWasm ||
           source.isPrettyPrinted ||
-          isGeneratedId(frame.location.sourceId)
+          isGenerated(source)
         ) {
           return null;
         }
diff --git a/src/actions/preview.js b/src/actions/preview.js
@@ -5,9 +5,9 @@
 // @flow
 import { isConsole } from "../utils/preview";
 import { findBestMatchExpression } from "../utils/ast";
-import { isGeneratedId } from "devtools-source-map";
 import { PROMISE } from "./utils/middleware/promise";
 import { getExpressionFromCoords } from "../utils/editor/get-expression";
+import { isOriginal } from "../utils/source";
 
 import {
   getPreview,
@@ -87,10 +87,9 @@ export function setPreview(
           return;
         }
 
-        const sourceId = source.id;
         const selectedFrame = getSelectedFrame(getState());
 
-        if (location && !isGeneratedId(sourceId)) {
+        if (location && isOriginal(source)) {
           const mapResult = await dispatch(getMappedExpression(expression));
           if (mapResult) {
             expression = mapResult.expression || mapResult;
diff --git a/src/actions/sources/loadSourceText.js b/src/actions/sources/loadSourceText.js
@@ -4,11 +4,10 @@
 
 // @flow
 
-import { isOriginalId } from "devtools-source-map";
 import { PROMISE } from "../utils/middleware/promise";
 import { getGeneratedSource, getSource } from "../../selectors";
 import * as parser from "../../workers/parser";
-import { isLoaded } from "../../utils/source";
+import { isLoaded, isOriginal } from "../../utils/source";
 import { Telemetry } from "devtools-modules";
 
 import defer from "../../utils/defer";
@@ -23,8 +22,8 @@ const loadSourceHistogram = "DEVTOOLS_DEBUGGER_LOAD_SOURCE_MS";
 const telemetry = new Telemetry();
 
 async function loadSource(source: Source, { sourceMaps, client }) {
-  const id = source.id;
-  if (isOriginalId(id)) {
+  const { id } = source;
+  if (isOriginal(source)) {
     return sourceMaps.getOriginalSourceText(source);
   }
 
@@ -79,7 +78,7 @@ export function loadSourceText(source: ?Source) {
       return;
     }
 
-    if (isOriginalId(newSource.id) && !newSource.isWasm) {
+    if (isOriginal(newSource) && !newSource.isWasm) {
       const generatedSource = getGeneratedSource(getState(), source);
       await dispatch(loadSourceText(generatedSource));
     }
diff --git a/src/actions/sources/newSources.js b/src/actions/sources/newSources.js
@@ -9,15 +9,15 @@
  * @module actions/sources
  */
 
-import { isGeneratedId, generatedToOriginalId } from "devtools-source-map";
+import { generatedToOriginalId } from "devtools-source-map";
 import { flatten } from "lodash";
 
 import { toggleBlackBox } from "./blackbox";
 import { syncBreakpoint } from "../breakpoints";
 import { loadSourceText } from "./loadSourceText";
 import { togglePrettyPrint } from "./prettyPrint";
 import { selectLocation } from "../sources";
-import { getRawSourceURL, isPrettyURL } from "../../utils/source";
+import { getRawSourceURL, isPrettyURL, isOriginal } from "../../utils/source";
 import {
   getBlackBoxList,
   getSource,
@@ -69,7 +69,7 @@ function loadSourceMap(sourceId: SourceId) {
   return async function({ dispatch, getState, sourceMaps }: ThunkArgs) {
     const source = getSource(getState(), sourceId);
 
-    if (!source || !isGeneratedId(sourceId) || !source.sourceMapURL) {
+    if (!source || isOriginal(source) || !source.sourceMapURL) {
       return;
     }
 
diff --git a/src/components/Editor/Footer.js b/src/components/Editor/Footer.js
@@ -5,7 +5,6 @@
 // @flow
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
-import { isOriginalId } from "devtools-source-map";
 import classnames from "classnames";
 
 import actions from "../../actions";
@@ -16,7 +15,12 @@ import {
 } from "../../selectors";
 
 import { features } from "../../utils/prefs";
-import { isPretty, isLoaded, getFilename } from "../../utils/source";
+import {
+  isPretty,
+  isLoaded,
+  getFilename,
+  isOriginal
+} from "../../utils/source";
 import { getGeneratedSource } from "../../reducers/sources";
 import { shouldShowFooter, shouldShowPrettyPrint } from "../../utils/editor";
 
@@ -158,7 +162,7 @@ class SourceFooter extends PureComponent<Props> {
   renderSourceSummary() {
     const { mappedSource, jumpToMappedLocation, selectedSource } = this.props;
 
-    if (!mappedSource || !isOriginalId(selectedSource.id)) {
+    if (!mappedSource || !isOriginal(selectedSource)) {
       return null;
     }
 
diff --git a/src/components/PrimaryPanes/SourcesTreeItem.js b/src/components/PrimaryPanes/SourcesTreeItem.js
@@ -4,7 +4,6 @@
 
 // @flow
 
-import { isOriginalId } from "devtools-source-map";
 import React, { Component } from "react";
 import { connect } from "react-redux";
 import classnames from "classnames";
@@ -16,6 +15,7 @@ import Svg from "../shared/Svg";
 import { getSourcesByURL } from "../../selectors";
 import actions from "../../actions";
 
+import { isOriginal as isOriginalSource } from "../../utils/source";
 import { isDirectory } from "../../utils/sources-tree";
 import { copyToTheClipboard } from "../../utils/clipboard";
 import { features } from "../../utils/prefs";
@@ -191,7 +191,7 @@ function getHasMatchingGeneratedSource(state, source: ?Source) {
     return false;
   }
 
-  const isOriginal = isOriginalId(source.id);
+  const isOriginal = isOriginalSource(source);
   const sources = getSourcesByURL(state, source.url, isOriginal);
   return isOriginal && sources.length > 0;
 }
diff --git a/src/components/SecondaryPanes/Breakpoints/Breakpoint.js b/src/components/SecondaryPanes/Breakpoints/Breakpoint.js
@@ -6,7 +6,6 @@
 
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
-import { isGeneratedId } from "devtools-source-map";
 
 import classnames from "classnames";
 
@@ -19,6 +18,7 @@ import { getLocationWithoutColumn } from "../../../utils/breakpoint";
 
 import { features } from "../../../utils/prefs";
 import { getEditor } from "../../../utils/editor";
+import { isGenerated } from "../../../utils/source";
 
 import type { BreakpointsMap } from "../../../reducers/types";
 
@@ -53,7 +53,7 @@ type Props = {
 };
 
 function getMappedLocation(mappedLocation: MappedLocation, selectedSource) {
-  return selectedSource && isGeneratedId(selectedSource.id)
+  return selectedSource && isGenerated(selectedSource)
     ? mappedLocation.generatedLocation
     : mappedLocation.location;
 }
@@ -132,7 +132,7 @@ class Breakpoint extends PureComponent<Props> {
       return condition;
     }
 
-    if (selectedSource && isGeneratedId(selectedSource.id)) {
+    if (selectedSource && isGenerated(selectedSource)) {
       return breakpoint.text;
     }
 
diff --git a/src/reducers/pending-breakpoints.js b/src/reducers/pending-breakpoints.js
@@ -9,13 +9,13 @@
  * @module reducers/pending-breakpoints
  */
 
-import { isGeneratedId } from "devtools-source-map";
 import { getSourcesByURL } from "./sources";
 
 import {
   createPendingBreakpoint,
   makePendingLocationId
 } from "../utils/breakpoint";
+import { isGenerated } from "../utils/source";
 
 import type { SourcesState } from "./sources";
 import type { PendingBreakpoint, Source } from "../types";
@@ -164,7 +164,7 @@ export function getPendingBreakpointsForSource(
   source: Source
 ): PendingBreakpoint[] {
   const sources = getSourcesByURL(state, source.url);
-  if (sources.length > 1 && isGeneratedId(source.id)) {
+  if (sources.length > 1 && isGenerated(source)) {
     // Don't return pending breakpoints for duplicated generated sources
     return [];
   }
diff --git a/src/reducers/sources.js b/src/reducers/sources.js
@@ -14,9 +14,11 @@ import {
   getPrettySourceURL,
   underRoot,
   getRelativeUrl,
-  isPrettyURL
+  isPrettyURL,
+  isGenerated,
+  isOriginal as isOriginalSource
 } from "../utils/source";
-import { originalToGeneratedId, isOriginalId } from "devtools-source-map";
+import { originalToGeneratedId } from "devtools-source-map";
 import { prefs } from "../utils/prefs";
 
 import type { Source, SourceId, Location } from "../types";
@@ -334,7 +336,7 @@ export function getSourcesByURL(
 }
 
 export function getGeneratedSource(state: OuterState, source: Source): Source {
-  if (!isOriginalId(source.id)) {
+  if (isGenerated(source)) {
     return source;
   }
 
@@ -369,7 +371,7 @@ export function getSourceByUrlInSources(
     return null;
   }
 
-  return foundSources.find(source => isOriginalId(source.id) == isOriginal);
+  return foundSources.find(source => isOriginalSource(source) == isOriginal);
 }
 
 function getSourcesByUrlInSources(
diff --git a/src/selectors/breakpointAtLocation.js b/src/selectors/breakpointAtLocation.js
@@ -4,11 +4,7 @@
 
 import { getSelectedSource } from "../reducers/sources";
 import { getBreakpoints } from "../reducers/breakpoints";
-import { isGeneratedId } from "devtools-source-map";
-
-function isGenerated(selectedSource) {
-  return isGeneratedId(selectedSource.id);
-}
+import { isGenerated } from "../utils/source";
 
 function getColumn(column, selectedSource) {
   if (column) {
diff --git a/src/selectors/getCallStackFrames.js b/src/selectors/getCallStackFrames.js
@@ -9,7 +9,7 @@ import {
 } from "../reducers/sources";
 import { getFrames } from "../reducers/pause";
 import { annotateFrames } from "../utils/pause/frames";
-import { isOriginalId } from "devtools-source-map";
+import { isOriginal } from "../utils/source";
 import { get } from "lodash";
 import type { Frame, Source } from "../types";
 import type { SourcesMap } from "../reducers/sources";
@@ -27,7 +27,7 @@ function getSourceForFrame(sources, frame, isGeneratedSource) {
 }
 
 function appendSource(sources, frame, selectedSource) {
-  const isGeneratedSource = selectedSource && !isOriginalId(selectedSource.id);
+  const isGeneratedSource = selectedSource && !isOriginal(selectedSource);
   return {
     ...frame,
     location: getLocation(frame, isGeneratedSource),
diff --git a/src/utils/editor/index.js b/src/utils/editor/index.js
@@ -11,11 +11,10 @@ export * from "../ui";
 export { onMouseOver } from "./token-events";
 
 import { createEditor } from "./create-editor";
-import { shouldPrettyPrint } from "../source";
+import { shouldPrettyPrint, isOriginal } from "../source";
 import { findNext, findPrev } from "./source-search";
 
 import { isWasm, lineToWasmOffset, wasmOffsetToLine } from "../wasm";
-import { isOriginalId } from "devtools-source-map";
 
 import type { AstLocation } from "../../workers/parser";
 import type { EditorPosition, EditorRange } from "../editor/types";
@@ -74,9 +73,7 @@ export function shouldShowFooter(selectedSource, horizontal) {
   if (!selectedSource) {
     return false;
   }
-  return (
-    shouldShowPrettyPrint(selectedSource) || isOriginalId(selectedSource.id)
-  );
+  return shouldShowPrettyPrint(selectedSource) || isOriginal(selectedSource);
 }
 
 export function traverseResults(e, ctx, query, dir, modifiers) {
diff --git a/src/utils/pause/stepping.js b/src/utils/pause/stepping.js
@@ -5,9 +5,10 @@
 // @flow
 
 import { isEqual } from "lodash";
-import { isGeneratedId, isOriginalId } from "devtools-source-map";
+import { isGeneratedId } from "devtools-source-map";
 import type { Frame, MappedLocation } from "../../types";
 import type { State } from "../../reducers/types";
+import { isOriginal } from "../../utils/source";
 
 import {
   getSelectedSource,
@@ -20,7 +21,7 @@ function getFrameLocation(source, frame: ?MappedLocation) {
     return null;
   }
 
-  return isOriginalId(source.id) ? frame.location : frame.generatedLocation;
+  return isOriginal(source) ? frame.location : frame.generatedLocation;
 }
 
 export function shouldStep(rootFrame: ?Frame, state: State, sourceMaps: any) {
diff --git a/src/utils/source.js b/src/utils/source.js
