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

Commitfc38477

Browse files
committed
allow vscode commands with reset
Signed-off-by: shmck <shawn.j.mckay@gmail.com>
1 parentd652457 commitfc38477

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

‎src/actions/onRunReset.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@ const onRunReset = async (action: ResetAction, context: Context): Promise<void>
3030
// load timeline until last pass commit
3131
reset({ branch, hash})
3232

33-
// TODO:@deprecate command in favor of commands
3433
// if tutorial.config.reset.command, run it
35-
if(tutorial?.config?.reset?.command){
36-
hooks.onReset([tutorial?.config?.reset?.command])
37-
}elseif(tutorial?.config?.reset?.commands){
38-
hooks.onReset(tutorial?.config?.reset?.commands)
34+
constresetActions=tutorial?.config?.reset
35+
if(resetActions){
36+
hooks.onReset({commands:resetActions?.commands,vscodeCommands:resetActions?.vscodeCommands})
3937
}
4038
}
4139

‎src/services/hooks/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ export const onSolutionEnter = async (actions: TT.StepActions): Promise<void> =>
3838
awaitonRunTest()
3939
}
4040

41-
exportconstonReset=async(commands:string[]):Promise<void>=>{
42-
awaitrunCommands(commands)
41+
exportconstonReset=async(actions:TT.StepActions):Promise<void>=>{
42+
awaitrunCommands(actions?.commands)
43+
awaitrunVSCodeCommands(actions?.vscodeCommands)
4344
}
4445

4546
exportconstonError=async(error:Error):Promise<void>=>{

‎src/services/hooks/utils/loadCommits.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import*asgitfrom'../../git'
22

3-
constloadCommits=async(commits:string[]):Promise<void>=>{
4-
if(commits){
3+
constloadCommits=async(commits:string[]=[]):Promise<void>=>{
4+
if(commits&&commits.length){
55
// load the current list of commits for validation
66
for(constcommitofcommits){
77
awaitgit.loadCommit(commit)

‎src/services/reset/lastHash.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const getLastCommitHash = (position: T.Position, tutorial: TT.Tutorial | null):
4141
if(!step){
4242
thrownewError(`No step found matching${stepId}`)
4343
}
44-
constcommits=step.setup.commits
44+
constcommits=step.setup?.commits||[]
4545
if(!commits.length){
4646
thrownewError(`No commits found on step${stepId}`)
4747
}

‎typings/tutorial.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { ProgressStatus } from './index'
33
exporttypeMaybe<T>=T|null
44

55
exporttypeConfigReset={
6-
command?:string
76
commands?:string[]
7+
vscodeCommands?:VSCodeCommand[]
88
}
99

1010
exporttypeTutorialConfig={
@@ -58,7 +58,7 @@ export type TutorialSummary = {
5858

5959
exporttypeStepActions={
6060
commands?:string[]
61-
commits:string[]
61+
commits?:string[]
6262
files?:string[]
6363
watchers?:string[]
6464
filter?:string

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp