Add flow coverage to parser/types.js (#5772)

Author: y9127

src/actions/preview.js

@@ -24,7 +24,8 @@ import { getMappedExpression } from "./expressions";
 import { isEqual } from "lodash";
 
 import type { ThunkArgs } from "./types";
-import type { Frame, Range, ColumnPosition } from "../types";
+import type { Frame, ColumnPosition } from "../types";
+import type { AstLocation } from "../workers/parser";
 
 async function getReactProps(evaluate) {
   const reactDisplayName = await evaluate(
@@ -159,7 +160,7 @@ export function updatePreview(target: HTMLElement, editor: any) {
 
 export function setPreview(
   expression: string,
-  location: Range,
+  location: AstLocation,
   tokenPos: ColumnPosition,
   cursorPos: any
 ) {

src/actions/types.js

@@ -25,11 +25,13 @@ import type {
 } from "../reducers/ui";
 
 import type { MatchedLocations } from "../reducers/file-search";
+
 import type {
-  SymbolDeclaration,
+  SymbolDeclarations,
   AstLocation,
   PausePoint
 } from "../workers/parser";
+
 import type { SourceMetaDataType } from "../reducers/ast.js";
 
 /**
@@ -326,7 +328,7 @@ type ASTAction =
   | {
       type: "SET_SYMBOLS",
       source: Source,
-      value: SymbolDeclaration[]
+      value: SymbolDeclarations
     }
   | {
       type: "SET_PAUSE_POINTS",

src/components/Editor/index.js

@@ -41,7 +41,6 @@ import EmptyLines from "./EmptyLines";
 import GutterMenu from "./GutterMenu";
 import EditorMenu from "./EditorMenu";
 import ConditionalPanel from "./ConditionalPanel";
-import type { SymbolDeclarations } from "../../workers/parser";
 
 import {
   showSourceText,
@@ -66,6 +65,7 @@ import "./Editor.css";
 import "./Highlight.css";
 
 import type SourceEditor from "../../utils/editor/source-editor";
+import type { SymbolDeclarations } from "../../workers/parser";
 
 const cssVars = {
   searchbarHeight: "var(--editor-searchbar-height)",

src/components/PrimaryPanes/Outline.js

@@ -22,10 +22,12 @@ import {
 import "./Outline.css";
 import PreviewFunction from "../shared/PreviewFunction";
 import { uniq, sortBy } from "lodash";
+
 import type {
+  AstLocation,
   SymbolDeclarations,
   SymbolDeclaration,
-  AstLocation
+  FunctionDeclaration
 } from "../../workers/parser";
 import type { SourceRecord } from "../../types";
 
@@ -104,7 +106,7 @@ export class Outline extends Component<Props> {
     );
   }
 
-  renderFunction(func: SymbolDeclaration) {
+  renderFunction(func: FunctionDeclaration) {
     const { name, location, parameterNames } = func;
 
     return (
@@ -120,7 +122,7 @@ export class Outline extends Component<Props> {
     );
   }
 
-  renderClassFunctions(klass: string, functions: SymbolDeclaration[]) {
+  renderClassFunctions(klass: string, functions: FunctionDeclaration[]) {
     if (klass == null || functions.length == 0) {
       return null;
     }
@@ -149,7 +151,7 @@ export class Outline extends Component<Props> {
     );
   }
 
-  renderFunctions(functions: Array<SymbolDeclaration>) {
+  renderFunctions(functions: Array<FunctionDeclaration>) {
     let classes = uniq(functions.map(func => func.klass));
     let namedFunctions = functions.filter(
       func =>

src/reducers/ast.js

@@ -15,9 +15,9 @@ import makeRecord from "../utils/makeRecord";
 import { findEmptyLines } from "../utils/ast";
 
 import type {
-  SymbolDeclarations,
   AstLocation,
-  PausePoint
+  PausePoint,
+  SymbolDeclarations
 } from "../workers/parser";
 
 import type { Map } from "immutable";
@@ -26,6 +26,7 @@ import type { Action } from "../actions/types";
 import type { Record } from "../utils/makeRecord";
 
 type EmptyLinesType = number[];
+
 export type Symbols = SymbolDeclarations | {| loading: true |};
 export type SymbolsMap = Map<string, Symbols>;
 export type EmptyLinesMap = Map<string, EmptyLinesType>;

src/utils/ast.js

@@ -2,31 +2,34 @@
  * 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/>. */
 
+// @flow
+
 import { without, range } from "lodash";
 
 import type { Location, Source, ColumnPosition } from "../types";
+
+import type { AstPosition, AstLocation, PausePoint } from "../workers/parser";
 import type {
-  AstPosition,
-  AstLocation,
   SymbolDeclarations,
-  SymbolDeclaration,
-  PausePoint
-} from "../workers/parser";
+  FunctionDeclaration
+} from "../workers/parser/getSymbols";
 
 export function findBestMatchExpression(
   symbols: SymbolDeclarations,
   tokenPos: ColumnPosition
 ) {
   const { memberExpressions, identifiers, literals } = symbols;
   const { line, column } = tokenPos;
-  return identifiers
-    .concat(memberExpressions, literals)
+
+  const members = memberExpressions.filter(({ computed }) => !computed);
+
+  return []
+    .concat(identifiers, members, literals)
     .reduce((found, expression) => {
       const overlaps =
         expression.location.start.line == line &&
         expression.location.start.column <= column &&
-        expression.location.end.column >= column &&
-        !expression.computed;
+        expression.location.end.column >= column;
 
       if (overlaps) {
         return expression;
@@ -66,7 +69,7 @@ export function containsPosition(a: AstLocation, b: AstPosition) {
 }
 
 export function findClosestFunction(
-  functions: SymbolDeclaration[],
+  functions: FunctionDeclaration[],
   location: Location
 ) {
   return functions.reduce((found, currNode) => {

src/utils/editor/get-expression.js

@@ -52,7 +52,8 @@ export function getExpressionFromCoords(cm: any, coord: ColumnPosition) {
 
     startHighlight = tokenBefore.startColumn;
   }
-  const expression = line.substring(startHighlight, endHighlight);
+
+  const expression = line.substring(startHighlight, endHighlight) || "";
 
   if (!expression) {
     return null;

src/utils/editor/source-documents.js

@@ -6,12 +6,13 @@
 
 import { getMode } from "../source";
 
-import type { Source, SourceRecord } from "../../types";
 import { isWasm, getWasmLineNumberFormatter, renderWasmText } from "../wasm";
 import { resizeBreakpointGutter, resizeToggleButton } from "../ui";
-import type { SymbolDeclarations } from "../../workers/parser";
 import SourceEditor from "./source-editor";
 
+import type { Source, SourceRecord } from "../../types";
+import type { SymbolDeclarations } from "../../workers/parser";
+
 let sourceDocs = {};
 
 function getDocument(key: string) {

src/utils/quick-open.js

@@ -3,14 +3,15 @@
  * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
 
 // @flow
+
 import { endTruncateStr } from "./utils";
 import { isPretty, getFilename } from "./source";
 
 import type { Location as BabelLocation } from "@babel/types";
 import type { Symbols } from "../reducers/ast";
 import type { QuickOpenType } from "../reducers/quick-open";
-import type { SymbolDeclaration } from "../workers/parser";
 import type { RelativeSource } from "../selectors/getRelativeSources";
+import type { SymbolDeclaration } from "../workers/parser";
 
 export const MODIFIERS = {
   "@": "functions",

src/utils/tests/__snapshots__/ast.spec.js.snap

@@ -4,16 +4,6 @@ exports[`find the best expression for the token should find the expression for t
 Object {
   "computed": false,
   "expression": "obj.b",
-  "expressionLocation": SourceLocation {
-    "end": Position {
-      "column": 17,
-      "line": 6,
-    },
-    "start": Position {
-      "column": 12,
-      "line": 6,
-    },
-  },
   "location": Object {
     "end": Position {
       "column": 17,