Fixes microsoft#745 Implement startSessionCommand

ramya-rao-a · Feb 5, 2017 · e7c8273 · e7c8273
1 parent 4eccd65
commit e7c8273
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -56,7 +56,8 @@
   "activationEvents": [
     "onLanguage:go",
     "onCommand:go.gopath",
-    "onCommand:go.tools.install"
+    "onCommand:go.tools.install",
+    "onCommand:go.debug.startSession"
   ],
   "main": "./out/src/goMain",
   "contributes": {
@@ -153,6 +154,7 @@
         "languages": [
           "go"
         ],
+        "startSessionCommand": "go.debug.startSession",
         "initialConfigurations": [
           {
             "name": "Launch",

diff --git a/src/debugAdapter/goDebug.ts b/src/debugAdapter/goDebug.ts
@@ -187,6 +187,8 @@ class Delve {
 				connectClient(port, host);
 				return;
 			}
+			if (!env) env = {};
+
 			let dlv = getBinPathWithPreferredGopath('dlv', env['GOPATH']);
 
 			if (!existsSync(dlv)) {

diff --git a/src/goMain.ts b/src/goMain.ts
@@ -156,6 +156,19 @@ export function activate(ctx: vscode.ExtensionContext): void {
 		goGenerateTests.toggleTestFile();
 	}));
 
+	ctx.subscriptions.push(vscode.commands.registerCommand('go.debug.startSession', config => {
+		if (!config.request) { // if 'request' is missing interpret this as a missing launch.json
+			config = Object.assign(config, {
+				'name': 'Launch',
+				'type': 'go',
+				'request': 'launch',
+				'mode': 'debug',
+				'program': '${workspaceRoot}'
+			});
+		}
+		vscode.commands.executeCommand('vscode.startDebug', config);
+	}));
+
 	vscode.languages.setLanguageConfiguration(GO_MODE.language, {
 		indentationRules: {
 			// ^(.*\*/)?\s*\}.*$