From 38331b78292341bb082a14a40695b99d011bc23c Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Thu, 2 Feb 2017 19:23:11 -0800
Subject: [PATCH] Set workspaceroot as default for program attr

---
 package.json                | 4 ++--
 src/debugAdapter/goDebug.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 1b3d7b38e..87320f1be 100644
--- a/package.json
+++ b/package.json
@@ -174,8 +174,8 @@
             "properties": {
               "program": {
                 "type": "string",
-                "description": "Workspace relative path to the program folder (or any file within that folder) when in 'debug' or 'test' mode, and to the pre-built binary file to debug in 'exec' mode.",
-                "default": "."
+                "description": "Path to the program folder (or any file within that folder) when in 'debug' or 'test' mode, and to the pre-built binary file to debug in 'exec' mode.",
+                "default": "${workspaceRoot}"
               },
               "mode": {
                 "enum": [
diff --git a/src/debugAdapter/goDebug.ts b/src/debugAdapter/goDebug.ts
index 3e7d51a9b..826f1d7f7 100644
--- a/src/debugAdapter/goDebug.ts
+++ b/src/debugAdapter/goDebug.ts
@@ -190,7 +190,7 @@ class Delve {
 			let dlv = getBinPathWithPreferredGopath('dlv', env['GOPATH']);
 
 			if (!existsSync(dlv)) {
-				verbose(`Couldnt find dlv at ${process.env["GOPATH"]}${env['GOPATH'] ? ", " + env['GOPATH'] : ""} or ${process.env["PATH"]}`);
+				verbose(`Couldnt find dlv at ${process.env['GOPATH']}${env['GOPATH'] ? ', ' + env['GOPATH'] : ''} or ${process.env['PATH']}`);
 				return reject(`Cannot find Delve debugger. Ensure it is in your "GOPATH/bin" or "PATH".`);
 			}
 			verbose('Using dlv at: ' + dlv);