From a8724f132ab02e95b9f52e19705ac7acf43de446 Mon Sep 17 00:00:00 2001 From: "Hana (Hyang-Ah) Kim" Date: Tue, 14 Jul 2020 17:21:43 -0400 Subject: [PATCH] all: remove special casing for go versions older than 1.9 Also, remove the reference to nsf/gocode used for go1.8 or older in the doc. Change-Id: Ic09867446640a70994baa3940a1e8cacb1e03104 Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/242644 Reviewed-by: Rebecca Stambler --- docs/tools.md | 1 - src/testUtils.ts | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/docs/tools.md b/docs/tools.md index a99ea960d5..8a620aa2ef 100644 --- a/docs/tools.md +++ b/docs/tools.md @@ -56,7 +56,6 @@ Code completion is provided by `gocode`. It is the only tool that runs as a serv Different versions of `gocode` are used depending on your version of Go. -* Go 1.8 and below: [nsf/gocode](https://github.com/nsf/gocode) * Go 1.9 and above: [mdempsky/gocode](https://github.com/mdempsky/gocode) * Go 1.11 and above, with modules enabled: [stamblerre/gocode](https://github.com/stamblerre/gocode) * This version of `gocode` does not have any caching, so if you find it slow, consider using [gopls] instead. diff --git a/src/testUtils.ts b/src/testUtils.ts index f84a9e247c..50965e860a 100644 --- a/src/testUtils.ts +++ b/src/testUtils.ts @@ -302,14 +302,8 @@ export async function goTest(testconfig: TestConfig): Promise { } if (testconfig.includeSubDirectories) { pkgMapPromise = getGoVersion().then((goVersion) => { - if (goVersion.gt('1.8')) { - targets = ['./...']; - return null; // We dont need mapping, as we can derive the absolute paths from package path - } - return getNonVendorPackages(testconfig.dir).then((pkgMap) => { - targets = Array.from(pkgMap.keys()); - return pkgMap; // We need the individual package paths to pass to `go test` - }); + targets = ['./...']; + return null; // We dont need mapping, as we can derive the absolute paths from package path }); } }