vscode-go: remove references to gopkgs

Removed remaining references in the codebase to gopkgs.

For #258.

Change-Id: I9257b87316f193f960bd121bfdcc5cd890ac73d4
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/382475
Trust: Jamal Carvalho <jamal@golang.org>
Run-TryBot: Jamal Carvalho <jamal@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>

Author: jamalc

docs/settings.md

@@ -54,7 +54,6 @@ Alternate tools or alternate paths for the same tools used by the Go extension.
 | `dlv` | Alternate tool to use instead of the dlv binary or alternate path to use for the dlv binary. <br/> Default: `"dlv"` |
 | `go` | Alternate tool to use instead of the go binary or alternate path to use for the go binary. <br/> Default: `"go"` |
 | `go-outline` | Alternate tool to use instead of the go-outline binary or alternate path to use for the go-outline binary. <br/> Default: `"go-outline"` |
-| `gopkgs` | Alternate tool to use instead of the gopkgs binary or alternate path to use for the gopkgs binary. <br/> Default: `"gopkgs"` |
 | `gopls` | Alternate tool to use instead of the gopls binary or alternate path to use for the gopls binary. <br/> Default: `"gopls"` |
 ### `go.autocompleteUnimportedPackages`
 

docs/tools.md

@@ -38,10 +38,6 @@ For a comprehensive overview of how to debug your Go programs, please see the [d
 ### [`dlv-dap`](https://github.com/go-delve/delve)
 This extension requires an unstable version of [`dlv`](#dlv) when users opt in to use Delve's native DAP implementation. `dlv-dap` is a `dlv` built from the master, which includes unreleased features. Please see the documentation about [Dlv DAP - Delve's Native DAP implementation](./dlv-dap.md) for details.
 
-### [`gopkgs`](https://pkg.go.dev/github.com/uudashr/gopkgs?tab=overview)
-
-This tool provides autocompletion for unimported packages. Replacement of `gopkgs` with [`gopls`] is a work-in-progress. <!--TODO: reference to the issue-->
-
 ### [`go-outline`](https://pkg.go.dev/github.com/ramya-rao-a/go-outline?tab=overview)
 
 This tool provides the information needed to compute the various test code lenses. It will be replaced with [`gopls`]. <!--TODO: reference to the issue-->

docs/troubleshooting.md

@@ -18,7 +18,7 @@ Check the bottom of the VS Code window for any warnings and notifications. For e
 
 Run the [`Go: Locate Configured Go Tools`](commands.md#go-locate-configured-go-tools) command. The output is split into sections.
 
-In the first indented section, check that at least `gopkgs`, `go-outline`, `dlv`, and `gopls` are installed -- they're necessary for the extension's basic functionality. The other tools [provide optional features](tools.md) and are less important unless you need those features. You can install tools by running the [`Go: Install/Update Tools`](commands.md#go-installupdate-tools) command.
+In the first indented section, check that at least `go-outline`, `dlv`, and `gopls` are installed -- they're necessary for the extension's basic functionality. The other tools [provide optional features](tools.md) and are less important unless you need those features. You can install tools by running the [`Go: Install/Update Tools`](commands.md#go-installupdate-tools) command.
 
 Then, look at the `Workspace Folder` section(s) for the environment in use. Verify that `GOROOT` is set to a valid Go installation; if not, follow the [getting started guide](../README.md#install-go). If `GOPATH` is unset, or surprising, read more about [setting up your `GOPATH`](gopath.md#setting-gopath). Also, `GOMOD` should usually point to your project's `go.mod` file if you're in module mode. (More complicated workspace setups may have a blank `GOMOD`. See the `gopls` [workspace documentation](https://github.com/golang/tools/blob/master/gopls/doc/workspace.md) for more on valid workspace setups.) To change the workspace environment, use settings such as [`go.gopath`](settings.md#go.gopath) and [`go.toolsEnvVars`](settings.md#go.toolsEnvVars).
 

package.json

@@ -1963,11 +1963,6 @@
               "default": "go",
               "description": "Alternate tool to use instead of the go binary or alternate path to use for the go binary."
             },
-            "gopkgs": {
-              "type": "string",
-              "default": "gopkgs",
-              "description": "Alternate tool to use instead of the gopkgs binary or alternate path to use for the gopkgs binary."
-            },
             "gopls": {
               "type": "string",
               "default": "gopls",

src/goPackages.ts

@@ -12,7 +12,7 @@ import { toolExecutionEnvironment } from './goEnv';
 import { getBinPath, getCurrentGoPath, isVendorSupported } from './util';
 import { envPath, fixDriveCasingInWindows, getCurrentGoRoot, getCurrentGoWorkspaceFromGOPATH } from './utils/pathUtils';
 
-type GopkgsDone = (res: Map<string, PackageInfo>) => void;
+type GoListPkgsDone = (res: Map<string, PackageInfo>) => void;
 interface Cache {
 	entry: Map<string, PackageInfo>;
 	lastHit: number;
@@ -23,11 +23,11 @@ export interface PackageInfo {
 	isStd: boolean;
 }
 
-let gopkgsNotified = false;
+let goListPkgsNotified = false;
 let cacheTimeout = 5000;
 
-const gopkgsSubscriptions: Map<string, GopkgsDone[]> = new Map<string, GopkgsDone[]>();
-const gopkgsRunning: Set<string> = new Set<string>();
+const goListPkgsSubscriptions: Map<string, GoListPkgsDone[]> = new Map<string, GoListPkgsDone[]>();
+const goListPkgsRunning: Set<string> = new Set<string>();
 
 const allPkgsCache: Map<string, Cache> = new Map<string, Cache>();
 
@@ -87,28 +87,28 @@ function getAllPackagesNoCache(workDir: string): Promise<Map<string, PackageInfo
 			resolve(pkgMap);
 		};
 
-		let subs = gopkgsSubscriptions.get(workDir);
+		let subs = goListPkgsSubscriptions.get(workDir);
 		if (!subs) {
 			subs = [];
-			gopkgsSubscriptions.set(workDir, subs);
+			goListPkgsSubscriptions.set(workDir, subs);
 		}
 		subs.push(callback);
 
 		// Ensure only single gokpgs running
-		if (!gopkgsRunning.has(workDir)) {
-			gopkgsRunning.add(workDir);
+		if (!goListPkgsRunning.has(workDir)) {
+			goListPkgsRunning.add(workDir);
 
 			goListPkgs(workDir).then((pkgMap) => {
-				gopkgsRunning.delete(workDir);
-				gopkgsSubscriptions.delete(workDir);
+				goListPkgsRunning.delete(workDir);
+				goListPkgsSubscriptions.delete(workDir);
 				subs.forEach((cb) => cb(pkgMap));
 			});
 		}
 	});
 }
 
 /**
- * Runs gopkgs
+ * Runs `go list all std`
  * @argument workDir. The workspace directory of the project.
  * @returns Map<string, string> mapping between package import path and package name
  */
@@ -122,11 +122,11 @@ export async function getAllPackages(workDir: string): Promise<Map<string, Packa
 
 	const pkgs = await getAllPackagesNoCache(workDir);
 	if (!pkgs || pkgs.size === 0) {
-		if (!gopkgsNotified) {
+		if (!goListPkgsNotified) {
 			vscode.window.showInformationMessage(
 				'Could not find packages. Ensure `go list -f {{.Name}};{{.ImportPath}}` runs successfully.'
 			);
-			gopkgsNotified = true;
+			goListPkgsNotified = true;
 		}
 	}
 	allPkgsCache.set(workDir, {

src/goTools.ts

@@ -139,7 +139,6 @@ export function getConfiguredTools(
 	// Start with default tools that should always be installed.
 	for (const name of [
 		'gocode',
-		'gopkgs',
 		'go-outline',
 		'go-symbols',
 		'guru',

test/integration/extension.test.ts

@@ -761,59 +761,26 @@ It returns the number of bytes written and any write error encountered.
 		} // not working in module mode.
 		const vendorSupport = await isVendorSupported();
 		const filePath = path.join(fixturePath, 'vendoring', 'main.go');
-		const workDir = path.dirname(filePath);
 		const vendorPkgsFullPath = ['test/testfixture/vendoring/vendor/example/vendorpls'];
 		const vendorPkgsRelativePath = ['example/vendorpls'];
 
-		const gopkgsPromise = getAllPackages(workDir).then((pkgMap) => {
-			const pkgs = Array.from(pkgMap.keys()).filter((p) => {
-				const pkg = pkgMap.get(p);
-				return pkg && pkg.name !== 'main';
-			});
+		vscode.workspace.openTextDocument(vscode.Uri.file(filePath)).then(async (document) => {
+			await vscode.window.showTextDocument(document);
+			const pkgs = await listPackages();
 			if (vendorSupport) {
-				vendorPkgsFullPath.forEach((pkg) => {
-					assert.equal(pkgs.indexOf(pkg) > -1, true, `Package not found by goPkgs: ${pkg}`);
-				});
 				vendorPkgsRelativePath.forEach((pkg) => {
+					assert.equal(pkgs.indexOf(pkg) > -1, true, `Relative path for vendor package ${pkg} not found`);
+				});
+				vendorPkgsFullPath.forEach((pkg) => {
 					assert.equal(
 						pkgs.indexOf(pkg),
 						-1,
-						`Relative path to vendor package ${pkg} should not be returned by gopkgs command`
+						`Full path for vendor package ${pkg} should be shown by listPackages method`
 					);
 				});
 			}
 			return pkgs;
 		});
-
-		const listPkgPromise: Thenable<string[]> = vscode.workspace
-			.openTextDocument(vscode.Uri.file(filePath))
-			.then(async (document) => {
-				await vscode.window.showTextDocument(document);
-				const pkgs = await listPackages();
-				if (vendorSupport) {
-					vendorPkgsRelativePath.forEach((pkg) => {
-						assert.equal(pkgs.indexOf(pkg) > -1, true, `Relative path for vendor package ${pkg} not found`);
-					});
-					vendorPkgsFullPath.forEach((pkg) => {
-						assert.equal(
-							pkgs.indexOf(pkg),
-							-1,
-							`Full path for vendor package ${pkg} should be shown by listPackages method`
-						);
-					});
-				}
-				return pkgs;
-			});
-
-		const values = await Promise.all<string[]>([gopkgsPromise, listPkgPromise]);
-		if (!vendorSupport) {
-			const originalPkgs = values[0].sort();
-			const updatedPkgs = values[1].sort();
-			assert.equal(originalPkgs.length, updatedPkgs.length);
-			for (let index = 0; index < originalPkgs.length; index++) {
-				assert.equal(updatedPkgs[index], originalPkgs[index]);
-			}
-		}
 	});
 
 	test('Vendor pkgs from other projects should not be allowed to import', async function () {
@@ -824,44 +791,19 @@ It returns the number of bytes written and any write error encountered.
 		const filePath = path.join(fixturePath, 'baseTest', 'test.go');
 		const vendorPkgs = ['test/testfixture/vendoring/vendor/example/vendorpls'];
 
-		const gopkgsPromise = new Promise<void>((resolve, reject) => {
-			const cmd = cp.spawn(getBinPath('gopkgs'), ['-format', '{{.ImportPath}}'], {
-				env: process.env
-			});
-			const chunks: any[] = [];
-			cmd.stdout.on('data', (d) => chunks.push(d));
-			cmd.on('close', () => {
-				const pkgs = chunks
-					.join('')
-					.split('\n')
-					.filter((pkg) => pkg)
-					.sort();
-				if (vendorSupport) {
-					vendorPkgs.forEach((pkg) => {
-						assert.equal(pkgs.indexOf(pkg) > -1, true, `Package not found by goPkgs: ${pkg}`);
-					});
-				}
-				return resolve();
-			});
+		vscode.workspace.openTextDocument(vscode.Uri.file(filePath)).then(async (document) => {
+			await vscode.window.showTextDocument(document);
+			const pkgs = await listPackages();
+			if (vendorSupport) {
+				vendorPkgs.forEach((pkg) => {
+					assert.equal(
+						pkgs.indexOf(pkg),
+						-1,
+						`Vendor package ${pkg} should not be shown by listPackages method`
+					);
+				});
+			}
 		});
-
-		const listPkgPromise: Thenable<void> = vscode.workspace
-			.openTextDocument(vscode.Uri.file(filePath))
-			.then(async (document) => {
-				await vscode.window.showTextDocument(document);
-				const pkgs = await listPackages();
-				if (vendorSupport) {
-					vendorPkgs.forEach((pkg) => {
-						assert.equal(
-							pkgs.indexOf(pkg),
-							-1,
-							`Vendor package ${pkg} should not be shown by listPackages method`
-						);
-					});
-				}
-			});
-
-		return Promise.all<void>([gopkgsPromise, listPkgPromise]);
 	});
 
 	test('Workspace Symbols', () => {