Skip to content

Commit 137073b

Browse files
committed
remove more go-langserver checks
1 parent 873d6c5 commit 137073b

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/goInstallTools.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ export function installTools(missing: Tool[], goVersion: GoVersion): Promise<voi
271271
outputChannel.appendLine(''); // Blank line for spacing
272272
const failures = res.filter((x) => x != null);
273273
if (failures.length === 0) {
274-
if (containsString(missing, 'go-langserver') || containsString(missing, 'gopls')) {
275-
outputChannel.appendLine('Reload VS Code window to use the Go language server');
274+
if (containsString(missing, 'gopls')) {
275+
outputChannel.appendLine('Reload VS Code window to use the Go language server.');
276276
}
277277
outputChannel.appendLine('All tools successfully installed. You are ready to Go :).');
278278
return;

src/goLanguageServer.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,7 @@ export function getLanguageServerToolPath(): string {
305305
const goplsAlternate = goConfig['alternateTools']['gopls'];
306306

307307
// Check if the user has set the deprecated "go-langserver" setting.
308-
const golangserverAlternate = goConfig['alternateTools']['go-langserver'];
309-
if (golangserverAlternate) {
308+
if (goConfig['alternateTools']['go-langserver']) {
310309
vscode.window.showErrorMessage(`The "go.alternateTools" setting for "go-langserver" has been deprecated.
311310
Please set "gopls" instead, and then reload the VS Code window.`);
312311
return;
@@ -325,8 +324,7 @@ Please set "gopls" instead, and then reload the VS Code window.`);
325324
return languageServerBinPath;
326325
}
327326

328-
// Installation of gopls and go-langserver is supported.
329-
// Other language servers must be installed manually.
327+
// Installation of gopls is supported. Other language servers must be installed manually.
330328
if (languageServerOfChoice !== 'gopls') {
331329
vscode.window.showErrorMessage(
332330
`Cannot find the language server ${languageServerOfChoice}. Please install it and reload this VS Code window.`

0 commit comments

Comments
 (0)