Remove global variable from workspace saga (#2865)

* Remove global variable from workspace saga

* Update tests

Author: JoelChanZhiYang

src/commons/application/ApplicationTypes.ts

@@ -384,7 +384,9 @@ export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): Wo
   sideContent: {
     alerts: [],
     dynamicTabs: []
-  }
+  },
+  lastDebuggerResult: undefined,
+  lastNonDetResult: null
 });
 
 const defaultFileName = 'program.js';

src/commons/sagas/WorkspaceSaga.ts

@@ -365,7 +365,7 @@ export default function* WorkspaceSaga(): SagaIterator {
     // TODO: Hardcoded to make use of the first editor tab. Rewrite after editor tabs are added.
     yield put(actions.setEditorHighlightedLines(workspaceLocation, 0, []));
     context.runtime.break = false;
-    lastDebuggerResult = undefined;
+    yield put(actions.updateLastDebuggerResult(undefined));
   });
 
   yield takeEvery(
@@ -595,10 +595,11 @@ export default function* WorkspaceSaga(): SagaIterator {
   );
 }
 
-let lastDebuggerResult: any;
-let lastNonDetResult: Result;
 function* updateInspector(workspaceLocation: WorkspaceLocation): SagaIterator {
   try {
+    const lastDebuggerResult = yield select(
+      (state: OverallState) => state.workspaces[workspaceLocation].lastDebuggerResult
+    );
     const row = lastDebuggerResult.context.runtime.nodes[0].loc.start.line - 1;
     // TODO: Hardcoded to make use of the first editor tab. Rewrite after editor tabs are added.
     yield put(actions.setEditorHighlightedLines(workspaceLocation, 0, []));
@@ -1099,6 +1100,9 @@ export function* evalCode(
   );
 
   const entrypointCode = files[entrypointFilePath];
+  const lastNonDetResult = yield select(
+    (state: OverallState) => state.workspaces[workspaceLocation].lastNonDetResult
+  );
 
   function call_variant(variant: Variant) {
     if (variant === Variant.NON_DET) {
@@ -1155,6 +1159,10 @@ export function* evalCode(
   const isLazy: boolean = context.variant === Variant.LAZY;
   const isWasm: boolean = context.variant === Variant.WASM;
 
+  const lastDebuggerResult = yield select(
+    (state: OverallState) => state.workspaces[workspaceLocation].lastDebuggerResult
+  );
+
   // Handles `console.log` statements in fullJS
   const detachConsole: () => void =
     context.chapter === Chapter.FULL_JS
@@ -1208,14 +1216,14 @@ export function* evalCode(
 
   if (paused) {
     yield put(actions.endDebuggerPause(workspaceLocation));
-    lastDebuggerResult = manualToggleDebugger(context);
+    yield put(actions.updateLastDebuggerResult(manualToggleDebugger(context)));
     yield call(updateInspector, workspaceLocation);
     yield call(showWarningMessage, 'Execution paused', 750);
     return;
   }
 
   if (actionType === EVAL_EDITOR) {
-    lastDebuggerResult = result;
+    yield put(actions.updateLastDebuggerResult(result));
   }
 
   // do not highlight for stories
@@ -1257,7 +1265,7 @@ export function* evalCode(
     if (result.value === 'cut') {
       result.value = undefined;
     }
-    lastNonDetResult = result;
+    yield put(actions.updateLastNonDetResult(result));
   }
 
   yield* dumpDisplayBuffer(workspaceLocation, isStoriesBlock, storyEnv);

src/commons/sagas/__tests__/WorkspaceSaga.ts

@@ -844,7 +844,7 @@ describe('evalCode', () => {
       envSteps: -1
     };
     lastDebuggerResult = { status: 'error' };
-    state = generateDefaultState(workspaceLocation);
+    state = generateDefaultState(workspaceLocation, { lastDebuggerResult: { status: 'error' } });
   });
 
   describe('on EVAL_EDITOR action without interruptions or pausing', () => {

src/commons/workspace/WorkspaceActions.ts

@@ -1,5 +1,5 @@
 import { createAction } from '@reduxjs/toolkit';
-import { Context } from 'js-slang';
+import { Context, Result } from 'js-slang';
 import { Chapter, Variant } from 'js-slang/dist/types';
 
 import { SET_IS_EDITOR_READONLY } from '../../features/sourceRecorder/sourcecast/SourcecastTypes';
@@ -64,6 +64,8 @@ import {
   UPDATE_EDITOR_BREAKPOINTS,
   UPDATE_EDITOR_VALUE,
   UPDATE_HAS_UNSAVED_CHANGES,
+  UPDATE_LAST_DEBUGGER_RESULT,
+  UPDATE_LAST_NON_DET_RESULT,
   UPDATE_REPL_VALUE,
   UPDATE_STEPSTOTAL,
   UPDATE_SUBLANGUAGE,
@@ -492,3 +494,17 @@ export const updateBreakpointSteps = createAction(
     payload: { breakpointSteps, workspaceLocation }
   })
 );
+
+export const updateLastDebuggerResult = createAction(
+  UPDATE_LAST_DEBUGGER_RESULT,
+  (lastDebuggerResult: any) => ({
+    payload: { lastDebuggerResult }
+  })
+);
+
+export const updateLastNonDetResult = createAction(
+  UPDATE_LAST_NON_DET_RESULT,
+  (lastNonDetResult: Result) => ({
+    payload: { lastNonDetResult }
+  })
+);

src/commons/workspace/WorkspaceReducer.ts

@@ -83,6 +83,8 @@ import {
   UPDATE_EDITOR_BREAKPOINTS,
   UPDATE_EDITOR_VALUE,
   UPDATE_HAS_UNSAVED_CHANGES,
+  UPDATE_LAST_DEBUGGER_RESULT,
+  UPDATE_LAST_NON_DET_RESULT,
   UPDATE_REPL_VALUE,
   UPDATE_STEPSTOTAL,
   UPDATE_SUBLANGUAGE,
@@ -1075,6 +1077,23 @@ const oldWorkspaceReducer: Reducer<WorkspaceManagerState, SourceActionType> = (
           breakpointSteps: action.payload.breakpointSteps
         }
       };
+    case UPDATE_LAST_DEBUGGER_RESULT:
+      return {
+        ...state,
+        [workspaceLocation]: {
+          ...state[workspaceLocation],
+          lastDebuggerResult: action.payload.lastDebuggerResult
+        }
+      };
+
+    case UPDATE_LAST_NON_DET_RESULT:
+      return {
+        ...state,
+        [workspaceLocation]: {
+          ...state[workspaceLocation],
+          lastNonDetResult: action.payload.lastNonDetResult
+        }
+      };
     case NOTIFY_PROGRAM_EVALUATED: {
       const debuggerContext = {
         ...state[workspaceLocation].debuggerContext,

src/commons/workspace/WorkspaceTypes.ts

@@ -1,4 +1,4 @@
-import { Context } from 'js-slang';
+import { Context, Result } from 'js-slang';
 
 import { SourcecastWorkspaceState } from '../../features/sourceRecorder/sourcecast/SourcecastTypes';
 import { SourcereelWorkspaceState } from '../../features/sourceRecorder/sourcereel/SourcereelTypes';
@@ -63,6 +63,8 @@ export const UPDATE_CURRENTSTEP = 'UPDATE_CURRENTSTEP';
 export const UPDATE_STEPSTOTAL = 'UPDATE_STEPSTOTAL';
 export const UPDATE_BREAKPOINTSTEPS = 'UPDATE_BREAKPOINTSTEPS';
 export const CHANGE_SUBLANGUAGE = 'CHANGE_SUBLANGUAGE';
+export const UPDATE_LAST_DEBUGGER_RESULT = 'UPDATE_LAST_DEBUGGER_RESULT';
+export const UPDATE_LAST_NON_DET_RESULT = 'UPDATE_LAST_NON_DET_RESULT';
 
 export type WorkspaceLocation = keyof WorkspaceManagerState;
 export type WorkspaceLocationsWithTools = Extract<WorkspaceLocation, 'playground' | 'sicp'>;
@@ -146,6 +148,8 @@ export type WorkspaceState = {
   readonly globals: Array<[string, any]>;
   readonly debuggerContext: DebuggerContext;
   readonly sideContent: SideContentState;
+  readonly lastDebuggerResult: any;
+  readonly lastNonDetResult: Result | null;
 };
 
 type ReplHistory = {