fix workspaceModCache hit

microsoft · Jan 11, 2019 · df67b14 · df67b14
1 parent ed66642
commit df67b14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/goDeclaration.ts b/src/goDeclaration.ts
@@ -155,6 +155,9 @@ function definitionLocation_godef(input: GoDefinitionInput, token: vscode.Cancel
 				reject(e);
 			}
 		});
+		if (p.pid) {
+			p.stdin.end(input.document.getText());
+		}
 	});
 }
 

diff --git a/src/goModules.ts b/src/goModules.ts
@@ -22,12 +22,12 @@ export function getModPath(fileuri: vscode.Uri): Promise<string> {
 		return Promise.resolve(hit);
 	}
 
-	workspaceModCache.forEach((v, k) => {
+	for (let k of Array.from(workspaceModCache.keys())) {
 		if (folderPath.startsWith(k)) {
 			folderModCache.set(folderPath, k);
 			return Promise.resolve(k);
 		}
-	});
+	}
 
 	return getGoVersion().then(value => {
 		if (value && (value.major !== 1 || value.minor < 11)) {
@@ -40,9 +40,9 @@ export function getModPath(fileuri: vscode.Uri): Promise<string> {
 			if (!goExecutable) {
 				return Promise.reject(new Error('Cannot find "go" binary. Update PATH or GOROOT appropriately.'));
 			}
-			cp.execFile(goExecutable, ['env', 'GOMOD'], { cwd: folderPath, env: getToolsEnvVars() }, (err, stdout) => {
+			cp.execFile(goExecutable, ['list', '-m', '-f', '{{.GoMod}}'], { cwd: folderPath, env: getToolsEnvVars() }, (err, stdout) => {
 				if (err) {
-					console.warn(`Error when running go env GOMOD: ${err}`);
+					console.warn(`Error when running go list -m -f {{.GoMod}}: ${err}`);
 					resolve('');
 				}
 				let [goMod] = stdout.split('\n');