fix bug with fileFormats

ShMcK · ShMcK · commit 502591a96540 · 2019-11-03T15:12:40.000-08:00
diff --git a/src/actions/tutorialConfig.ts b/src/actions/tutorialConfig.ts
@@ -1,13 +1,15 @@
 import * as G from 'typings/graphql'
 import * as vscode from 'vscode'
 import * as git from '../services/git'
+import langaugeMap from '../editor/languageMap'
 
 interface TutorialConfigParams {
 	config: G.TutorialConfig,
 	alreadyConfigured?: boolean
 	onComplete?(): void
 }
 
+
 const tutorialConfig = async ({config, alreadyConfigured, }: TutorialConfigParams) => {
 	if (!alreadyConfigured) {
 		// setup git, add remote
@@ -19,8 +21,7 @@ const tutorialConfig = async ({config, alreadyConfigured, }: TutorialConfigParam
 
 	// setup onSave hook
 	vscode.workspace.onDidSaveTextDocument((document: vscode.TextDocument) => {
-		const fileFormat: string = document.languageId.toUpperCase()
-		// @ts-ignore warning on enums when validating a file format match
+		const fileFormat: G.FileFormat = langaugeMap[document.languageId]
 		if (document.uri.scheme === 'file' && config.fileFormats.includes(fileFormat)) {
 			vscode.commands.executeCommand('coderoad.run_test')
 		}
diff --git a/src/editor/languageMap.ts b/src/editor/languageMap.ts
@@ -0,0 +1,23 @@
+import * as G from 'typings/graphql'
+// sourced from https://code.visualstudio.com/docs/languages/identifiers
+const languageMap: {
+	[lang: string]: G.FileFormat
+} = {
+	// go: 'GO',
+	javascript: 'JS',
+	javascriptreact: 'JSX',
+	json: 'JSON',
+	// less: 'LESS',
+	// lua: 'LUA',
+	// php: 'PHP',
+	// python: 'PY',
+	// ruby: 'RB',
+	// sass: 'SASS',
+	// scss: 'SCSS',
+	// sql: 'SQL',
+	typescript: 'TS',
+	typescriptreact: 'TSX',
+	// yaml: 'YAML'
+}
+
+export default languageMap
diff --git a/web-app/src/services/apollo/queries/tutorial.ts b/web-app/src/services/apollo/queries/tutorial.ts
@@ -13,7 +13,7 @@ export default gql`
 			data {
 				config {
 					testRunner
-					codingLanguages
+					fileFormats
 					repo {
 						uri
 						branch
