migrate git into tutorial model

src/editor/ReactWebView.ts

@@ -12,9 +12,7 @@ const getNonce = (): string => {
 }
 
 
-/**
- * Manages React webview panels
- */
+// Manages webview panel
 class ReactWebView {
 	// @ts-ignore
 	public loaded: boolean
@@ -28,7 +26,7 @@ class ReactWebView {
 		// Create and show a new webview panel
 		this.panel = this.createWebviewPanel(vscode.ViewColumn.Two)
 
-		// Set the webview's initial html content
+		// Set the webview initial html content
 		this.panel.webview.html = this.getHtmlForWebview()
 
 		// Listen for when the panel is disposed
@@ -37,12 +35,21 @@ class ReactWebView {
 
 		// Handle messages from the webview
 		const onReceive = (action: string | CR.Action) => {
-			// await loading of webview in React before proceeding with loaded state
-			if (action === 'WEBVIEW_LOADED') {
-				this.loaded = true
-			} else {
-				console.log('onReceive', action)
-				vscode.commands.executeCommand('coderoad.receive_action', action)
+			const actionType: string = typeof action === 'string' ? action : action.type
+			switch (actionType) {
+				case 'WEBVIEW_LOADED':
+					// await loading of webview in React before proceeding with loaded state
+					this.loaded = true
+					break
+				case 'TUTORIAL_START':
+					console.log('TUTORIAL_START called')
+					console.log(action)
+					break
+				// add other cases
+				default:
+					// send to state machine
+					console.log('onReceive', action)
+					vscode.commands.executeCommand('coderoad.receive_machine_action', action)
 			}
 		}
 		this.panel.webview.onDidReceiveMessage(onReceive, null, this.disposables)
@@ -55,7 +62,7 @@ class ReactWebView {
 			})
 		}
 
-		// prevents new panels from going ontop of coderoad panel
+		// prevents new panels from going on top of coderoad panel
 		vscode.window.onDidChangeActiveTextEditor((textEditor?: vscode.TextEditor) => {
 			console.log('onDidChangeActiveTextEditor')
 			console.log(textEditor)
@@ -115,7 +122,7 @@ class ReactWebView {
 		const config = {
 			// Enable javascript in the webview
 			enableScripts: true,
-			// And restric the webview to only loading content from our extension's `media` directory.
+			// And restrict the webview to only loading content from our extension's `media` directory.
 			localResourceRoots: [vscode.Uri.file(path.join(this.extensionPath, 'build'))],
 			// prevents destroying the window when it is in the background
 			retainContextWhenHidden: true,

src/editor/commands/index.ts

@@ -13,7 +13,7 @@ const COMMANDS = {
 	OPEN_WEBVIEW: 'coderoad.open_webview',
 	SEND_STATE: 'coderoad.send_state',
 	SEND_DATA: 'coderoad.send_data',
-	RECEIVE_ACTION: 'coderoad.receive_action',
+	RECEIVE_MACHINE_ACTION: 'coderoad.receive_machine_action',
 	OPEN_FILE: 'coderoad.open_file',
 	RUN_TEST: 'coderoad.run_test',
 	TEST_PASS: 'coderoad.test_pass',
@@ -102,7 +102,7 @@ export const createCommands = ({vscodeExt, machine}: CreateCommandProps) => {
 				const absoluteFilePath = join(workspaceRoot, relativeFilePath)
 				const doc = await vscode.workspace.openTextDocument(absoluteFilePath)
 				await vscode.window.showTextDocument(doc, vscode.ViewColumn.One)
-				// there are times when intialization leave the panel behind any files opened
+				// there are times when initialization leave the panel behind any files opened
 				// ensure the panel is redrawn on the right side first
 				webview.createOrShow(vscode.ViewColumn.Two)
 			} catch (error) {
@@ -116,7 +116,7 @@ export const createCommands = ({vscodeExt, machine}: CreateCommandProps) => {
 		[COMMANDS.SEND_DATA]: (payload: {data: any}) => {
 			webview.postMessage({type: 'SET_DATA', payload})
 		},
-		[COMMANDS.RECEIVE_ACTION]: (action: string | CR.Action) => {
+		[COMMANDS.RECEIVE_MACHINE_ACTION]: (action: string | CR.Action) => {
 			// send received actions from web-app into state machine
 			console.log('receive action', action)
 			machine.send(action)

src/editor/commands/runTest.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode'
-import { exec } from '../../services/node'
+import {exec} from '../../services/node'
 import * as storage from '../../services/storage'
 
 // ensure only latest run_test action is taken
@@ -8,135 +8,135 @@ let currentId = 0
 // quick solution to prevent processing multiple results
 // NOTE: may be possible to kill child process early
 const shouldExitEarly = (processId: number): boolean => {
-  return currentId !== processId
+	return currentId !== processId
 }
 
-let _channel: vscode.OutputChannel
+let channel: vscode.OutputChannel
 
 const getOutputChannel = (name: string): vscode.OutputChannel => {
-  if (!_channel) {
-    _channel = vscode.window.createOutputChannel(name)
-  }
-  return _channel
+	if (!channel) {
+		channel = vscode.window.createOutputChannel(name)
+	}
+	return channel
 }
 
 interface Props {
-  onSuccess(): void
-  onFail(): void
+	onSuccess(): void
+	onFail(): void
 }
 
-export default async function runTest({ onSuccess, onFail }: Props): Promise<void> {
-  // increment process id
-  let processId = ++currentId
-
-  const outputChannelName = 'Test Output'
-
-  // TODO: validate test directory from package.json exists
-  // let testFile = path.join('test');
-  // if (!await exists(testFile)) {
-  // 	return emptyTasks;
-  // }
-
-  // TODO: verify test runner for args
-  const testArgs = ['--json']
-
-  // if .git repo, use --onlyChanged
-  // const hasGit = path.join('.git');
-  // if (await exists(hasGit)) {
-  // 	testArgs.push('--onlyChanged')
-  // }
-
-  let commandLine = `npm test -- ${testArgs.join(' ')}`
-
-  try {
-    // capture position early on test start
-    // in case position changes
-    const [position, { stdout }] = await Promise.all([storage.getPosition(), exec(commandLine)])
-    if (shouldExitEarly(processId)) {
-      // exit early
-      return
-    }
-
-    if (stdout) {
-      let lines = stdout.split(/\r{0,1}\n/)
-      console.log('SUCCESS LINES', lines)
-      for (let line of lines) {
-        if (line.length === 0) {
-          continue
-        }
-
-        const regExp = /^{\"numFailedTestSuites/
-        const matches = regExp.exec(line)
-        if (matches && matches.length) {
-          console.log('MATCHES SUCCESS')
-          const result = JSON.parse(line)
-
-          if (result.success) {
-            console.log('SUCCESS')
-            if (shouldExitEarly(processId)) {
-              // exit early
-              return
-            }
-            console.log('call onSuccess')
-            onSuccess()
-          } else {
-            console.log('NOT SUCCESS?')
-          }
-        }
-      }
-    }
-  } catch (err) {
-    if (shouldExitEarly(processId)) {
-      // exit early
-      return
-    }
-    // error contains output & error message
-    // output can be parsed as json
-    const { stdout, stderr } = err
-    console.log('TEST FAILED', stdout)
-
-    if (!stdout) {
-      console.error('SOMETHING WENT WRONG WITH A PASSING TEST')
-    }
-    // test runner failed
-    const channel = getOutputChannel(outputChannelName)
-
-    if (stdout) {
-      let lines = stdout.split(/\r{0,1}\n/)
-
-      for (let line of lines) {
-        if (line.length === 0) {
-          continue
-        }
-
-        const dataRegExp = /^{\"numFailedTestSuites"/
-        const matches = dataRegExp.exec(line)
-
-        if (matches && matches.length) {
-          const result = JSON.parse(line)
-          const firstError = result.testResults.find((t: any) => t.status === 'failed')
-
-          if (firstError) {
-            if (shouldExitEarly(processId)) {
-              // exit early
-              return
-            }
-            console.log('ERROR', firstError.message)
-            console.log('call onFail')
-            onFail()
-          } else {
-            console.error('NOTE: PARSER DID NOT WORK FOR ', line)
-          }
-        }
-      }
-    }
-
-    if (stderr) {
-      channel.show(false)
-      channel.appendLine(stderr)
-    }
-    // if (err.stdout) {
-    // 	channel.appendLine(err.stdout);
-    // }
-  }
+export default async function runTest({onSuccess, onFail}: Props): Promise<void> {
+	// increment process id
+	const processId = ++currentId
+
+	const outputChannelName = 'Test Output'
+
+	// TODO: validate test directory from package.json exists
+	// let testFile = path.join('test');
+	// if (!await exists(testFile)) {
+	// 	return emptyTasks;
+	// }
+
+	// TODO: verify test runner for args
+	const testArgs = ['--json']
+
+	// if .git repo, use --onlyChanged
+	// const hasGit = path.join('.git');
+	// if (await exists(hasGit)) {
+	// 	testArgs.push('--onlyChanged')
+	// }
+
+	const commandLine = `npm test -- ${testArgs.join(' ')}`
+
+	try {
+		// capture position early on test start
+		// in case position changes
+		const [position, {stdout}] = await Promise.all([storage.getPosition(), exec(commandLine)])
+		if (shouldExitEarly(processId)) {
+			// exit early
+			return
+		}
+
+		if (stdout) {
+			const lines = stdout.split(/\r{0,1}\n/)
+			console.log('SUCCESS LINES', lines)
+			for (const line of lines) {
+				if (line.length === 0) {
+					continue
+				}
+
+				const regExp = /^{\"numFailedTestSuites/
+				const matches = regExp.exec(line)
+				if (matches && matches.length) {
+					console.log('MATCHES SUCCESS')
+					const result = JSON.parse(line)
+
+					if (result.success) {
+						console.log('SUCCESS')
+						if (shouldExitEarly(processId)) {
+							// exit early
+							return
+						}
+						console.log('call onSuccess')
+						onSuccess()
+					} else {
+						console.log('NOT SUCCESS?')
+					}
+				}
+			}
+		}
+	} catch (err) {
+		if (shouldExitEarly(processId)) {
+			// exit early
+			return
+		}
+		// error contains output & error message
+		// output can be parsed as json
+		const {stdout, stderr} = err
+		console.log('TEST FAILED', stdout)
+
+		if (!stdout) {
+			console.error('SOMETHING WENT WRONG WITH A PASSING TEST')
+		}
+		// test runner failed
+		const channel = getOutputChannel(outputChannelName)
+
+		if (stdout) {
+			const lines = stdout.split(/\r{0,1}\n/)
+
+			for (const line of lines) {
+				if (line.length === 0) {
+					continue
+				}
+
+				const dataRegExp = /^{\"numFailedTestSuites"/
+				const matches = dataRegExp.exec(line)
+
+				if (matches && matches.length) {
+					const result = JSON.parse(line)
+					const firstError = result.testResults.find((t: any) => t.status === 'failed')
+
+					if (firstError) {
+						if (shouldExitEarly(processId)) {
+							// exit early
+							return
+						}
+						console.log('ERROR', firstError.message)
+						console.log('call onFail')
+						onFail()
+					} else {
+						console.error('NOTE: PARSER DID NOT WORK FOR ', line)
+					}
+				}
+			}
+		}
+
+		if (stderr) {
+			channel.show(false)
+			channel.appendLine(stderr)
+		}
+		// if (err.stdout) {
+		// 	channel.appendLine(err.stdout);
+		// }
+	}
 }

src/services/git/index.ts

@@ -39,7 +39,7 @@ const cherryPickCommit = async (commit: string, count = 0): Promise<void> => {
     SINGLE git cherry-pick %COMMIT%
     if fails, will stash all and retry
 */
-export async function gitLoadCommits(actions: G.StepActions, editorDispatch: CR.EditorDispatch): Promise<void> {
+export async function gitLoadCommits(actions: G.StepActions, openFile: (file: string) => void): Promise<void> {
 	const {commits, commands, files} = actions
 
 	console.log(`load commits: ${commits.join(', ')}`)
@@ -72,7 +72,7 @@ export async function gitLoadCommits(actions: G.StepActions, editorDispatch: CR.
 
 	if (files) {
 		for (const filePath of files) {
-			editorDispatch('coderoad.open_file', filePath)
+			openFile(filePath)
 		}
 	}
 }