Pass build flags & args from testFlags separately to dlv #2115

src/goRunTestCodelens.ts

@@ -6,11 +6,10 @@
 'use strict';
 
 import vscode = require('vscode');
-import path = require('path');
 import { CancellationToken, CodeLens, Command, TextDocument } from 'vscode';
 import { GoBaseCodeLensProvider } from './goBaseCodelens';
 import { GoDocumentSymbolProvider } from './goOutline';
-import { getBenchmarkFunctions, getTestFlags, getTestFunctionDebugArgs, getTestFunctions, getTestTags } from './testUtils';
+import { getBenchmarkFunctions, getTestFunctions } from './testUtils';
 import { getCurrentGoPath, getGoConfig } from './util';
 
 export class GoRunTestCodeLensProvider extends GoBaseCodeLensProvider {
@@ -84,16 +83,6 @@ export class GoRunTestCodeLensProvider extends GoBaseCodeLensProvider {
 	private async getCodeLensForFunctions(vsConfig: vscode.WorkspaceConfiguration, document: TextDocument, token: CancellationToken): Promise<CodeLens[]> {
 		const codelens: CodeLens[] = [];
 
-		const program = path.dirname(document.fileName);
-		const env = Object.assign({}, this.debugConfig.env, vsConfig['testEnvVars']);
-		const envFile = vsConfig['testEnvFile'];
-		const buildFlags = getTestFlags(vsConfig);
-		const tags = getTestTags(vsConfig);
-		if (tags && buildFlags.indexOf('-tags') === -1) {
-			buildFlags.push('-tags', tags);
-		}
-		const currentDebugConfig = Object.assign({}, this.debugConfig, { program, env, envFile, buildFlags: buildFlags.map(x => `'${x}'`).join(' ') });
-
 		const testPromise = getTestFunctions(document, token).then(testFunctions => {
 			testFunctions.forEach(func => {
 				const runTestCmd: Command = {
@@ -104,11 +93,10 @@ export class GoRunTestCodeLensProvider extends GoBaseCodeLensProvider {
 
 				codelens.push(new CodeLens(func.range, runTestCmd));
 
-				const args = getTestFunctionDebugArgs(document, func.name, testFunctions);
 				const debugTestCmd: Command = {
 					title: 'debug test',
-					command: 'go.debug.startSession',
-					arguments: [Object.assign({}, currentDebugConfig, { args })]
+					command: 'go.debug.cursor',
+					arguments: [{ functionName: func.name }]
 				};
 
 				codelens.push(new CodeLens(func.range, debugTestCmd));
@@ -127,8 +115,8 @@ export class GoRunTestCodeLensProvider extends GoBaseCodeLensProvider {
 
 				const debugTestCmd: Command = {
 					title: 'debug benchmark',
-					command: 'go.debug.startSession',
-					arguments: [Object.assign({}, currentDebugConfig, { args: ['-test.bench', '^' + func.name + '$', '-test.run', 'a^'] })]
+					command: 'go.debug.cursor',
+					arguments: [{ functionName: func.name }]
 				};
 
 				codelens.push(new CodeLens(func.range, debugTestCmd));

src/goTest.ts

@@ -97,6 +97,21 @@ async function runTestAtCursor(editor: vscode.TextEditor, testFunctionName: stri
 async function debugTestAtCursor(editor: vscode.TextEditor, testFunctionName: string, testFunctions: vscode.DocumentSymbol[], goConfig: vscode.WorkspaceConfiguration) {
 
 	const args = getTestFunctionDebugArgs(editor.document, testFunctionName, testFunctions);
+	const tags = getTestTags(goConfig);
+	const buildFlags = tags ? ['-tags', tags] : [];
+	const flagsFromConfig = getTestFlags(goConfig);
+	let foundArgsFlag = false;
+	flagsFromConfig.forEach(x => {
+		if (foundArgsFlag) {
+			args.push(x);
+			return;
+		}
+		if (x === '-args') {
+			foundArgsFlag = true;
+			return;
+		}
+		buildFlags.push(x);
+	});
 	const workspaceFolder = vscode.workspace.getWorkspaceFolder(editor.document.uri);
 	const debugConfig: vscode.DebugConfiguration = {
 		name: 'Debug Test',
@@ -107,7 +122,7 @@ async function debugTestAtCursor(editor: vscode.TextEditor, testFunctionName: st
 		env: goConfig.get('testEnvVars', {}),
 		envFile: goConfig.get('testEnvFile'),
 		args,
-		buildFlags: ['-tags', getTestTags(goConfig)].join(' ')
+		buildFlags: buildFlags.join(' ')
 	};
 	return await vscode.debug.startDebugging(workspaceFolder, debugConfig);
 }

src/testUtils.ts

@@ -138,6 +138,9 @@ export function extractInstanceTestName(symbolName: string): string {
  * @param testFunctions The test functions found in the document
  */
 export function getTestFunctionDebugArgs(document: vscode.TextDocument, testFunctionName: string, testFunctions: vscode.DocumentSymbol[]): string[] {
+	if (benchmarkRegex.test(testFunctionName)) {
+		return ['-test.bench', '^' + testFunctionName + '$', '-test.run', 'a^'];
+	}
 	const instanceMethod = extractInstanceTestName(testFunctionName);
 	if (instanceMethod) {
 		const testFns = findAllTestSuiteRuns(document, testFunctions);