Fix a couple of stepping typeErrors (#5680)

Author: jasonLaster

src/actions/breakpoints/tests/syncing.spec.js

@@ -8,6 +8,9 @@ jest.mock("../../../utils/prefs", () => ({
     expressions: [],
     pendingBreakpoints: {}
   },
+  features: {
+    replay: false
+  },
   clear: jest.fn()
 }));
 

src/actions/pause/commands.js

@@ -5,7 +5,7 @@
 
 // @flow
 
-import { isPaused, getSelectedSource, getTopFrame } from "../../selectors";
+import { isPaused, getSource, getTopFrame } from "../../selectors";
 import { PROMISE } from "../utils/middleware/promise";
 import { getNextStep } from "../../workers/parser";
 import { addHiddenBreakpoint } from "../breakpoints";
@@ -162,9 +162,13 @@ function hasAwait(source, pauseLocation) {
     return false;
   }
 
-  const snippet = source.text
-    .split("\n")
-    [line - 1].slice(column - 50, column + 50);
+  const lineText = source.text.split("\n")[line - 1];
+
+  if (!lineText) {
+    return false;
+  }
+
+  const snippet = lineText.slice(column - 50, column + 50);
 
   return !!snippet.match(/(yield|await)/);
 }
@@ -184,7 +188,7 @@ export function astCommand(stepType: CommandType) {
     if (stepType == "stepOver") {
       // This type definition is ambiguous:
       const frame: any = getTopFrame(getState());
-      const source = getSelectedSource(getState()).toJS();
+      const source = getSource(getState(), frame.location.sourceId);
 
       if (source && hasAwait(source, frame.location)) {
         const nextLocation = await getNextStep(source.id, frame.location);

src/actions/tests/pending-breakpoints.spec.js

@@ -16,6 +16,9 @@ jest.mock("../../utils/prefs", () => ({
     expressions: [],
     pendingBreakpoints: {}
   },
+  features: {
+    replay: false
+  },
   clear: jest.fn()
 }));
 

src/components/Editor/Breakpoint.js

@@ -3,6 +3,7 @@
  * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
 
 // @flow
+
 import React, { Component } from "react";
 import ReactDOM from "react-dom";
 import classnames from "classnames";

src/reducers/replay.js

@@ -3,6 +3,7 @@
  * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
 
 // @flow
+import { features } from "../utils/prefs";
 
 /**
  * Breakpoints reducer
@@ -26,6 +27,10 @@ const defaultFrameScopes = {
 };
 
 function update(state: ReplayState = initialState(), action: any): ReplayState {
+  if (!features.replay) {
+    return state;
+  }
+
   switch (action.type) {
     case "TRAVEL_TO": {
       return { ...state, position: action.position };
@@ -59,6 +64,11 @@ function addScopes(state: ReplayState, action: any) {
   const { frame, status, value } = action;
   const selectedFrameId = frame.id;
   const instance = state.history[state.position];
+
+  if (!instance) {
+    return state;
+  }
+
   const pausedInst = instance.paused;
 
   const generated = {
@@ -86,6 +96,11 @@ function mapScopes(state: ReplayState, action: any) {
   const { frame, status, value } = action;
   const selectedFrameId = frame.id;
   const instance = state.history[state.position];
+
+  if (!instance) {
+    return state;
+  }
+
   const pausedInst = instance.paused;
 
   const original = {
@@ -115,6 +130,7 @@ function evaluateExpression(state, action) {
   if (!instance) {
     return state;
   }
+
   const prevExpressions = instance.expressions || [];
   const expression = { input, value };
   const expressions = [...prevExpressions, expression];