Jun 2, 2019 · May 27, 2019 · Jun 2, 2019 · Jun 2, 2019 · Jun 2, 2019 · Jun 2, 2019
diff --git a/src/services/vscode/channel.ts → src/editor/channel.ts b/src/services/vscode/channel.ts → src/editor/channel.ts
diff --git a/src/commands/index.ts → src/editor/commands/index.ts b/src/commands/index.ts → src/editor/commands/index.ts
diff --git a/src/commands/loadSolution.ts → src/editor/commands/loadSolution.ts b/src/commands/loadSolution.ts → src/editor/commands/loadSolution.ts
 import*asCRfrom'typings'
 import*asstoragefrom'../services/storage'
 import{gitLoadCommits,gitClear}from'../services/git'
 import*asstoragefrom'../storage'
 import{gitLoadCommits,gitClear}from'../../services/git'

 exportdefaultasyncfunctionloadSolution():Promise<void>{
 const[position,tutorial]:[CR.Position,CR.Tutorial|undefined]=awaitPromise.all([
diff --git a/src/commands/quit.ts → src/editor/commands/quit.ts b/src/commands/quit.ts → src/editor/commands/quit.ts
diff --git a/src/commands/runTest.ts → src/editor/commands/runTest.ts b/src/commands/runTest.ts → src/editor/commands/runTest.ts
 import{getOutputChannel}from'../utils/channel'
 import{exec}from'../utils/node'
 import*asstoragefrom'../services/storage'
 import*astestResultfrom'../services/testResult'
 import{getOutputChannel}from'../channel'
 import{exec}from'../../services/node'
 import*asstoragefrom'../storage'
 import*astestResultfrom'../../services/testResult'

 // ensure only latest run_test action is taken
 letcurrentId=0
diff --git a/src/commands/tutorialLoad.ts → src/editor/commands/tutorialLoad.ts b/src/commands/tutorialLoad.ts → src/editor/commands/tutorialLoad.ts
 import*asvscodefrom'vscode'
 import*asCRfrom'typings'

 importfetchfrom'../utils/fetch'
 importtutorialSetupfrom'../services/tutorialSetup'
 import{loadProgressPosition}from'../services/position'
 import*asstoragefrom'../services/storage'
 importrootSetupfrom'../services/rootSetup'
 import{isEmptyWorkspace,openReadme}from'../utils/workspace'
 import*asgitfrom'../services/git'
 importapifrom'../../services/api'
 importtutorialSetupfrom'../../services/tutorialSetup'
 import{loadProgressPosition}from'../../services/position'
 import*asstoragefrom'../storage'
 importrootSetupfrom'../../services/rootSetup'
 import{isEmptyWorkspace,openReadme}from'../workspace'
 import*asgitfrom'../../services/git'

 /*
 new
 // }

 // // load tutorial summaries
 // const tutorialsData: { [id: string]: CR.TutorialSummary } = awaitfetch({
 // const tutorialsData: { [id: string]: CR.TutorialSummary } = awaitapi({
 //   resource: 'getTutorialsSummary',
 // })
 // const selectableTutorials: TutorialQuickPickItem[] = Object.keys(tutorialsData).map(id => {
diff --git a/src/services/vscode/index.ts → src/editor/index.ts b/src/services/vscode/index.ts → src/editor/index.ts
diff --git a/src/services/vscode/save.ts → src/editor/save.ts b/src/services/vscode/save.ts → src/editor/save.ts
diff --git a/src/services/vscode/storage.ts → src/editor/storage.ts b/src/services/vscode/storage.ts → src/editor/storage.ts
diff --git a/src/services/vscode/workspace.ts → src/editor/workspace.ts b/src/services/vscode/workspace.ts → src/editor/workspace.ts
 import*asfsfrom'fs'
 import*aspathfrom'path'
 import*asvscodefrom'vscode'
 import{exec,exists}from'../node'
 import{exec,exists}from'../services/node'

 exportasyncfunctionisEmptyWorkspace():Promise<boolean>{
 const{ stdout, stderr}=awaitexec('ls')
diff --git a/src/extension.ts b/src/extension.ts
 // Import the module and reference it with the alias vscode in your code below
 import*asvscodefrom'vscode'

 importcreateCommandsfrom'./commands'
 importcreateCommandsfrom'./editor/commands'
 importcreateViewsfrom'./views'

 // this method is called when your extension is activated
diff --git a/src/services/position.ts b/src/services/position.ts
 import*asCRfrom'typings'
 import*asstoragefrom'./vscode/storage'
 import*asstoragefrom'../editor/storage'

 exportasyncfunctiongetInitial(tutorial:CR.Tutorial):Promise<CR.Position>{
 const{ data}=tutorial
diff --git a/src/services/rootSetup.ts b/src/services/rootSetup.ts
 import*asvscodefrom'vscode'
 import{setWorkspaceRoot}from'../services/node'
 import{setStorage}from'./vscode/storage'
 import{setStorage}from'../editor/storage'

 exportdefaultasyncfunctionsetupRoot(context:vscode.ExtensionContext){
 awaitsetWorkspaceRoot()
diff --git a/src/services/testResult.ts b/src/services/testResult.ts
 import*asCRfrom'typings'
 import*asvscodefrom'vscode'
 import*asstoragefrom'./vscode/storage'
 import*asstoragefrom'../editor/storage'


 exportasyncfunctiononSuccess(position:CR.Position){
diff --git a/src/services/tutorialSetup.ts b/src/services/tutorialSetup.ts
 import*asCRfrom'typings'
 import*aspositionfrom'../services/position'
 import*asstoragefrom'../services/vscode/storage'
 import{isEmptyWorkspace}from'../services/vscode/workspace'
 import*asstoragefrom'../editor/storage'
 import{isEmptyWorkspace}from'../editor/workspace'
 import{gitLoadCommits,gitInitIfNotExists,gitSetupRemote}from'../services/git'

 consttestRepo='https://github.com/ShMcK/coderoad-tutorial-basic.git'
diff --git a/src/state/actions/index.ts b/src/state/actions/index.ts
 import{assign,send}from'xstate'
 import*asCRfrom'typings'
 import*asstoragefrom'../../services/storage'
 import*asstoragefrom'../../editor/storage'
 import*asgitfrom'../../services/git'

 letinitialTutorial:CR.Tutorial|undefined
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		import*asCRfrom'typings'
		import*asstoragefrom'../services/storage'
		import{gitLoadCommits,gitClear}from'../services/git'
		import*asstoragefrom'../storage'
		import{gitLoadCommits,gitClear}from'../../services/git'

		exportdefaultasyncfunctionloadSolution():Promise<void>{
		const[position,tutorial]:[CR.Position,CR.Tutorial\|undefined]=awaitPromise.all([
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,7 @@
		import{getOutputChannel}from'../utils/channel'
		import{exec}from'../utils/node'
		import*asstoragefrom'../services/storage'
		import*astestResultfrom'../services/testResult'
		import{getOutputChannel}from'../channel'
		import{exec}from'../../services/node'
		import*asstoragefrom'../storage'
		import*astestResultfrom'../../services/testResult'

		// ensure only latest run_test action is taken
		letcurrentId=0
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,13 +1,13 @@
		import*asvscodefrom'vscode'
		import*asCRfrom'typings'

		importfetchfrom'../utils/fetch'
		importtutorialSetupfrom'../services/tutorialSetup'
		import{loadProgressPosition}from'../services/position'
		import*asstoragefrom'../services/storage'
		importrootSetupfrom'../services/rootSetup'
		import{isEmptyWorkspace,openReadme}from'../utils/workspace'
		import*asgitfrom'../services/git'
		importapifrom'../../services/api'
		importtutorialSetupfrom'../../services/tutorialSetup'
		import{loadProgressPosition}from'../../services/position'
		import*asstoragefrom'../storage'
		importrootSetupfrom'../../services/rootSetup'
		import{isEmptyWorkspace,openReadme}from'../workspace'
		import*asgitfrom'../../services/git'

		/*
		new
Expand DownExpand Up		@@ -78,7 +78,7 @@ export default async function tutorialLoad(context: vscode.ExtensionContext): Pr
		// }

		// // load tutorial summaries
		// const tutorialsData: { [id: string]: CR.TutorialSummary } = awaitfetch({
		// const tutorialsData: { [id: string]: CR.TutorialSummary } = awaitapi({
		// resource: 'getTutorialsSummary',
		// })
		// const selectableTutorials: TutorialQuickPickItem[] = Object.keys(tutorialsData).map(id => {
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,7 @@
		import*asfsfrom'fs'
		import*aspathfrom'path'
		import*asvscodefrom'vscode'
		import{exec,exists}from'../node'
		import{exec,exists}from'../services/node'

		exportasyncfunctionisEmptyWorkspace():Promise<boolean>{
		const{ stdout, stderr}=awaitexec('ls')
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,7 @@
		// Import the module and reference it with the alias vscode in your code below
		import*asvscodefrom'vscode'

		importcreateCommandsfrom'./commands'
		importcreateCommandsfrom'./editor/commands'
		importcreateViewsfrom'./views'

		// this method is called when your extension is activated
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,5 @@
		import*asCRfrom'typings'
		import*asstoragefrom'./vscode/storage'
		import*asstoragefrom'../editor/storage'

		exportasyncfunctiongetInitial(tutorial:CR.Tutorial):Promise<CR.Position>{
		const{ data}=tutorial
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		import*asvscodefrom'vscode'
		import{setWorkspaceRoot}from'../services/node'
		import{setStorage}from'./vscode/storage'
		import{setStorage}from'../editor/storage'

		exportdefaultasyncfunctionsetupRoot(context:vscode.ExtensionContext){
		awaitsetWorkspaceRoot()
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,7 @@
		import*asCRfrom'typings'
		import*aspositionfrom'../services/position'
		import*asstoragefrom'../services/vscode/storage'
		import{isEmptyWorkspace}from'../services/vscode/workspace'
		import*asstoragefrom'../editor/storage'
		import{isEmptyWorkspace}from'../editor/workspace'
		import{gitLoadCommits,gitInitIfNotExists,gitSetupRemote}from'../services/git'

		consttestRepo='https://github.com/ShMcK/coderoad-tutorial-basic.git'
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		import{assign,send}from'xstate'
		import*asCRfrom'typings'
		import*asstoragefrom'../../services/storage'
		import*asstoragefrom'../../editor/storage'
		import*asgitfrom'../../services/git'

		letinitialTutorial:CR.Tutorial\|undefined
Expand Down