Skip to content
This repository was archived by the owner on Nov 21, 2025. It is now read-only.

Commit eac69a8

Browse files
kyliauKeen Yee Liau
authored andcommitted
build: upgrade vscode-* packages to new major
The following vscode-* packages need to be upgraded in one go: - vscode-jsonrpc - vscode-languageclient - vscode-languageserver - vscode-languageserver-protocol This is due a [breaking change](https://github.com/microsoft/vscode-languageserver-node#3160-protocol-600-json-rpc-700-client-and-700-server) in the packages. Importing from the package root now pulls in `common` code only. In most cases, we want to import from `package/node` to include both common exports and NodeJS specific exports. This upgrade requires vscode `^1.52.0`.
1 parent b70ea8f commit eac69a8

File tree

6 files changed

+175
-157
lines changed

6 files changed

+175
-157
lines changed

client/src/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import * as fs from 'fs';
1010
import * as path from 'path';
1111
import * as vscode from 'vscode';
12-
import * as lsp from 'vscode-languageclient';
12+
import * as lsp from 'vscode-languageclient/node';
1313

1414
import {ProjectLoadingFinish, ProjectLoadingStart} from '../common/notifications';
1515
import {NgccProgress, NgccProgressToken, NgccProgressType} from '../common/progress';

integration/lsp/test_utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {fork} from 'child_process';
1010
import * as fs from 'fs';
1111
import {resolve} from 'path';
12-
import {createMessageConnection, IPCMessageReader, IPCMessageWriter, MessageConnection} from 'vscode-jsonrpc';
12+
import {createMessageConnection, IPCMessageReader, IPCMessageWriter, MessageConnection} from 'vscode-jsonrpc/node';
1313
import * as lsp from 'vscode-languageserver-protocol';
1414

1515
const SERVER_PATH = resolve(__dirname, '../../../dist/npm/server/index.js');

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"multi-root ready"
1212
],
1313
"engines": {
14-
"vscode": "^1.41.0"
14+
"vscode": "^1.52.0"
1515
},
1616
"categories": [
1717
"Programming Languages"
@@ -124,9 +124,9 @@
124124
"dependencies": {
125125
"@angular/language-service": "11.1.0-next.2",
126126
"typescript": "~4.0.5",
127-
"vscode-jsonrpc": "5.0.1",
128-
"vscode-languageclient": "6.1.3",
129-
"vscode-languageserver": "6.1.1",
127+
"vscode-jsonrpc": "6.0.0",
128+
"vscode-languageclient": "7.0.0",
129+
"vscode-languageserver": "7.0.0",
130130
"vscode-uri": "2.1.2"
131131
},
132132
"devDependencies": {
@@ -141,7 +141,7 @@
141141
"tslint-eslint-rules": "5.4.0",
142142
"vsce": "1.81.1",
143143
"vscode": "1.1.37",
144-
"vscode-languageserver-protocol": "3.15.3",
144+
"vscode-languageserver-protocol": "3.16.0",
145145
"vscode-tmgrammar-test": "0.0.10"
146146
},
147147
"repository": {

server/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
},
1414
"dependencies": {
1515
"@angular/language-service": "11.1.0-next.2",
16-
"vscode-jsonrpc": "5.0.1",
17-
"vscode-languageserver": "6.1.1",
16+
"vscode-jsonrpc": "6.0.0",
17+
"vscode-languageserver": "7.0.0",
1818
"vscode-uri": "2.1.2"
1919
},
2020
"publishConfig": {

server/src/session.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import * as ts from 'typescript/lib/tsserverlibrary';
10-
import * as lsp from 'vscode-languageserver';
10+
import * as lsp from 'vscode-languageserver/node';
1111

1212
import {ServerOptions} from '../common/initialize';
1313
import {ProjectLanguageService, ProjectLoadingFinish, ProjectLoadingStart} from '../common/notifications';
@@ -40,7 +40,7 @@ const EMPTY_RANGE = lsp.Range.create(0, 0, 0, 0);
4040
* handlers installed for Angular language service.
4141
*/
4242
export class Session {
43-
private readonly connection: lsp.IConnection;
43+
private readonly connection: lsp.Connection;
4444
private readonly projectService: ts.server.ProjectService;
4545
private readonly logger: ts.server.Logger;
4646
private readonly ivy: boolean;
@@ -102,7 +102,7 @@ export class Session {
102102
return projSvc;
103103
}
104104

105-
private addProtocolHandlers(conn: lsp.IConnection) {
105+
private addProtocolHandlers(conn: lsp.Connection) {
106106
conn.onInitialize(p => this.onInitialize(p));
107107
conn.onDidOpenTextDocument(p => this.onDidOpenTextDocument(p));
108108
conn.onDidCloseTextDocument(p => this.onDidCloseTextDocument(p));

0 commit comments

Comments
 (0)