Skip to content

Commit bdf0c32

Browse files
ShMcKShMcK
committed
cleanup todos
1 parent 0fd10d3 commit bdf0c32

File tree

18 files changed

+40
-32
lines changed

18 files changed

+40
-32
lines changed

‎src/actions/tutorialConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const tutorialConfig = async (
2626
})
2727
})
2828

29-
// TODO: if remote not already set
29+
// TODO if remote not already set
3030
await git.setupRemote(config.repo.uri).catch(error => {
3131
onError({ title: error.message, description: 'Remove your current Git project and restarting' })
3232
})

‎src/actions/utils/openFiles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const openFiles = async (files: string[]) => {
88
}
99
for (const filePath of files) {
1010
try {
11-
// TODO: figure out why this does not work
11+
// TODO figure out why this does not work
1212
// try {
1313
// const absoluteFilePath = join(workspaceRoot.uri.path, filePath)
1414
// const doc = await vscode.workspace.openTextDocument(absoluteFilePath)

‎src/channel/index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,6 @@ class Channel implements Channel {
114114
onError,
115115
)
116116
return
117-
case 'EDITOR_SYNC_PROGRESS':
118-
// sync client progress on server
119-
this.context.position.set(action.payload.position)
120-
this.context.progress.set(action.payload.progress)
121-
return
122117
// load step actions (git commits, commands, open files)
123118
case 'SETUP_ACTIONS':
124119
vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP, action.payload)

‎src/channel/state/Position.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,25 @@ class Position {
1313
this.value = defaultValue
1414
}
1515
public get = () => {
16+
if (!this.value.levelId || !this.value.stepId) {
17+
console.log('NO POSITION RETURNED')
18+
}
19+
console.log(this.value)
1620
return this.value
1721
}
1822
public set = (value: CR.Position) => {
23+
console.log('--- position set')
24+
console.log(value)
1925
this.value = value
2026
}
2127
public reset = () => {
2228
this.value = defaultValue
2329
}
2430
// calculate the current position based on the saved progress
2531
public setPositionFromProgress = (tutorial: G.Tutorial, progress: CR.Progress): CR.Position => {
32+
console.log('--- set position from progress')
2633
// tutorial already completed
27-
// TODO: handle start again?
34+
// TODO handle start again?
2835
if (progress.complete) {
2936
return this.value
3037
}
@@ -36,7 +43,7 @@ class Position {
3643
const { levels } = tutorial.version.data
3744

3845
const lastLevelIndex: number | undefined = levels.findIndex((l: G.Level) => !progress.levels[l.id])
39-
// TODO: consider all levels complete as progress.complete
46+
// TODO consider all levels complete as progress.complete
4047
if (lastLevelIndex >= levels.length) {
4148
throw new Error('Error setting progress level')
4249
}
@@ -56,6 +63,9 @@ class Position {
5663
levelId: currentLevel.id,
5764
stepId: currentStep.id,
5865
}
66+
67+
console.log('--- calculated set position from progress')
68+
console.log(this.value)
5969
return this.value
6070
}
6171
}

‎src/channel/state/Progress.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ class Progress {
4343
public setStepComplete = (stepId: string): CR.Progress => {
4444
const next = this.value
4545
next.steps[stepId] = true
46+
47+
// TODO validate if progress is complete for a level or tutorial
48+
4649
return this.set(next)
4750
}
4851
}

‎src/channel/state/Tutorial.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,21 @@ import Storage from '../../services/storage'
66
// Tutorial
77
class Tutorial {
88
private storage: Storage<G.Tutorial | null>
9-
private value: G.Tutorial | null
9+
private value: G.Tutorial | null = null
1010
constructor(workspaceState: vscode.Memento) {
1111
this.storage = new Storage<G.Tutorial | null>({
1212
key: 'coderoad:currentTutorial',
1313
storage: workspaceState,
1414
defaultValue: null,
1515
})
16-
this.value = null
1716
// set value from storage
1817
this.storage.get().then((value: G.Tutorial | null) => {
1918
this.value = value
2019
})
2120
}
22-
public get = () => this.value
21+
public get = () => {
22+
return this.value
23+
}
2324
public set = (value: G.Tutorial | null) => {
2425
this.value = value
2526
this.storage.set(value)

‎src/editor/commands.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const createCommands = ({ extensionPath, workspaceState, workspaceRoot }:
2626
return {
2727
// initialize
2828
[COMMANDS.START]: async () => {
29-
// TODO: replace with a prompt to open a workspace
29+
// TODO replace with a prompt to open a workspace
3030
// await isEmptyWorkspace()
3131

3232
let webviewState: 'INITIALIZING' | 'RESTARTING'
@@ -58,6 +58,7 @@ export const createCommands = ({ extensionPath, workspaceState, workspaceRoot }:
5858
// send test pass message back to client
5959
vscode.window.showInformationMessage('PASS')
6060
webview.send({ type: 'TEST_PASS', payload })
61+
// update local storage
6162
},
6263
onFail: (payload: Payload, message: string) => {
6364
// send test fail message back to client
@@ -75,7 +76,6 @@ export const createCommands = ({ extensionPath, workspaceState, workspaceRoot }:
7576
})
7677
},
7778
[COMMANDS.SET_CURRENT_STEP]: ({ stepId }: Payload) => {
78-
// NOTE: as async, may sometimes be inaccurate
7979
// set from last setup stepAction
8080
currentStepId = stepId
8181
},

‎src/services/git/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export async function checkRemoteExists(): Promise<boolean> {
119119
return false
120120
}
121121
// string match on remote output
122-
// TODO: improve the specificity of this regex
122+
// TODO improve the specificity of this regex
123123
return !!stdout.match(gitOrigin)
124124
} catch (error) {
125125
return false

‎src/services/storage/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ class Storage<T> {
1616
this.defaultValue = defaultValue
1717
}
1818
public get = async (): Promise<T> => {
19-
// const value: string | undefined = await this.storage.get(this.key)
20-
// if (value) {
21-
// return JSON.parse(value)
22-
// }
19+
const value: string | undefined = await this.storage.get(this.key)
20+
if (value) {
21+
return JSON.parse(value)
22+
}
2323
return this.defaultValue
2424
}
2525
public set = (value: T): void => {

‎src/webview/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ interface ReactWebViewProps {
1212

1313
const createReactWebView = ({ extensionPath, workspaceState, workspaceRoot }: ReactWebViewProps) => {
1414
let loaded = false
15-
// TODO: add disposables
15+
// TODO add disposables
1616
const disposables: vscode.Disposable[] = []
1717

1818
function createWebViewPanel(): vscode.WebviewPanel {

0 commit comments

Comments
 (0)