Lock down parser flow type exports (#5674)

Author: jasonLaster

src/actions/preview.js

@@ -21,7 +21,6 @@ import {
 } from "../selectors";
 
 import { getMappedExpression } from "./expressions";
-
 import { isEqual } from "lodash";
 
 import type { ThunkArgs } from "./types";
@@ -91,7 +90,6 @@ function isInvalidTarget(target: HTMLElement) {
 
 export function updatePreview(target: HTMLElement, editor: any) {
   return ({ dispatch, getState, client, sourceMaps }: ThunkArgs) => {
-    const tokenText = target.innerText ? target.innerText.trim() : "";
     const tokenPos = getTokenLocation(editor.codeMirror, target);
     const cursorPos = target.getBoundingClientRect();
     const preview = getPreview(getState());
@@ -126,9 +124,9 @@ export function updatePreview(target: HTMLElement, editor: any) {
 
     let match;
     if (!symbols || symbols.loading) {
-      match = findBestMatchExpression(symbols, tokenPos, tokenText);
-    } else {
       match = getExpressionFromCoords(editor.codeMirror, tokenPos);
+    } else {
+      match = findBestMatchExpression(symbols, tokenPos);
     }
 
     if (!match || !match.expression) {

src/actions/types.js

@@ -24,8 +24,9 @@ import type {
 } from "../reducers/ui";
 import type { MatchedLocations } from "../reducers/file-search";
 
-import type { SymbolDeclaration, AstLocation } from "../workers/parser";
+import type { AstLocation, SymbolDeclaration } from "../workers/parser";
 import type { SourceMetaDataType } from "../reducers/ast.js";
+
 /**
  * Flow types
  * @module actions/types

src/components/PrimaryPanes/Outline.js

@@ -15,9 +15,9 @@ import PreviewFunction from "../shared/PreviewFunction";
 import { uniq, sortBy } from "lodash";
 import type {
   SymbolDeclarations,
-  SymbolDeclaration
-} from "../../workers/parser/getSymbols";
-import type { AstLocation } from "../../workers/parser/types";
+  SymbolDeclaration,
+  AstLocation
+} from "../../workers/parser";
 import type { SourceRecord } from "../../reducers/sources";
 
 type Props = {

src/types.js

@@ -327,3 +327,7 @@ export type Worker = {
   type: number,
   url: string
 };
+
+export type Position = { line: number, column: number };
+
+export type Range = { end: Position, start: Position };

src/utils/ast.js

@@ -2,7 +2,15 @@
  * 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/>. */
 
-export function findBestMatchExpression(symbols, tokenPos, token) {
+// @flow
+
+import type { Position } from "../types";
+import type { SymbolDeclarations } from "../workers/parser";
+
+export function findBestMatchExpression(
+  symbols: SymbolDeclarations,
+  tokenPos: Position
+) {
   const { memberExpressions, identifiers } = symbols;
   const { line, column } = tokenPos;
   return identifiers.concat(memberExpressions).reduce((found, expression) => {

src/utils/breakpoint/astBreakpointLocation.js

@@ -6,8 +6,12 @@
 
 import { getSymbols } from "../../workers/parser";
 
-import type { Scope, AstPosition } from "../../workers/parser/types";
-import type { SymbolDeclarations } from "../../workers/parser/getSymbols";
+import type {
+  Scope,
+  AstPosition,
+  SymbolDeclarations
+} from "../../workers/parser";
+
 import type { Location, Source, ASTLocation } from "../../types";
 
 export function containsPosition(a: AstPosition, b: AstPosition) {

src/utils/breakpoint/tests/astBreakpointLocation.spec.js

@@ -1,7 +1,7 @@
 import { getASTLocation } from "../astBreakpointLocation.js";
 import { getSource } from "../../../workers/parser/tests/helpers";
 import { setSource } from "../../../workers/parser/sources";
-import getSymbols from "../../../workers/parser/getSymbols";
+import { getSymbols } from "../../../workers/parser/getSymbols";
 import cases from "jest-in-case";
 
 async function setup({ fileName, location, functionName }) {

src/utils/editor/source-documents.js

@@ -9,7 +9,7 @@ import { getMode } from "../source";
 import type { Source } from "../../types";
 import { isWasm, getWasmLineNumberFormatter, renderWasmText } from "../wasm";
 import { resizeBreakpointGutter, resizeToggleButton } from "../ui";
-import type { SymbolDeclarations } from "../../workers/parser/getSymbols";
+import type { SymbolDeclarations } from "../../workers/parser";
 import type { SourceRecord } from "../../reducers/types";
 import SourceEditor from "./source-editor";
 

src/utils/tests/ast.spec.js

@@ -1,6 +1,6 @@
 import { findBestMatchExpression } from "../ast";
 
-import getSymbols from "../../workers/parser/getSymbols";
+import { getSymbols } from "../../workers/parser/getSymbols";
 import { getSource } from "../../workers/parser/tests/helpers";
 import { setSource } from "../../workers/parser/sources";
 

src/utils/tests/function.spec.js

@@ -1,6 +1,6 @@
 import { findFunctionText } from "../function";
 
-import getSymbols from "../../workers/parser/getSymbols";
+import { getSymbols } from "../../workers/parser/getSymbols";
 import { getOriginalSource } from "../../workers/parser/tests/helpers";
 import { setSource } from "../../workers/parser/sources";