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

Feat/await async calls#564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
ShMcK merged 2 commits intomasterfromfeat/await-async-calls
Jan 12, 2022
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletionpackage.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "coderoad",
"version": "0.19.0",
"version": "0.19.1",
"description": "Play interactive coding tutorials in your editor",
"keywords": [
"tutorial",
Expand Down
4 changes: 2 additions & 2 deletionssrc/actions/onRunReset.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,12 +28,12 @@ const onRunReset = async (action: ResetAction, context: Context): Promise<void>
}

// load timeline until last pass commit
reset({ branch, hash })
awaitreset({ branch, hash })

// if tutorial.config.reset.command, run it
const resetActions = tutorial?.config?.reset
if (resetActions) {
hooks.onReset(
awaithooks.onReset(
{ commands: resetActions?.commands, vscodeCommands: resetActions?.vscodeCommands },
tutorial?.id as string,
)
Expand Down
2 changes: 1 addition & 1 deletionsrc/actions/onTutorialConfigContinue.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ const onTutorialConfigContinue = async (action: T.Action, context: Context): Pro
// if tutorial.config.reset.command, run it
const continueActions = tutorialToContinue?.config?.continue
if (continueActions) {
hooks.onContinue(
awaithooks.onContinue(
{ commands: continueActions?.commands, vscodeCommands: continueActions?.vscodeCommands },
tutorialToContinue?.id as string,
)
Expand Down
10 changes: 5 additions & 5 deletionssrc/channel.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,12 +59,12 @@ class Channel implements Channel {
case 'EDITOR_LEVEL_ENTER':
case 'EDITOR_STEP_ENTER':
await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_POSITION, action.payload.position)
hooks.onSetupEnter(action.payload.actions)
awaithooks.onSetupEnter(action.payload.actions)
return
// load solution step actions (git commits, commands, open files)
case 'EDITOR_SOLUTION_ENTER':
await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_POSITION, action.payload.position)
hooks.onSolutionEnter(action.payload.actions)
awaithooks.onSolutionEnter(action.payload.actions)
return
case 'EDITOR_SYNC_POSITION':
// update progress when a level is deemed complete in the client
Expand All@@ -83,13 +83,13 @@ class Channel implements Channel {
actions.onRunReset({ type: 'POSITION', position: action.payload.position }, this.context)
return
case 'EDITOR_STEP_COMPLETE':
hooks.onStepComplete(action.payload)
awaithooks.onStepComplete(action.payload)
return
case 'EDITOR_LEVEL_COMPLETE':
hooks.onLevelComplete(action.payload)
awaithooks.onLevelComplete(action.payload)
return
case 'EDITOR_TUTORIAL_COMPLETE':
hooks.onTutorialComplete(action.payload)
awaithooks.onTutorialComplete(action.payload)
return
default:
logger(`No match for action type: ${actionType}`)
Expand Down
2 changes: 1 addition & 1 deletionsrc/commands.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ export const createCommands = (commandProps: CreateCommandProps): { [key: string
if (!alreadyConfigured) {
const setupActions = data.config.setup
if (setupActions) {
hooks.onInit(setupActions, data.id)
awaithooks.onInit(setupActions, data.id)
}
}
testRunner = createTestRunner(data, {
Expand Down
2 changes: 1 addition & 1 deletionsrc/services/reset/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ const reset = async ({ branch, hash }: Input): Promise<void> => {
})
// stash any current work
await exec({
command: 'git stash',
command: 'git stash --include-untracked',
}).catch(ignoreError)

// remove any other files
Expand Down
2 changes: 1 addition & 1 deletionweb-app/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "coderoad-app",
"version": "0.19.0",
"version": "0.19.1",
"private": true,
"scripts": {
"analyze": "source-map-explorer 'build/static/js/*.js'",
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp