extension/src: remove unused input gopls config parameter

Change-Id: I640dc6a999a4ed58ef740edf4cb67b22a8b94f85
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/713201
Reviewed-by: Madeline Kalil <[email protected]>
Auto-Submit: Hongxiang Jiang <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>

Author: h9jiang

extension/src/commands/getConfiguredGoTools.ts

@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import path from 'path';
 
 import { CommandFactory } from '.';
-import { getGoConfig, getGoplsConfig } from '../config';
+import { getGoConfig } from '../config';
 import { inspectGoToolVersion } from '../goInstallTools';
 import { getConfiguredTools } from '../goTools';
 import { getBinPath, getCurrentGoPath, getGoEnv, getGoVersion, getToolsGopath } from '../util';
@@ -40,7 +40,7 @@ export const getConfiguredGoTools: CommandFactory = () => {
 		buf.push('\n## Tools\n');
 		try {
 			const goVersion = await getGoVersion();
-			const allTools = getConfiguredTools(getGoConfig(), getGoplsConfig());
+			const allTools = getConfiguredTools(getGoConfig());
 			const goVersionTooOld = goVersion?.lt('1.18') || false;
 
 			buf.push(`\tgo:\t${goVersion?.binaryPath}: ${goVersion?.version}`);

extension/src/goExplorer.ts

@@ -6,7 +6,7 @@ import vscode = require('vscode');
 import vscodeUri = require('vscode-uri');
 import os = require('os');
 import path = require('path');
-import { getGoConfig, getGoplsConfig } from './config';
+import { getGoConfig } from './config';
 import { getBinPath } from './util';
 import { getConfiguredTools } from './goTools';
 import { inspectGoToolVersion } from './goInstallTools';
@@ -159,7 +159,7 @@ export class GoExplorerProvider implements vscode.TreeDataProvider<vscode.TreeIt
 	}
 
 	private async toolTreeItems() {
-		const allTools = getConfiguredTools(getGoConfig(), getGoplsConfig());
+		const allTools = getConfiguredTools(getGoConfig());
 		const toolsInfo = await Promise.all(allTools.map((tool) => this.toolDetailCache.get(tool.name)));
 		const items = [];
 		for (const t of toolsInfo) {

extension/src/goInstallTools.ts

@@ -71,7 +71,7 @@ export const defaultToolsManager: IToolsManager = {
 
 export async function installAllTools(updateExistingToolsOnly = false) {
 	const goVersion = await getGoVersion();
-	let allTools = getConfiguredTools(getGoConfig(), getGoplsConfig());
+	let allTools = getConfiguredTools(getGoConfig());
 
 	// exclude tools replaced by alternateTools.
 	const alternateTools: { [key: string]: string } = getGoConfig().get('alternateTools') ?? {};
@@ -701,7 +701,7 @@ async function updateImportantToolsStatus(tm: IToolsManager = defaultToolsManage
  * If matcher is provided, only the tools that match the filter will be checked.
  */
 function getMissingTools(matcher?: (value: Tool) => boolean): Promise<Tool[]> {
-	let keys = getConfiguredTools(getGoConfig(), getGoplsConfig());
+	let keys = getConfiguredTools(getGoConfig());
 	if (matcher) {
 		keys = keys.filter(matcher);
 	}
@@ -883,7 +883,7 @@ export async function suggestUpdates() {
 		return;
 	}
 
-	const allTools = getConfiguredTools(getGoConfig(), getGoplsConfig());
+	const allTools = getConfiguredTools(getGoConfig());
 	const toolsToUpdate = await listOutdatedTools(configuredGoVersion, allTools);
 	if (toolsToUpdate.length === 0) {
 		return;

extension/src/goTools.ts

@@ -111,10 +111,7 @@ export function hasModSuffix(tool: Tool): boolean {
 	return tool.name.endsWith('-gomod');
 }
 
-export function getConfiguredTools(
-	goConfig: vscode.WorkspaceConfiguration,
-	goplsConfig: vscode.WorkspaceConfiguration
-): Tool[] {
+export function getConfiguredTools(goConfig: vscode.WorkspaceConfiguration): Tool[] {
 	// If language server is enabled, don't suggest tools that are replaced by gopls.
 	// TODO(github.com/golang/vscode-go/issues/388): decide what to do when
 	// the go version is no longer supported by gopls while the legacy tools are

extension/test/integration/goExplorer.test.ts

@@ -6,7 +6,7 @@
 import assert from 'assert';
 import path from 'path';
 import { TreeItem, Uri, window, workspace } from 'vscode';
-import { getGoConfig, getGoplsConfig } from '../../src/config';
+import { getGoConfig } from '../../src/config';
 
 import { GoExplorerProvider } from '../../src/goExplorer';
 import { getConfiguredTools } from '../../src/goTools';
@@ -68,7 +68,7 @@ suite('GoExplorerProvider', () => {
 	});
 
 	test('tools tree items', async () => {
-		const allTools = getConfiguredTools(getGoConfig(), getGoplsConfig());
+		const allTools = getConfiguredTools(getGoConfig());
 		const expectTools = allTools.map((t) => t.name);
 		const [, tools] = await explorer.getChildren()!;
 		const items = (await explorer.getChildren(tools)) as TreeItem[];

extension/test/integration/install.test.ts

@@ -29,7 +29,7 @@ import vscode = require('vscode');
 import { allToolsInformation } from '../../src/goToolsInformation';
 import * as goInstallTools from '../../src/goInstallTools';
 import * as utilModule from '../../src/util';
-import { getGoConfig, getGoplsConfig } from '../../src/config';
+import { getGoConfig } from '../../src/config';
 import { MockWorkspaceConfiguration } from './mocks/configuration';
 
 interface installationTestCase {
@@ -361,8 +361,7 @@ suite('getConfiguredTools', () => {
 			new MockWorkspaceConfiguration(
 				getGoConfig(),
 				new Map<string, any>([['useLanguageServer', true]])
-			),
-			new MockWorkspaceConfiguration(getGoplsConfig())
+			)
 		);
 		const got = configured.map((tool) => tool.name) ?? [];
 		assert(got.includes('gopls'), `omitted 'gopls': ${JSON.stringify(got)}`);
@@ -373,8 +372,7 @@ suite('getConfiguredTools', () => {
 			new MockWorkspaceConfiguration(
 				getGoConfig(),
 				new Map<string, any>([['useLanguageServer', false]])
-			),
-			new MockWorkspaceConfiguration(getGoplsConfig())
+			)
 		);
 		const got = configured.map((tool) => tool.name) ?? [];
 		assert(!got.includes('gopls'), `suggested 'gopls': ${JSON.stringify(got)}`);