Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitb0ceeab

Browse files
committed
fix setup and config
1 parentf4d0e56 commitb0ceeab

File tree

3 files changed

+26
-14
lines changed

3 files changed

+26
-14
lines changed

‎src/actions/setupActions.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ const runCommands = async (commands: string[], language: string = 'JAVASCRIPT')
4040

4141
constsetupActions=async(workspaceRoot:vscode.WorkspaceFolder,{commands, commits, files}:G.StepActions):Promise<void>=>{
4242
// run commits
43-
for(constcommitofcommits){
44-
awaitgit.loadCommit(commit)
43+
if(commits){
44+
for(constcommitofcommits){
45+
awaitgit.loadCommit(commit)
46+
}
4547
}
4648

4749
// run command

‎src/actions/tutorialConfig.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,22 @@ import * as vscode from 'vscode'
33
import*asgitfrom'../services/git'
44

55
interfaceTutorialConfigParams{
6-
tutorial:G.Tutorial,
6+
config:G.TutorialConfig,
77
alreadyConfigured?:boolean
88
onComplete?():void
99
}
1010

11-
consttutorialConfig=async({tutorial, alreadyConfigured, onComplete}:TutorialConfigParams)=>{
12-
console.log('---------- tutorialConfig -----------')
11+
consttutorialConfig=async({config, alreadyConfigured,}:TutorialConfigParams)=>{
1312
if(!alreadyConfigured){
1413
// setup git, add remote
1514
awaitgit.initIfNotExists()
1615

1716
// 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)
2018
}
2119

2220
// 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())
2422

2523
// setup onSave hook
2624
vscode.workspace.onDidSaveTextDocument((document:vscode.TextDocument)=>{

‎src/channel/index.ts

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,32 @@ class Channel implements Channel {
8383
// configure test runner, language, git
8484
case'EDITOR_TUTORIAL_CONFIG':
8585
consttutorialData:G.Tutorial=action.payload.tutorial
86+
// setup tutorial config (save listener, test runner, etc)
8687
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'})
92103
return
93104
case'EDITOR_TUTORIAL_CONTINUE_CONFIG':
94105
consttutorialContinue:G.Tutorial|null=this.context.tutorial.get()
95106
if(!tutorialContinue){
96107
thrownewError('Invalid tutorial to continue')
97108
}
109+
constcontinueConfig:G.TutorialConfig=tutorialContinue.version.data.config
98110
tutorialConfig({
99-
tutorial:tutorialContinue,
111+
config:continueConfig,
100112
alreadyConfigured:true
101113
})
102114
return

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp