WIP

Author: sago35

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "vscode-tinygo",
 	"displayName": "TinyGo",
-	"version": "0.2.0",
+	"version": "0.3.0-dev1",
 	"publisher": "tinygo",
 	"description": "TinyGo support for Visual Studio Code",
 	"license": "BSD-3-Clause",
@@ -28,7 +28,17 @@
 				"command": "vscode-tinygo.selectTarget",
 				"title": "TinyGo target"
 			}
-		]
+		],
+		"configuration": {
+			"title": "TinyGo Configuration",
+			"properties": {
+				"tinygo.openocdInterface": {
+					"description": "which hardware programmer to use (ex: jlink, cmsis-dap, stlink-v2, ...)",
+					"type": "string",
+					"default": "cmsis-dap"
+				}
+			}
+		}
 	},
 	"scripts": {
 		"compile": "tsc -p ./",

src/extension.ts

@@ -86,21 +86,20 @@ export async function activate(context: vscode.ExtensionContext) {
 
 			try {
 				const execFile = util.promisify(cp.execFile);
-				const {stdout, stderr} = await execFile('tinygo', ['env', 'TINYGOROOT']);
+				const { stdout, stderr } = await execFile('tinygo', ['env', 'TINYGOROOT']);
 				tinygoroot = stdout.trimRight()
-			} catch(err) {
+			} catch (err) {
 				vscode.window.showErrorMessage(`Could not run 'tinygo env TINYGOROOT':\n` + err);
 				return;
 			}
 
 			try {
+				openocdInterface = vscode.workspace.getConfiguration('tinygo')['openocdInterface'];
+
 				const execFile = util.promisify(cp.execFile);
-				const {stdout, stderr} = await execFile('tinygo', ['build', '-json', '-target', target, '-o', 'out.elf', '-programmer', 'cmsis-dap']);
+				const { stdout, stderr } = await execFile('tinygo', ['build', '-json', '-target', target, '-o', 'out.elf', '-programmer', openocdInterface]);
 				let buildInfo = JSON.parse(stdout);
 
-				if (buildInfo.Options.Programmer) {
-					openocdInterface = buildInfo.Options.Programmer;
-				}
 				if (buildInfo.Target['openocd-target']) {
 					openocdTarget = buildInfo.Target['openocd-target'];
 				}
@@ -121,7 +120,7 @@ export async function activate(context: vscode.ExtensionContext) {
 						}
 					}
 				})
-			} catch(err) {
+			} catch (err) {
 				vscode.window.showErrorMessage(`Could not run 'tinygo build -json -target ${target}':\n` + err);
 			}
 		}
@@ -186,30 +185,35 @@ export async function activate(context: vscode.ExtensionContext) {
 		{
 			// tasks.json configuration
 			const tasksConfig = vscode.workspace.getConfiguration('tasks');
-			if (!tasksConfig['tasks']) {
-			}
-			const configurations = tasksConfig['tasks'];
-			let found = false
-			for (var i in configurations) {
-				let cfg = configurations[i];
-				if (cfg.label == 'tinygo build task') {
-					found = true;
+			const task = {
+				"label": "tinygo build task",
+				"type": "shell",
+				"command": "tinygo build -o ${env:TMP}/out.elf -target ${config:go.toolsEnvVars.TARGET} -size short -opt 1 ${config:go.toolsEnvVars.TargetPkg}",
+				"problemMatcher": [],
+				"group": {
+					"kind": "build",
+					"isDefault": true
 				}
-			}
-			if (!found) {
-				configurations.push({
-					"label": "tinygo build task",
-					"type": "shell",
-					"command": "tinygo build -o ${env:TMP}/out.elf -target ${config:go.toolsEnvVars.TARGET} -size short -opt 1 ${config:go.toolsEnvVars.TargetPkg}",
-					"problemMatcher": [],
-					"group": {
-						"kind": "build",
-						"isDefault": true
-					}
-				});
-				tasksConfig.update('tasks', configurations, false).then(() =>
+			};
+			if (!tasksConfig['tasks']) {
+				tasksConfig.update('tasks', [task]).then(() =>
 					vscode.window.showInformationMessage('Added tinygo configuration to tasks.json!')
 				);
+			} else {
+				let configurations = tasksConfig['tasks'];
+				let found = false
+				for (var i in configurations) {
+					let cfg = configurations[i];
+					if (cfg.label == 'tinygo build task') {
+						found = true;
+					}
+				}
+				if (!found) {
+					configurations.push(task);
+					tasksConfig.update('tasks', configurations, false).then(() =>
+						vscode.window.showInformationMessage('Added tinygo configuration to tasks.json!')
+					);
+				}
 			}
 		}