Refactor pause commands (#5804)

Author: jasonLaster

src/actions/pause/commands.js

@@ -12,15 +12,7 @@ import { addHiddenBreakpoint } from "../breakpoints";
 import { features } from "../../utils/prefs";
 
 import type { ThunkArgs } from "../types";
-type CommandType =
-  | "stepOver"
-  | "stepIn"
-  | "stepOut"
-  | "resume"
-  | "rewind"
-  | "reverseStepOver"
-  | "reverseStepIn"
-  | "reverseStepOut";
+import type { Command } from "../../reducers/types";
 
 /**
  * Debugger commands like stepOver, stepIn, stepUp
@@ -29,7 +21,7 @@ type CommandType =
  * @memberof actions/pause
  * @static
  */
-export function command(type: CommandType) {
+export function command(type: Command) {
   return async ({ dispatch, client }: ThunkArgs) => {
     return dispatch({
       type: "COMMAND",
@@ -179,7 +171,7 @@ function hasAwait(source, pauseLocation) {
  * @param stepType
  * @returns {function(ThunkArgs)}
  */
-export function astCommand(stepType: CommandType) {
+export function astCommand(stepType: Command) {
   return async ({ dispatch, getState, sourceMaps }: ThunkArgs) => {
     if (!features.asyncStepping) {
       return dispatch(command(stepType));

src/actions/types.js

@@ -16,7 +16,7 @@ import type {
   Worker
 } from "../types";
 
-import type { State } from "../reducers/types";
+import type { State, Command } from "../reducers/types";
 
 import type {
   ActiveSearchType,
@@ -264,7 +264,7 @@ type PauseAction =
       shouldPauseOnExceptions: boolean,
       shouldIgnoreCaughtExceptions: boolean
     }
-  | { type: "COMMAND", value: { type: string }, command: string }
+  | { type: "COMMAND", status: AsyncStatus, command: Command }
   | { type: "SELECT_FRAME", frame: Frame }
   | {
       type: "SET_POPUP_OBJECT_PROPERTIES",

src/reducers/pause.js

@@ -19,6 +19,18 @@ import type { OriginalScope } from "../actions/pause/mapScopes";
 import type { Action } from "../actions/types";
 import type { Why, Scope, SourceId, FrameId, Location } from "../types";
 
+export type Command =
+  | null
+  | "stepOver"
+  | "stepIn"
+  | "stepOut"
+  | "resume"
+  | "rewind"
+  | "reverseStepOver"
+  | "reverseStepIn"
+  | "reverseStepOut"
+  | "expression";
+
 export type PauseState = {
   why: ?Why,
   isWaitingOnBreak: boolean,
@@ -48,7 +60,7 @@ export type PauseState = {
   shouldIgnoreCaughtExceptions: boolean,
   canRewind: boolean,
   debuggeeUrl: string,
-  command: string,
+  command: Command,
   previousLocation: ?{
     location: Location,
     generatedLocation: Location
@@ -70,7 +82,7 @@ export const createPauseState = (): PauseState => ({
   shouldIgnoreCaughtExceptions: prefs.ignoreCaughtExceptions,
   canRewind: false,
   debuggeeUrl: "",
-  command: "",
+  command: null,
   previousLocation: null
 });
 
@@ -217,7 +229,7 @@ function update(
             command: action.command,
             previousLocation: buildPreviousLocation(state, action)
           }
-        : { ...state, command: "" };
+        : { ...state, command: null };
     }
 
     case "RESUME":
@@ -228,7 +240,7 @@ function update(
     case "EVALUATE_EXPRESSION":
       return {
         ...state,
-        command: action.status === "start" ? "expression" : ""
+        command: action.status === "start" ? "expression" : null
       };
 
     case "NAVIGATE":
@@ -278,8 +290,12 @@ export function getPauseReason(state: OuterState): ?Why {
   return state.pause.why;
 }
 
+export function getPauseCommand(state: OuterState): Command {
+  return state.pause && state.pause.command;
+}
+
 export function isStepping(state: OuterState) {
-  return ["stepIn", "stepOver", "stepOut"].includes(state.pause.command);
+  return ["stepIn", "stepOver", "stepOut"].includes(getPauseCommand(state));
 }
 
 export function isPaused(state: OuterState) {

src/reducers/types.js

@@ -35,3 +35,4 @@ export type { SourcesMap } from "./sources";
 export type { ActiveSearchType, OrientationType } from "./ui";
 export type { BreakpointsMap } from "./breakpoints";
 export type { WorkersList } from "./debuggee";
+export type { Command } from "./pause";