[Scopes] Map original scopes to server scopes (#5215)

Author: loganfsmyth

.prettierignore

@@ -0,0 +1 @@
+src/workers/parser/tests/fixtures/functionNames.js

flow-typed/debugger-html.js

@@ -254,32 +254,6 @@ declare module "debugger-html" {
     loadedState: "unloaded" | "loading" | "loaded"
   };
 
-  /**
-   * SourceScope
-   * @memberof types
-   * @static
-   */
-  declare type SourceScope = {
-    type: string,
-    start: Location,
-    end: Location,
-    bindings: {
-      [name: string]: Location[]
-    }
-  };
-
-  /*
-   * MappedScopeBindings
-   * @memberof types
-   * @static
-   */
-  declare type MappedScopeBindings = {
-    type: string,
-    bindings: {
-      [originalName: string]: string
-    }
-  };
-
   /**
    * Script
    * This describes scripts which are sent to the debug server to be eval'd
@@ -304,11 +278,6 @@ declare module "debugger-html" {
     [name: string]: BindingContents
   };
 
-  declare type SyntheticScope = {
-    type: string,
-    bindingsNames: string[]
-  };
-
   /**
    * Scope
    * @memberof types
@@ -321,22 +290,14 @@ declare module "debugger-html" {
       arguments: Array<ScopeBindings>,
       variables: ScopeBindings
     },
-    sourceBindings?: {
-      [originalName: string]: string
-    },
-    object: Object,
-    function: {
+    object: ?Object,
+    function: ?{
       actor: ActorId,
       class: string,
       displayName: string,
       location: Location,
       parameterNames: string[]
     },
-    syntheticScopes?: {
-      scopes: SyntheticScope[],
-      groupIndex: number,
-      groupLength: number
-    },
     type: string
   };
 

package.json

@@ -73,7 +73,6 @@
     "codemirror": "^5.28.0",
     "devtools-launchpad": "^0.0.115",
     "devtools-linters": "^0.0.4",
-    "devtools-map-bindings": "^0.3.2",
     "devtools-reps": "^0.19.2",
     "devtools-source-map": "^0.14.7",
     "devtools-splitter": "^0.0.6",
@@ -141,7 +140,7 @@
     "mock-require": "^3.0.0",
     "node-emoji": "^1.8.1",
     "npm-run-all": "^4.0.2",
-    "prettier": "^1.6.1",
+    "prettier": "^1.10.2",
     "react-addons-perf": "^15.4.2",
     "react-test-renderer": "15.6.2",
     "remark-cli": "^5.0.0",

src/actions/expressions.js

@@ -143,16 +143,5 @@ export async function getMappedExpression(
   generatedLocation: Location,
   expression: string
 ): Promise<string> {
-  const astScopes = await parser.getScopes(generatedLocation);
-
-  const generatedScopes = await sourceMaps.getLocationScopes(
-    generatedLocation,
-    astScopes
-  );
-
-  if (!generatedScopes) {
-    return expression;
-  }
-
-  return parser.replaceOriginalVariableName(expression, generatedScopes);
+  return expression;
 }

src/actions/pause/fetchScopes.js

@@ -7,43 +7,10 @@
 import { getSource, getSelectedFrame, getFrameScope } from "../../selectors";
 import { features } from "../../utils/prefs";
 import { isGeneratedId } from "devtools-source-map";
-import { loadSourceText } from "../sources/loadSourceText";
-import { getScopes } from "../../workers/parser";
-
-// eslint-disable-next-line max-len
-import { updateScopeBindings } from "devtools-map-bindings/src/updateScopeBindings";
-
-import type { Frame, Scope, SourceScope } from "debugger-html";
+import { mapScopes } from "./mapScopes";
 
 import type { ThunkArgs } from "../types";
 
-function mapScopes(scopes: Scope, frame: Frame) {
-  return async function({ dispatch, getState, client, sourceMaps }: ThunkArgs) {
-    const mappedScopes = await updateScopeBindings(
-      scopes,
-      frame.generatedLocation,
-      frame.location,
-      {
-        async getSourceMapsScopes(location) {
-          const astScopes: ?(SourceScope[]) = await getScopes(location);
-          return sourceMaps.getLocationScopes(location, astScopes);
-        },
-        async getOriginalSourceScopes(location) {
-          const source = getSource(getState(), location.sourceId);
-          await dispatch(loadSourceText(source));
-          return getScopes(location);
-        }
-      }
-    );
-
-    dispatch({
-      type: "MAP_SCOPES",
-      frame,
-      scopes: mappedScopes
-    });
-  };
-}
-
 export function fetchScopes() {
   return async function({ dispatch, getState, client, sourceMaps }: ThunkArgs) {
     const frame = getSelectedFrame(getState());