Integrate 1920 Source Format, Add Prepend Editor, Add Autograding Tab

src/actions/actionTypes.ts

@@ -19,6 +19,7 @@ export const BEGIN_INTERRUPT_EXECUTION = 'BEGIN_INTERRUPT_EXECUTION';
 export const END_INTERRUPT_EXECUTION = 'END_INTERRUPT_EXECUTION';
 export const EVAL_INTERPRETER_ERROR = 'EVAL_INTERPRETER_ERROR';
 export const EVAL_INTERPRETER_SUCCESS = 'EVAL_INTERPRETER_SUCCESS';
+export const EVAL_TESTCASE_SUCCESS = 'EVAL_TESTCASE_SUCCESS';
 export const HANDLE_CONSOLE_LOG = 'HANDLE_CONSOLE_LOG';
 export const BEGIN_DEBUG_PAUSE = 'BEGIN_DEBUG_PAUSE';
 export const END_DEBUG_PAUSE = 'END_DEBUG_PAUSE';
@@ -31,6 +32,7 @@ export const BEGIN_CLEAR_CONTEXT = 'BEGIN_CLEAR_CONTEXT';
 export const BROWSE_REPL_HISTORY_DOWN = 'BROWSE_REPL_HISTORY_DOWN';
 export const BROWSE_REPL_HISTORY_UP = 'BROWSE_REPL_HISTORY_UP';
 export const CHANGE_ACTIVE_TAB = 'CHANGE_ACTIVE_TAB';
+export const CHANGE_EDITOR_HEIGHT = 'CHANGE_EDITOR_HEIGHT';
 export const CHANGE_EDITOR_WIDTH = 'CHANGE_EDITOR_WIDTH';
 export const CHANGE_PLAYGROUND_EXTERNAL = 'CHANGE_PLAYGROUND_EXTERNAL';
 export const CHANGE_SIDE_CONTENT_HEIGHT = 'CHANGE_SIDE_CONTENT_HEIGHT';
@@ -41,6 +43,7 @@ export const END_CLEAR_CONTEXT = 'END_CLEAR_CONTEXT';
 export const ENSURE_LIBRARIES_LOADED = 'ENSURE_LIBRARIES_LOADED';
 export const EVAL_EDITOR = 'EVAL_EDITOR';
 export const EVAL_REPL = 'EVAL_REPL';
+export const EVAL_TESTCASE = 'EVAL_TESTCASE';
 export const INVALID_EDITOR_SESSION_ID = 'INVALID_EDITOR_SESSION_ID';
 export const PLAYGROUND_EXTERNAL_SELECT = 'PLAYGROUND_EXTERNAL_SELECT ';
 export const RESET_WORKSPACE = 'RESET_WORKSPACE';

src/actions/interpreter.ts

@@ -13,6 +13,15 @@ export const evalInterpreterSuccess = (value: Value, workspaceLocation: Workspac
   payload: { type: 'result', value, workspaceLocation }
 });
 
+export const evalTestcaseSuccess = (
+  value: Value,
+  workspaceLocation: WorkspaceLocation,
+  index: number
+) => ({
+  type: actionTypes.EVAL_TESTCASE_SUCCESS,
+  payload: { type: 'result', value, workspaceLocation, index }
+});
+
 export const evalInterpreterError = (
   errors: SourceError[],
   workspaceLocation: WorkspaceLocation

src/actions/workspaces.ts

@@ -51,6 +51,14 @@ export const changePlaygroundExternal: ActionCreator<actionTypes.IAction> = (
   payload: { newExternal }
 });
 
