- Notifications
You must be signed in to change notification settings - Fork39
Migrate to xstate as app skeleton#2
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
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
11 commits Select commitHold shift + click to select a range
820097a setup level/stage tree
ShMcK32edbcf setup xstate machine as core
ShMcK4be011f setup start w/ continue or new
ShMcK6993147 add machine loadTutorial
ShMcK04653e2 setup tutorial initialization
ShMcKb51dd2f refactor files
ShMcK89045a3 refactor files
ShMcK9bcf64c refactor storage into editor
ShMcKcc176e6 update deps
ShMcKe88651e setup xstate with interpreter
ShMcKf8c527e cleanup start
ShMcKFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
PrevPrevious commit
cleanup start
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commitf8c527e198f84dca34b64de5c6fdd2302bd82e3d
There are no files selected for viewing
8 changes: 4 additions & 4 deletionssrc/editor/commands/index.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletionssrc/editor/commands/start-old.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| import * as vscode from 'vscode' | ||
| import * as CR from 'typings' | ||
| import tutorialSetup from '../../services/tutorialSetup' | ||
| import { isEmptyWorkspace, openReadme } from '../workspace' | ||
| import { setWorkspaceRoot } from '../../services/node' | ||
| import { setStorage } from '../../editor/storage' | ||
| /* | ||
| new | ||
| if current workspace is empty, use it | ||
| if not, open a new folder then start | ||
| */ | ||
| // async function continueTutorial() { | ||
| // // TODO: verify that tutorial is loaded in workspace | ||
| // // TODO: verify progress | ||
| // // TODO: verify setup | ||
| // await loadProgressPosition() | ||
| // await openReadme() | ||
| // } | ||
| async function newTutorial(tutorial: CR.Tutorial) { | ||
| // if workspace isn't empty, clear it out if given permission | ||
| const isEmpty: boolean = await isEmptyWorkspace() | ||
| if (!isEmpty) { | ||
| // eslint-disable-next-line | ||
| const options = ['Open a new folder', 'I\'ll clear the files and folders myself'] | ||
| const shouldOpenFolder = await vscode.window.showQuickPick(options) | ||
| if (shouldOpenFolder === options[0]) { | ||
| await vscode.commands.executeCommand('vscode.openFolder') | ||
| } | ||
| } | ||
| await tutorialSetup(tutorial) | ||
| await openReadme() | ||
| } | ||
| export default async function start(context: vscode.ExtensionContext): Promise<void> { | ||
| console.log('start', context) | ||
| return; | ||
| // const modes = ['New'] | ||
| // const canContinue = await validateCanContinue() | ||
| // if (canContinue) { | ||
| // modes.push('Continue') | ||
| // } | ||
| // const selectedMode: string | undefined = await vscode.window.showQuickPick(modes) | ||
| // if (!selectedMode) { | ||
| // throw new Error('No mode selected') | ||
| // return | ||
| // } | ||
| // interface TutorialQuickPickItem extends vscode.QuickPickItem { | ||
| // id: string | ||
| // } | ||
| // // load tutorial summaries | ||
| // const tutorialsData: { [id: string]: CR.TutorialSummary } = await api({ | ||
| // resource: 'getTutorialsSummary', | ||
| // }) | ||
| // const selectableTutorials: TutorialQuickPickItem[] = Object.keys(tutorialsData).map(id => { | ||
| // const tutorial = tutorialsData[id] | ||
| // return { | ||
| // label: tutorial.title, | ||
| // description: tutorial.description, | ||
| // // detail: '', // optional additional info | ||
| // id, | ||
| // } | ||
| // }) | ||
| // const selectedTutorial: TutorialQuickPickItem | undefined = await vscode.window.showQuickPick(selectableTutorials) | ||
| // if (!selectedTutorial) { | ||
| // throw new Error('No tutorial selected') | ||
| // } | ||
| // // load specific tutorial | ||
| // const tutorial: CR.Tutorial | undefined = await fetch({ | ||
| // resource: 'getTutorial', | ||
| // params: { id: selectedTutorial.id }, | ||
| // }) | ||
| // if (!tutorial) { | ||
| // throw new Error('No tutorial found') | ||
| // } | ||
| // switch (selectedMode) { | ||
| // // new tutorial | ||
| // case modes[0]: | ||
| // await newTutorial(tutorial) | ||
| // break | ||
| // // continue | ||
| // case modes[1]: | ||
| // await continueTutorial() | ||
| // break | ||
| // } | ||
| // // setup hook to run tests on save | ||
| // TODO: start | ||
| } |
145 changes: 38 additions & 107 deletionssrc/editor/commands/start.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,114 +1,45 @@ | ||
| import*asvscodefrom'vscode' | ||
| import{setWorkspaceRoot}from'../../services/node' | ||
| import{setStorage}from'../../editor/storage' | ||
| import{activateasactivateMachine,defaultasmachine}from'../../state' | ||
| import*asstoragefrom'../../services/storage' | ||
| import*asgitfrom'../../services/git' | ||
| import*asCRfrom'typings' | ||
| letinitialTutorial:CR.Tutorial|undefined | ||
| letinitialProgress:CR.Progress={ | ||
| levels:{}, | ||
| stages:{}, | ||
| steps:{}, | ||
| complete:false, | ||
| } | ||
| exportdefaultasyncfunctionstart(context:vscode.ExtensionContext):Promise<void>{ | ||
| console.log('TUTORIAL_START') | ||
| // setup connection to workspace | ||
| awaitsetWorkspaceRoot() | ||
| // set workspace context path | ||
| awaitsetStorage(context.workspaceState) | ||
| // initialize state machine | ||
| activateMachine() | ||
| console.log('ACTION: start') | ||
| // verify that the user has a tutorial & progress | ||
| // verify git is setup with a coderoad remote | ||
| const[tutorial,progress,hasGit,hasGitRemote]=awaitPromise.all([ | ||
| storage.getTutorial(), | ||
| storage.getProgress(), | ||
| git.gitVersion(), | ||
| git.gitCheckRemoteExists(), | ||
| ]) | ||
| initialTutorial=tutorial | ||
| initialProgress=progress | ||
| constcanContinue=!!(tutorial&&progress&&hasGit&&hasGitRemote) | ||
| console.log('canContinue',canContinue) | ||
| // if a tutorial exists, "CONTINUE" | ||
| // otherwise start from "NEW" | ||
| machine.send(canContinue ?'CONTINUE' :'NEW') | ||
| } |
10 changes: 5 additions & 5 deletionssrc/editor/init.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
19 changes: 1 addition & 18 deletionssrc/state/actions/index.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.