Skip to content

Commit dd47d09

Browse files
committed
[release.theia] package.json: downgrade language client to make extension work for 1.44
Theia IDEs still use 1.44 engine and cannot use vscode-languageclient-node 7.0.0-* that requires 1.46+. This is a temporary rollback of, effectively, https://go-review.googlesource.com/c/vscode-go/+/246557 until Theia IDEs are updated. For #1038 Change-Id: I0a170e6f69263ac62c03449ed2b3d5046e61767d Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/278781 Run-TryBot: Hyang-Ah Hana Kim <[email protected]> TryBot-Result: kokoro <[email protected]> Reviewed-by: Rebecca Stambler <[email protected]> Trust: Hyang-Ah Hana Kim <[email protected]>
1 parent 5f38caa commit dd47d09

File tree

4 files changed

+28
-39
lines changed

4 files changed

+28
-39
lines changed

package-lock.json

Lines changed: 21 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
"tree-kill": "file:third_party/tree-kill",
5757
"vscode-debugadapter": "^1.42.1",
5858
"vscode-debugadapter-testsupport": "^1.42.0",
59-
"vscode-debugprotocol": "^1.42.0",
60-
"vscode-languageclient": "^7.0.0-next.12",
61-
"vscode-languageserver-protocol": "^3.16.0-next.7",
59+
"vscode-debugprotocol": "^1.40.0",
60+
"vscode-languageclient": "6.1.3",
61+
"vscode-languageserver-protocol": "3.15.3",
6262
"web-request": "^1.0.7"
6363
},
6464
"devDependencies": {
@@ -87,7 +87,7 @@
8787
"yarn": "^1.22.4"
8888
},
8989
"engines": {
90-
"vscode": "^1.46.0"
90+
"vscode": "^1.44.0"
9191
},
9292
"activationEvents": [
9393
"workspaceContains:**/*.go",
@@ -783,7 +783,7 @@
783783
}
784784
}
785785
}
786-
}
786+
}
787787
}
788788
],
789789
"configuration": {

src/goLanguageServer.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,14 @@ import {
2323
ErrorAction,
2424
HandleDiagnosticsSignature,
2525
InitializeError,
26+
LanguageClient,
2627
Message,
2728
ProvideCodeLensesSignature,
2829
ProvideCompletionItemsSignature,
2930
ProvideDocumentLinksSignature,
3031
ResponseError,
3132
RevealOutputChannelOn
3233
} from 'vscode-languageclient';
33-
import {
34-
LanguageClient
35-
} from 'vscode-languageclient/node';
3634
import WebRequest = require('web-request');
3735
import { extensionId } from './const';
3836
import { GoCodeActionProvider } from './goCodeAction';

test/gopls/extension.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { EventEmitter } from 'events';
88
import * as path from 'path';
99
import sinon = require('sinon');
1010
import * as vscode from 'vscode';
11-
import { LanguageClient } from 'vscode-languageclient/node';
11+
import { LanguageClient } from 'vscode-languageclient';
1212
import { buildLanguageClient, BuildLanguageClientOption, buildLanguageServerConfig } from '../../src/goLanguageServer';
1313
import { getGoConfig } from '../../src/util';
1414

0 commit comments

Comments
 (0)