Merge branch 'pr/171547' into volar-html

Author: johnsoncodehk

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

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as serverProtocol from '@volar/language-server/protocol';
 import { BaseLanguageClient, LanguageClientOptions, createLabsInfo } from '@volar/vscode';
 import { LanguageClient } from '@volar/vscode/browser';
 import { Disposable, ExtensionContext, Uri, l10n } from 'vscode';
@@ -32,7 +31,7 @@ export async function activate(context: ExtensionContext) {
 
 		client = await startClient(context, newLanguageClient, { TextDecoder, timer });
 
-		const labsInfo = createLabsInfo(serverProtocol);
+		const labsInfo = createLabsInfo();
 		labsInfo.addLanguageClient(languageClient);
 		return labsInfo.extensionExports;
 	} catch (e) {

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

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as serverProtocol from '@volar/language-server/protocol';
 import { createLabsInfo, LanguageClientOptions } from '@volar/vscode';
 import { BaseLanguageClient, LanguageClient, ServerOptions, TransportKind } from '@volar/vscode/node';
 import TelemetryReporter from '@vscode/extension-telemetry';
@@ -51,7 +50,7 @@ export async function activate(context: ExtensionContext) {
 
 	client = await startClient(context, newLanguageClient, { TextDecoder, telemetry, timer });
 
-	const labsInfo = createLabsInfo(serverProtocol);
+	const labsInfo = createLabsInfo();
 	labsInfo.addLanguageClient(languageClient);
 	return labsInfo.extensionExports;
 }

extensions/html-language-features/package-lock.json

@@ -258,8 +258,7 @@
     ]
   },
   "dependencies": {
-    "@volar/language-server": "~2.4.0",
-    "@volar/vscode": "~2.4.0",
+    "@volar/vscode": "~2.4.14",
     "@vscode/extension-telemetry": "^0.9.8"
   },
   "devDependencies": {