Skip to content

Commit 5c1eda7

Browse files
committed
src/goModules: delete unused functions
promptToUpdateToolForModules is not being referenced. Delete it. And delete the prompt that warns about goreturns. For #2799 Change-Id: Ib89eeb0e73ac8e2466e8d87b7c1fcd60728dc7c6 Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/535095 Reviewed-by: Suzy Mueller <[email protected]> Commit-Queue: Hyang-Ah Hana Kim <[email protected]> TryBot-Result: kokoro <[email protected]>
1 parent 340f78b commit 5c1eda7

File tree

1 file changed

+0
-62
lines changed

1 file changed

+0
-62
lines changed

src/goModules.ts

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@ import path = require('path');
99
import util = require('util');
1010
import vscode = require('vscode');
1111
import vscodeUri = require('vscode-uri');
12-
import { getGoConfig } from './config';
1312
import { toolExecutionEnvironment } from './goEnv';
14-
import { getFormatTool } from './language/legacy/goFormat';
15-
import { installTools } from './goInstallTools';
1613
import { outputChannel } from './goStatus';
17-
import { getTool } from './goTools';
18-
import { getFromGlobalState, updateGlobalState } from './stateUtils';
1914
import { getBinPath, getGoVersion, getModuleCache, getWorkspaceFolderPath } from './util';
2015
import { getEnvPath, fixDriveCasingInWindows, getCurrentGoRoot } from './utils/pathUtils';
2116
import { CommandFactory } from './commands';
@@ -77,68 +72,11 @@ export async function getModFolderPath(fileuri?: vscode.Uri, isDir?: boolean): P
7772
goModEnvJSON['GOMOD'] === '/dev/null' || goModEnvJSON['GOMOD'] === 'NUL' ? '' : goModEnvJSON['GOMOD'];
7873
if (goModEnvResult) {
7974
goModEnvResult = path.dirname(goModEnvResult);
80-
const goConfig = getGoConfig(fileuri);
81-
if (goConfig['useLanguageServer'] === false && getFormatTool(goConfig) === 'goreturns') {
82-
const promptFormatToolMsg =
83-
'The goreturns tool does not support Go modules. Please update the "formatTool" setting to "goimports".';
84-
promptToUpdateToolForModules('switchFormatToolToGoimports', promptFormatToolMsg, goConfig);
85-
}
8675
}
8776
packagePathToGoModPathMap[pkgPath] = goModEnvResult;
8877
return goModEnvResult;
8978
}
9079

91-
const promptedToolsForCurrentSession = new Set<string>();
92-
export async function promptToUpdateToolForModules(
93-
tool: string,
94-
promptMsg: string,
95-
goConfig?: vscode.WorkspaceConfiguration
96-
): Promise<boolean> {
97-
if (promptedToolsForCurrentSession.has(tool)) {
98-
return false;
99-
}
100-
const promptedToolsForModules = getFromGlobalState('promptedToolsForModules', {});
101-
if (promptedToolsForModules[tool]) {
102-
return false;
103-
}
104-
const goVersion = await getGoVersion();
105-
const selected = await vscode.window.showInformationMessage(promptMsg, 'Update', 'Later', "Don't show again");
106-
let choseToUpdate = false;
107-
switch (selected) {
108-
case 'Update':
109-
choseToUpdate = true;
110-
if (!goConfig) {
111-
goConfig = getGoConfig();
112-
}
113-
await installTools([getTool(tool)], goVersion);
114-
switch (tool) {
115-
case 'switchFormatToolToGoimports':
116-
goConfig.update('formatTool', 'goimports', vscode.ConfigurationTarget.Global);
117-
break;
118-
case 'gopls':
119-
if (goConfig.get('useLanguageServer') === false) {
120-
goConfig.update('useLanguageServer', true, vscode.ConfigurationTarget.Global);
121-
}
122-
if (goConfig.inspect('useLanguageServer')?.workspaceFolderValue === false) {
123-
goConfig.update('useLanguageServer', true, vscode.ConfigurationTarget.WorkspaceFolder);
124-
}
125-
break;
126-
}
127-
promptedToolsForModules[tool] = true;
128-
updateGlobalState('promptedToolsForModules', promptedToolsForModules);
129-
break;
130-
case "Don't show again":
131-
promptedToolsForModules[tool] = true;
132-
updateGlobalState('promptedToolsForModules', promptedToolsForModules);
133-
break;
134-
case 'Later':
135-
default:
136-
promptedToolsForCurrentSession.add(tool);
137-
break;
138-
}
139-
return choseToUpdate;
140-
}
141-
14280
const folderToPackageMapping: { [key: string]: string } = {};
14381
export async function getCurrentPackage(cwd: string): Promise<string> {
14482
if (folderToPackageMapping[cwd]) {

0 commit comments

Comments
 (0)