dashinja
diff --git a/‎src/actions/setupActions.ts
Lines changed: 14 additions & 4 deletions b/‎src/actions/setupActions.ts
Lines changed: 14 additions & 4 deletions
diff --git a/‎src/editor/commands.ts
Lines changed: 2 additions & 1 deletion b/‎src/editor/commands.ts
Lines changed: 2 additions & 1 deletion
diff --git a/‎web-app/src/services/apollo/queries/tutorial.ts
Lines changed: 1 addition & 0 deletions b/‎web-app/src/services/apollo/queries/tutorial.ts
Lines changed: 1 addition & 0 deletions
@@ -40,6 +40,11 @@ const runCommands = async (commands: string[], language: string = 'JAVASCRIPT')
 // collect active file watchers (listeners)
 const watchers: {[key: string]: vscode.FileSystemWatcher} = {}
 
+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) {
@@ -55,13 +60,18 @@ const setupActions = async (workspaceRoot: vscode.WorkspaceFolder, {commands, co
 				watchers[listener] = vscode.workspace.createFileSystemWatcher(listener)
 				watchers[listener].onDidChange(() => {
 					// trigger save
-					vscode.commands.executeCommand('coderoad.run_test')
-					// cleanup watcher
-					watchers[listener].dispose()
-					delete watchers[listener]
+					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
 
@@ -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: () => {
 
@@ -42,6 +42,7 @@ export default gql`
 							commits
 							commands
 							files
+							listeners
 						}
 						solution {
 							commits
Original file line number	Diff line number	Diff line change
@@ -42,6 +42,7 @@ export default gql`
`42`	`42`	`commits`
`43`	`43`	`commands`
`44`	`44`	`files`
	`45`	`+ listeners`
`45`	`46`	`}`
`46`	`47`	`solution {`
`47`	`48`	`commits`