Skip to content

Commit 8aab1a2

Browse files
committed
src/util.ts: fix go version output parsing
We need to use the matched group for version and commit hash, not the entire matched go version output. Change-Id: I8688bb721c5d9914868f4611d87361e7ffe4157b Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/245397 Reviewed-by: Rebecca Stambler <[email protected]>
1 parent 8be259b commit 8aab1a2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/util.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ export class GoVersion {
8989
const matchesRelease = /go version go(\d.\d+).*/.exec(version);
9090
const matchesDevel = /go version devel \+(.[a-zA-Z0-9]+).*/.exec(version);
9191
if (matchesRelease) {
92-
const sv = semver.coerce(matchesRelease[0]);
92+
const sv = semver.coerce(matchesRelease[1]);
9393
if (sv) {
9494
this.sv = sv;
9595
}
9696
} else if (matchesDevel) {
9797
this.isDevel = true;
98-
this.commit = matchesDevel[0];
98+
this.commit = matchesDevel[1];
9999
}
100100
}
101101

@@ -318,7 +318,7 @@ export async function getGoVersion(): Promise<GoVersion | undefined> {
318318
if (cachedGoVersion.isValid()) {
319319
return Promise.resolve(cachedGoVersion);
320320
}
321-
warn(`cached Go version (${cachedGoVersion}) is invalid, recomputing`);
321+
warn(`cached Go version (${JSON.stringify(cachedGoVersion)}) is invalid, recomputing`);
322322
}
323323
try {
324324
const execFile = util.promisify(cp.execFile);

0 commit comments

Comments
 (0)