Commit6eddbb7

committed

fix currentStepId on continue load

1 parentbdf0c32 commit6eddbb7Copy full SHA for 6eddbb7

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -113,10 +113,12 @@ class Channel implements Channel {`
`113`	`113`	`},`
`114`	`114`	`onError,`
`115`	`115`	`)`
	`116`	`+// update the current stepId on startup`
	`117`	`+vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP,action.payload)`
`116`	`118`	`return`
`117`	`119`	`// load step actions (git commits, commands, open files)`
`118`	`120`	`case'SETUP_ACTIONS':`
`119`		`-vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP,action.payload)`
	`121`	`+awaitvscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP,action.payload)`
`120`	`122`	`setupActions(this.workspaceRoot,action.payload,this.send)`
`121`	`123`	`return`
`122`	`124`	`// load solution step actions (git commits, commands, open files)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ export const createCommands = ({ extensionPath, workspaceState, workspaceRoot }:`
`81`	`81`	`},`
`82`	`82`	`[COMMANDS.RUN_TEST]:(current:Payload\|undefined,onSuccess:()=>void)=>{`
`83`	`83`	`// use stepId from client, or last set stepId`
`84`		`-constpayload:Payload={stepId:current ?current.stepId :currentStepId}`
	`84`	`+constpayload:Payload={stepId:current&&current.stepId.length?current.stepId :currentStepId}`
`85`	`85`	`testRunner(payload,onSuccess)`
`86`	`86`	`},`
`87`	`87`	`}`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,13 @@ export default {`
`55`	`55`	returnPromise.reject(`Failed to load tutorial config${error.message}`)
`56`	`56`	`})`
`57`	`57`	`},`
`58`		`-continueConfig(){`
	`58`	`+continueConfig(context:CR.MachineContext){`
`59`	`59`	`channel.editorSend({`
`60`	`60`	`type:'EDITOR_TUTORIAL_CONTINUE_CONFIG',`
	`61`	`+payload:{`
	`62`	`+// pass position because current stepId or first stepId will be empty`
	`63`	`+stepId:context.position.stepId,`
	`64`	`+},`
`61`	`65`	`})`
`62`	`66`	`},`
`63`	`67`	`loadLevel(context:CR.MachineContext):void{`

Comments

(0)