Skip to content

Commit a28cbc2

Browse files
authored
css/json/html web: adopt LanguageClient API change (microsoft#218060)
1 parent 1b27e60 commit a28cbc2

File tree

6 files changed

+15
-26
lines changed

6 files changed

+15
-26
lines changed

extensions/css-language-features/client/src/browser/cssClientMain.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ import { BaseLanguageClient, LanguageClientOptions } from 'vscode-languageclient
88
import { startClient, LanguageClientConstructor } from '../cssClient';
99
import { LanguageClient } from 'vscode-languageclient/browser';
1010

11-
declare const Worker: {
12-
new(stringUrl: string): any;
13-
};
14-
declare const TextDecoder: {
15-
new(encoding?: string): { decode(buffer: ArrayBuffer): string };
16-
};
17-
1811
let client: BaseLanguageClient | undefined;
1912

2013
// this method is called when vs code is activated
@@ -25,7 +18,7 @@ export async function activate(context: ExtensionContext) {
2518
worker.postMessage({ i10lLocation: l10n.uri?.toString(false) ?? '' });
2619

2720
const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
28-
return new LanguageClient(id, name, clientOptions, worker);
21+
return new LanguageClient(id, name, worker, clientOptions);
2922
};
3023

3124
client = await startClient(context, newLanguageClient, { TextDecoder });

extensions/css-language-features/client/tsconfig.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
4-
"outDir": "./out"
4+
"outDir": "./out",
5+
"lib": [
6+
"webworker"
7+
]
58
},
69
"include": [
710
"src/**/*",

extensions/html-language-features/client/src/browser/htmlClientMain.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ import { LanguageClientOptions } from 'vscode-languageclient';
88
import { startClient, LanguageClientConstructor, AsyncDisposable } from '../htmlClient';
99
import { LanguageClient } from 'vscode-languageclient/browser';
1010

11-
declare const Worker: {
12-
new(stringUrl: string): any;
13-
};
14-
declare const TextDecoder: {
15-
new(encoding?: string): { decode(buffer: ArrayBuffer): string };
16-
};
17-
1811
let client: AsyncDisposable | undefined;
1912

2013
// this method is called when vs code is activated
@@ -25,7 +18,7 @@ export async function activate(context: ExtensionContext) {
2518
worker.postMessage({ i10lLocation: l10n.uri?.toString(false) ?? '' });
2619

2720
const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
28-
return new LanguageClient(id, name, clientOptions, worker);
21+
return new LanguageClient(id, name, worker, clientOptions);
2922
};
3023

3124
const timer = {

extensions/html-language-features/client/tsconfig.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
4-
"outDir": "./out"
4+
"outDir": "./out",
5+
"lib": [
6+
"webworker"
7+
]
58
},
69
"include": [
710
"src/**/*",

extensions/json-language-features/client/src/browser/jsonClientMain.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ import { LanguageClientOptions } from 'vscode-languageclient';
88
import { startClient, LanguageClientConstructor, SchemaRequestService, AsyncDisposable, languageServerDescription } from '../jsonClient';
99
import { LanguageClient } from 'vscode-languageclient/browser';
1010

11-
declare const Worker: {
12-
new(stringUrl: string): any;
13-
};
14-
15-
declare function fetch(uri: string, options: any): any;
16-
1711
let client: AsyncDisposable | undefined;
1812

1913
// this method is called when vs code is activated
@@ -24,7 +18,7 @@ export async function activate(context: ExtensionContext) {
2418
worker.postMessage({ i10lLocation: l10n.uri?.toString(false) ?? '' });
2519

2620
const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
27-
return new LanguageClient(id, name, clientOptions, worker);
21+
return new LanguageClient(id, name, worker, clientOptions);
2822
};
2923

3024
const schemaRequests: SchemaRequestService = {

extensions/json-language-features/client/tsconfig.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
4-
"outDir": "./out"
4+
"outDir": "./out",
5+
"lib": [
6+
"webworker"
7+
]
58
},
69
"include": [
710
"src/**/*",

0 commit comments

Comments
 (0)