test/integration/goDebug: enable set cwd tests for dlv dap

Enable the working directory tests for dlv dap. This also
copies the value of the "cwd" attribute in the launch config
to "wd", since that is the attribute expected by dlv dap.

Change-Id: If451f5d55fa43275490407d2138d4326a558e63b
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/305532
Trust: Suzy Mueller <[email protected]>
Run-TryBot: Suzy Mueller <[email protected]>
TryBot-Result: kokoro <[email protected]>
Reviewed-by: Hyang-Ah Hana Kim <[email protected]>

Author: suzmue

src/goDebugConfiguration.ts

@@ -254,6 +254,11 @@ export class GoDebugConfigurationProvider implements vscode.DebugConfigurationPr
 			dlvDAPVersionCurrent = true;
 		}
 
+		if (debugAdapter === 'dlv-dap' && debugConfiguration['cwd']) {
+			// dlv dap expects 'wd' not 'cwd'
+			debugConfiguration['wd'] = debugConfiguration['cwd'];
+		}
+
 		if (debugConfiguration['mode'] === 'auto') {
 			debugConfiguration['mode'] =
 				activeEditor && activeEditor.document.fileName.endsWith('_test.go') ? 'test' : 'debug';

src/goInstallTools.ts

@@ -308,7 +308,7 @@ export function declinedToolInstall(toolName: string) {
 	const tool = getTool(toolName);
 
 	// If user has declined to install this tool, don't prompt for it.
-	return !!containsTool(declinedInstalls, tool)
+	return !!containsTool(declinedInstalls, tool);
 }
 
 export async function promptForMissingTool(toolName: string) {

test/integration/goDebug.test.ts

@@ -692,11 +692,7 @@ const testAll = (isDlvDap: boolean) => {
 	});
 
 	suite('set current working directory', () => {
-		test('should debug program with cwd set', async function () {
-			if (isDlvDap && dlvDapSkipsEnabled) {
-				this.skip(); // Fixed in https://github.com/go-delve/delve/pull/2360
-			}
-
+		test('should debug program with cwd set', async () => {
 			const WD = path.join(DATA_ROOT, 'cwdTest');
 			const PROGRAM = path.join(WD, 'cwdTest');
 			const FILE = path.join(PROGRAM, 'main.go');
@@ -735,11 +731,7 @@ const testAll = (isDlvDap: boolean) => {
 			await assertLocalVariableValue('strdat', '"Goodbye, World."');
 		});
 
-		test('should debug file program with cwd set', async function () {
-			if (isDlvDap && dlvDapSkipsEnabled) {
-				this.skip(); // Fixed in https://github.com/go-delve/delve/pull/2360
-			}
-
+		test('should debug file program with cwd set', async () => {
 			const WD = path.join(DATA_ROOT, 'cwdTest');
 			const PROGRAM = path.join(WD, 'cwdTest', 'main.go');
 			const FILE = PROGRAM;
@@ -1805,6 +1797,8 @@ const testAll = (isDlvDap: boolean) => {
 
 	async function initializeDebugConfig(config: DebugConfiguration) {
 		if (isDlvDap) {
+			config['debugAdapter'] = 'dlv-dap';
+			// Log the output for easier test debugging.
 			config['logOutput'] = 'dap';
 			config['showLog'] = true;
 		}