Nov 10, 2019 · Nov 5, 2019 · Nov 5, 2019 · Nov 10, 2019 · Nov 10, 2019 · Nov 10, 2019
diff --git a/src/actions/setupActions.ts b/src/actions/setupActions.ts
 }
 }

 // collect active file watchers (listeners)
 const watchers: {[key: string]: vscode.FileSystemWatcher} = {}

 const setupActions = async (workspaceRoot: vscode.WorkspaceFolder, {commands, commits, files}: G.StepActions): Promise<void> => {
 const disposeWatcher = (listener: string) => {
 watchers[listener].dispose()
 delete watchers[listener]
 }

 const setupActions = async (workspaceRoot: vscode.WorkspaceFolder, {commands, commits, files, listeners}: G.StepActions): Promise<void> => {
 // run commits
 if (commits) {
 for (const commit of commits) {
 await git.loadCommit(commit)
 }
 }

 // run file watchers (listeners)
 if (listeners) {
 for (const listener of listeners) {
 if (!watchers[listener]) {
 const pattern = new vscode.RelativePattern(
 vscode.workspace.getWorkspaceFolder(workspaceRoot.uri)!,
 listener
 )
 watchers[listener] = vscode.workspace.createFileSystemWatcher(
 pattern
 )
 watchers[listener].onDidChange(() => {
 // trigger save
 vscode.commands.executeCommand('coderoad.run_test', null, () => {
 // cleanup watcher on success
 disposeWatcher(listener)
 })
 })
 }
 }
 } else {
 // remove all watchers
 for (const listener of Object.keys(watchers)) {
 disposeWatcher(listener)
 }
 }

 // run command
 if (commands) {
 await runCommands(commands)
diff --git a/src/editor/commands.ts b/src/editor/commands.ts
 // set from last setup stepAction
 currentStepId = stepId
 },
 [COMMANDS.RUN_TEST]: (current: {stepId: string} | undefined) => {
 [COMMANDS.RUN_TEST]: (current: {stepId: string} | undefined, onSuccess: () => void) => {
 console.log('-------- command.run_test ------ ')
 // use stepId from client, or last set stepId
 const payload = {stepId: current ? current.stepId : currentStepId}
 runTest({
 onSuccess: () => {
 // send test pass message back to client
 webview.send({type: 'TEST_PASS', payload})
 onSuccess()
 vscode.window.showInformationMessage('PASS')
 },
 onFail: () => {
diff --git a/typings/graphql.d.ts b/typings/graphql.d.ts
 commits: Array<Scalars['Sha1']>
 files?: Maybe<Array<Scalars['String']>>
 commands?: Maybe<Array<Scalars['String']>>
 listeners?: Maybe<Array<Scalars['String']>>
 }

 export type TestRunner = 'JEST'
 commits?: Resolver<Array<ResolversTypes['Sha1']>, ParentType, ContextType>
 files?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>
 commands?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>
 listeners?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>
 }

 export type TutorialResolvers<
 }[]
 }
 }
 const result: IntrospectionResultData = {
 __schema: {
 types: [],
 },
 }
 export default result
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,15 +37,49 @@ const runCommands = async (commands: string[], language: string = 'JAVASCRIPT')
		}
		}

		// collect active file watchers (listeners)
		const watchers: {[key: string]: vscode.FileSystemWatcher} = {}

		const setupActions = async (workspaceRoot: vscode.WorkspaceFolder, {commands, commits, files}: G.StepActions): Promise<void> => {
		const disposeWatcher = (listener: string) => {
		watchers[listener].dispose()
		delete watchers[listener]
		}

		const setupActions = async (workspaceRoot: vscode.WorkspaceFolder, {commands, commits, files, listeners}: G.StepActions): Promise<void> => {
		// run commits
		if (commits) {
		for (const commit of commits) {
		await git.loadCommit(commit)
		}
		}

		// run file watchers (listeners)
		if (listeners) {
		for (const listener of listeners) {
		if (!watchers[listener]) {
		const pattern = new vscode.RelativePattern(
		vscode.workspace.getWorkspaceFolder(workspaceRoot.uri)!,
		listener
		)
		watchers[listener] = vscode.workspace.createFileSystemWatcher(
		pattern
		)
		watchers[listener].onDidChange(() => {
		// trigger save
		vscode.commands.executeCommand('coderoad.run_test', null, () => {
		// cleanup watcher on success
		disposeWatcher(listener)
		})
		})
		}
		}
		} else {
		// remove all watchers
		for (const listener of Object.keys(watchers)) {
		disposeWatcher(listener)
		}
		}

		// run command
		if (commands) {
		await runCommands(commands)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,14 +54,15 @@ export const createCommands = ({extensionPath, workspaceState, workspaceRoot}: C
		// set from last setup stepAction
		currentStepId = stepId
		},
		[COMMANDS.RUN_TEST]: (current: {stepId: string} \| undefined) => {
		[COMMANDS.RUN_TEST]: (current: {stepId: string} \| undefined, onSuccess: () => void) => {
		console.log('-------- command.run_test ------ ')
		// use stepId from client, or last set stepId
		const payload = {stepId: current ? current.stepId : currentStepId}
		runTest({
		onSuccess: () => {
		// send test pass message back to client
		webview.send({type: 'TEST_PASS', payload})
		onSuccess()
		vscode.window.showInformationMessage('PASS')
		},
		onFail: () => {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -133,6 +133,7 @@ export type StepActions = {
		commits: Array<Scalars['Sha1']>
		files?: Maybe<Array<Scalars['String']>>
		commands?: Maybe<Array<Scalars['String']>>
		listeners?: Maybe<Array<Scalars['String']>>
		}

		export type TestRunner = 'JEST'
Expand DownExpand Up		@@ -494,6 +495,7 @@ export type StepActionsResolvers<
		commits?: Resolver<Array<ResolversTypes['Sha1']>, ParentType, ContextType>
		files?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>
		commands?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>
		listeners?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>
		}

		export type TutorialResolvers<
Expand DownExpand Up		@@ -632,9 +634,3 @@ export interface IntrospectionResultData {
		}[]
		}
		}
		const result: IntrospectionResultData = {
		__schema: {
		types: [],
		},
		}
		export default result