Fix casing issue in Windows when finding GOPATH

microsoft · Oct 2, 2017 · e231f52 · e231f52
1 parent f341ae0
commit e231f52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/testUtils.ts b/src/testUtils.ts
@@ -127,7 +127,7 @@ export function goTest(testconfig: TestConfig): Thenable<boolean> {
 			return Promise.resolve();
 		}
 
-		// append the package name to args if applicable
+		// Append the package name to args to enable running tests in symlinked directories
 		let currentGoWorkspace = getCurrentGoWorkspaceFromGOPATH(getCurrentGoPath(), testconfig.dir);
 		if (currentGoWorkspace && !testconfig.includeSubDirectories) {
 			args.push(testconfig.dir.substr(currentGoWorkspace.length + 1));

diff --git a/src/util.ts b/src/util.ts
@@ -328,7 +328,11 @@ export function getCurrentGoPath(workspaceUri?: vscode.Uri): string {
 		workspaceUri = vscode.workspace.getWorkspaceFolder(vscode.window.activeTextEditor.document.uri).uri;
 	}
 	const config = vscode.workspace.getConfiguration('go', workspaceUri);
-	const currentRoot = workspaceUri ? workspaceUri.fsPath : vscode.workspace.rootPath;
+	let currentRoot = workspaceUri ? workspaceUri.fsPath : vscode.workspace.rootPath;
+	// Workaround for issue in https://github.com/Microsoft/vscode/issues/9448#issuecomment-244804026
+	if (process.platform === 'win32') {
+		currentRoot = currentRoot.substr(0, 1).toUpperCase() + currentRoot.substr(1);
+	}
 	const configGopath = config['gopath'] ? resolvePath(config['gopath'], currentRoot) : '';
 	const inferredGopath = config['inferGopath'] === true ? getInferredGopath(currentRoot) : '';