+export const changeEditorHeight: ActionCreator<actionTypes.IAction> = (
+  height: number,
+  workspaceLocation: WorkspaceLocation
+) => ({
+  type: actionTypes.CHANGE_EDITOR_HEIGHT,
+  payload: { height, workspaceLocation }
+});
+
 export const changeEditorWidth: ActionCreator<actionTypes.IAction> = (
   widthChange: string,
   workspaceLocation: WorkspaceLocation
@@ -161,6 +169,11 @@ export const evalRepl = (workspaceLocation: WorkspaceLocation) => ({
   payload: { workspaceLocation }
 });
 
+export const evalTestcase = (workspaceLocation: WorkspaceLocation, testcaseId: number) => ({
+  type: actionTypes.EVAL_TESTCASE,
+  payload: { workspaceLocation, testcaseId }
+});
+
 export const invalidEditorSessionId = () => ({
   type: actionTypes.INVALID_EDITOR_SESSION_ID
 });

src/components/Playground.tsx

@@ -37,6 +37,7 @@ export interface IStateProps {
   activeTab: number;
   editorSessionId: string;
   editorValue: string;
+  editorHeight?: number;
   editorWidth: string;
   breakpoints: string[];
   highlightedLines: number[][];
@@ -59,6 +60,7 @@ export interface IDispatchProps {
   handleChangeActiveTab: (activeTab: number) => void;
   handleChapterSelect: (chapter: number) => void;
   handleEditorEval: () => void;
+  handleEditorHeightChange: (height: number) => void;
   handleEditorValueChange: (val: string) => void;
   handleEditorWidthChange: (widthChange: number) => void;
   handleEditorUpdateBreakpoints: (breakpoints: string[]) => void;
@@ -130,6 +132,8 @@ class Playground extends React.Component<IPlaygroundProps, PlaygroundState> {
         websocketStatus: this.props.websocketStatus
       },
       editorProps: {
+        editorPrepend: '',
+        editorPrependLines: 0,
         editorValue: this.props.editorValue,
         editorSessionId: this.props.editorSessionId,
         handleEditorEval: this.props.handleEditorEval,
@@ -140,7 +144,9 @@ class Playground extends React.Component<IPlaygroundProps, PlaygroundState> {
         handleEditorUpdateBreakpoints: this.props.handleEditorUpdateBreakpoints,
         handleSetWebsocketStatus: this.props.handleSetWebsocketStatus
       },
+      editorHeight: this.props.editorHeight,
       editorWidth: this.props.editorWidth,
+      handleEditorHeightChange: this.props.handleEditorHeightChange,
       handleEditorWidthChange: this.props.handleEditorWidthChange,
       handleSideContentHeightChange: this.props.handleSideContentHeightChange,
       replProps: {

src/components/__tests__/Playground.tsx

@@ -27,6 +27,7 @@ const baseProps = {
   handleChangeActiveTab: (n: number) => {},
   handleChapterSelect: (chapter: number) => {},
   handleEditorEval: () => {},
+  handleEditorHeightChange: (height: number) => {},
   handleEditorValueChange: () => {},
   handleEditorWidthChange: (widthChange: number) => {},
   handleEditorUpdateBreakpoints: (breakpoints: string[]) => {},

src/components/__tests__/__snapshots__/Playground.tsx.snap

@@ -2,12 +2,12 @@
 
 exports[`Playground renders correctly 1`] = `
 "<HotKeys className=\\"Playground pt-dark\\" keyMap={{...}} handlers={{...}}>
-  <Workspace controlBarProps={{...}} editorProps={{...}} editorWidth=\\"50%\\" handleEditorWidthChange={[Function: handleEditorWidthChange]} handleSideContentHeightChange={[Function: handleSideContentHeightChange]} replProps={{...}} sideContentHeight={40} sideContentProps={{...}} />
+  <Workspace controlBarProps={{...}} editorProps={{...}} editorHeight={[undefined]} editorWidth=\\"50%\\" handleEditorHeightChange={[Function: handleEditorHeightChange]} handleEditorWidthChange={[Function: handleEditorWidthChange]} handleSideContentHeightChange={[Function: handleSideContentHeightChange]} replProps={{...}} sideContentHeight={40} sideContentProps={{...}} />
 </HotKeys>"
 `;
 
 exports[`Playground with link renders correctly 1`] = `
 "<HotKeys className=\\"Playground pt-dark\\" keyMap={{...}} handlers={{...}}>
-  <Workspace controlBarProps={{...}} editorProps={{...}} editorWidth=\\"50%\\" handleEditorWidthChange={[Function: handleEditorWidthChange]} handleSideContentHeightChange={[Function: handleSideContentHeightChange]} replProps={{...}} sideContentHeight={40} sideContentProps={{...}} />
+  <Workspace controlBarProps={{...}} editorProps={{...}} editorHeight={[undefined]} editorWidth=\\"50%\\" handleEditorHeightChange={[Function: handleEditorHeightChange]} handleEditorWidthChange={[Function: handleEditorWidthChange]} handleSideContentHeightChange={[Function: handleSideContentHeightChange]} replProps={{...}} sideContentHeight={40} sideContentProps={{...}} />
 </HotKeys>"
 `;