Support multiple build tags #1355

microsoft · Nov 21, 2017 · 328c6e0 · 328c6e0
1 parent a8a68e2
commit 328c6e0
Show file tree

Hide file tree

Showing 8 changed files with 861 additions and 804 deletions.
diff --git a/src/goBuild.ts b/src/goBuild.ts
@@ -58,7 +58,7 @@ export function goBuild(fileUri: vscode.Uri, goConfig: vscode.WorkspaceConfigura
 	buildArgs.push('-i', '-o', tmpPath, ...buildFlags);
 	if (goConfig['buildTags'] && buildFlags.indexOf('-tags') === -1) {
 		buildArgs.push('-tags');
-		buildArgs.push('"' + goConfig['buildTags'] + '"');
+		buildArgs.push(goConfig['buildTags']);
 	}
 
 	if (buildWorkspace && currentWorkspace && !isTestFile) {

diff --git a/src/goDeclaration.ts b/src/goDeclaration.ts
@@ -136,7 +136,7 @@ function definitionLocation_gogetdoc(document: vscode.TextDocument, position: vs
 
 		let gogetdocFlagsWithoutTags = ['-u', '-json', '-modified', '-pos', document.fileName + ':#' + offset.toString()];
 		let buildTags = vscode.workspace.getConfiguration('go', document.uri)['buildTags'];
-		let gogetdocFlags = (buildTags && useTags) ? [...gogetdocFlagsWithoutTags, '-tags', '"' + buildTags + '"'] : gogetdocFlagsWithoutTags;
+		let gogetdocFlags = (buildTags && useTags) ? [...gogetdocFlagsWithoutTags, '-tags', buildTags] : gogetdocFlagsWithoutTags;
 		p = cp.execFile(gogetdoc, gogetdocFlags, { env }, (err, stdout, stderr) => {
 			try {
 				if (err && (<any>err).code === 'ENOENT') {

diff --git a/src/goImplementations.ts b/src/goImplementations.ts
@@ -54,8 +54,9 @@ export class GoImplementationProvider implements vscode.ImplementationProvider {
 				let cwd = path.dirname(filename);
 				let offset = byteOffsetAt(document, position);
 				let goGuru = getBinPath('guru');
-				let buildTags = '"' + vscode.workspace.getConfiguration('go', document.uri)['buildTags'] + '"';
-				let args = ['-scope', `${scope}/...`, '-json', '-tags', buildTags, 'implements', `${filename}:#${offset.toString()}`];
+				const buildTags = vscode.workspace.getConfiguration('go', document.uri)['buildTags'];
+				let args = buildTags ? ['-tags', buildTags] : [];
+				args.push('-scope', `${scope}/...`, '-json', 'implements', `${filename}:#${offset.toString()}`);
 
 				let guruProcess = cp.execFile(goGuru, args, { env }, (err, stdout, stderr) => {
 					if (err && (<any>err).code === 'ENOENT') {

diff --git a/src/goInstall.ts b/src/goInstall.ts
@@ -29,7 +29,7 @@ export function installCurrentPackage() {
 	const args = ['install', ...buildFlags];
 
 	if (goConfig['buildTags'] && buildFlags.indexOf('-tags') === -1) {
-		args.push('-tags', '"' + goConfig['buildTags'] + '"');
+		args.push('-tags', goConfig['buildTags']);
 	}
 
 	// Find the right importPath instead of directly using `.`. Fixes https://github.com/Microsoft/vscode-go/issues/846

diff --git a/src/goReferences.ts b/src/goReferences.ts
@@ -35,9 +35,11 @@ export class GoReferenceProvider implements vscode.ReferenceProvider {
 			let cwd = path.dirname(filename);
 			let offset = byteOffsetAt(document, position);
 			let env = getToolsEnvVars();
-			let buildTags = '"' + vscode.workspace.getConfiguration('go', document.uri)['buildTags'] + '"';
+			let buildTags = vscode.workspace.getConfiguration('go', document.uri)['buildTags'];
+			let args = buildTags ? ['-tags', buildTags] : [];
+			args.push('-modified', 'referrers', `${filename}:#${offset.toString()}`);
 
-			let process = cp.execFile(goGuru, ['-modified', '-tags', buildTags, 'referrers', `${filename}:#${offset.toString()}`], { env }, (err, stdout, stderr) => {
+			let process = cp.execFile(goGuru, args, { env }, (err, stdout, stderr) => {
 				try {
 					if (err && (<any>err).code === 'ENOENT') {
 						promptForMissingTool('guru');

diff --git a/src/goRename.ts b/src/goRename.ts
@@ -27,8 +27,11 @@ export class GoRenameProvider implements vscode.RenameProvider {
 			let offset = byteOffsetAt(document, pos);
 			let env = getToolsEnvVars();
 			let gorename = getBinPath('gorename');
-			let buildTags = '"' + vscode.workspace.getConfiguration('go', document.uri)['buildTags'] + '"';
-			let gorenameArgs = ['-offset', filename + ':#' + offset, '-to', newName, '-tags', buildTags];
+			const buildTags = vscode.workspace.getConfiguration('go', document.uri)['buildTags'] ;
+			let gorenameArgs = ['-offset', filename + ':#' + offset, '-to', newName];
+			if (buildTags) {
+				gorenameArgs.push('-tags', buildTags);
+			}
 			let canRenameToolUseDiff = isDiffToolAvailable();
 			if (canRenameToolUseDiff) {
 				gorenameArgs.push('-d');

diff --git a/test/fixtures/buildTags/hello.go b/test/fixtures/buildTags/hello.go
@@ -0,0 +1,9 @@
+// +build randomtag
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Prinln("hello")
+}
diff --git a/test/go.test.ts b/test/go.test.ts