Commitb0ceeab

committed

fix setup and config

1 parentf4d0e56 commitb0ceeabCopy full SHA for b0ceeab

File tree

+26

-14

lines changed

+26

-14

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,10 @@ const runCommands = async (commands: string[], language: string = 'JAVASCRIPT')`
`40`	`40`
`41`	`41`	`constsetupActions=async(workspaceRoot:vscode.WorkspaceFolder,{commands, commits, files}:G.StepActions):Promise<void>=>{`
`42`	`42`	`// run commits`
`43`		`-for(constcommitofcommits){`
`44`		`-awaitgit.loadCommit(commit)`
	`43`	`+if(commits){`
	`44`	`+for(constcommitofcommits){`
	`45`	`+awaitgit.loadCommit(commit)`
	`46`	`+}`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`// run command`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,24 +3,22 @@ import * as vscode from 'vscode'`
`3`	`3`	`import*asgitfrom'../services/git'`
`4`	`4`
`5`	`5`	`interfaceTutorialConfigParams{`
`6`		`-tutorial:G.Tutorial,`
	`6`	`+config:G.TutorialConfig,`
`7`	`7`	`alreadyConfigured?:boolean`
`8`	`8`	`onComplete?():void`
`9`	`9`	`}`
`10`	`10`
`11`		`-consttutorialConfig=async({tutorial, alreadyConfigured, onComplete}:TutorialConfigParams)=>{`
`12`		`-console.log('---------- tutorialConfig -----------')`
	`11`	`+consttutorialConfig=async({config, alreadyConfigured,}:TutorialConfigParams)=>{`
`13`	`12`	`if(!alreadyConfigured){`
`14`	`13`	`// setup git, add remote`
`15`	`14`	`awaitgit.initIfNotExists()`
`16`	`15`
`17`	`16`	`// TODO: if remote not already set`
`18`		`-awaitgit.setupRemote(tutorial.version.data.config.repo.uri)`
`19`		`-if(onComplete){onComplete()}`
	`17`	`+awaitgit.setupRemote(config.repo.uri)`
`20`	`18`	`}`
`21`	`19`
`22`	`20`	`// allow multiple coding languages in a tutorial`
`23`		`-constlanguages:string[]=tutorial.version.data.config.codingLanguages.map(lang=>lang.toLowerCase())`
	`21`	`+constlanguages:string[]=config.codingLanguages.map((lang:G.CodingLanguage)=>lang.toLowerCase())`
`24`	`22`
`25`	`23`	`// setup onSave hook`
`26`	`24`	`vscode.workspace.onDidSaveTextDocument((document:vscode.TextDocument)=>{`

Lines changed: 18 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,20 +83,32 @@ class Channel implements Channel {`
`83`	`83`	`// configure test runner, language, git`
`84`	`84`	`case'EDITOR_TUTORIAL_CONFIG':`
`85`	`85`	`consttutorialData:G.Tutorial=action.payload.tutorial`
	`86`	`+// setup tutorial config (save listener, test runner, etc)`
`86`	`87`	`this.context.setTutorial(this.workspaceState,tutorialData)`
`87`		`-tutorialConfig({`
`88`		`-tutorial:tutorialData,`
`89`		`-// must await async git setup or commit loading fails`
`90`		`-onComplete:()=>this.send({type:'TUTORIAL_CONFIGURED'})`
`91`		`-})`
	`88`	`+`
	`89`	`+constdata:G.TutorialData=tutorialData.version.data`
	`90`	`+`
	`91`	`+awaittutorialConfig({config:data.config})`
	`92`	`+`
	`93`	`+// run init setup actions`
	`94`	`+if(data.init){`
	`95`	`+constsetup:G.StepActions\|null\|undefined=data.init.setup`
	`96`	`+if(setup){`
	`97`	`+setupActions(this.workspaceRoot,setup)`
	`98`	`+}`
	`99`	`+}`
	`100`	`+`
	`101`	`+// report back to the webview that setup is complete`
	`102`	`+this.send({type:'TUTORIAL_CONFIGURED'})`
`92`	`103`	`return`
`93`	`104`	`case'EDITOR_TUTORIAL_CONTINUE_CONFIG':`
`94`	`105`	`consttutorialContinue:G.Tutorial\|null=this.context.tutorial.get()`
`95`	`106`	`if(!tutorialContinue){`
`96`	`107`	`thrownewError('Invalid tutorial to continue')`
`97`	`108`	`}`
	`109`	`+constcontinueConfig:G.TutorialConfig=tutorialContinue.version.data.config`
`98`	`110`	`tutorialConfig({`
`99`		`-tutorial:tutorialContinue,`
	`111`	`+config:continueConfig,`
`100`	`112`	`alreadyConfigured:true`
`101`	`113`	`})`
`102`	`114`	`return`

Comments

(0)