fix(language-server): rename requestForwardingCommand to tsserverRequ…

…estCommand
vuejs · Mar 7, 2025 · 9e967bf · 9e967bf
1 parent 32c9336
commit 9e967bf
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/extensions/vscode/src/languageClient.ts b/extensions/vscode/src/languageClient.ts
@@ -108,7 +108,7 @@ async function getInitializationOptions(context: vscode.ExtensionContext): Promi
 	return {
 		typescript: {
 			tsdk: (await lsp.getTsdk(context))!.tsdk,
-			requestForwardingCommand: 'forwardingTsRequest',
+			tsserverRequestCommand: 'tsserverRequest',
 		},
 	};
 }
diff --git a/extensions/vscode/src/nodeClientMain.ts b/extensions/vscode/src/nodeClientMain.ts
@@ -86,7 +86,7 @@ export const { activate, deactivate } = defineExtension(async () => {
 
 			updateProviders(client);
 
-			client.onRequest('forwardingTsRequest', async ([command, args]) => {
+			client.onRequest('tsserverRequest', async ([command, args]) => {
 				const tsserver = (globalThis as any).__TSSERVER__?.semantic;
 				if (!tsserver) {
 					return;

diff --git a/packages/language-server/lib/types.ts b/packages/language-server/lib/types.ts
@@ -1,7 +1,7 @@
 export type VueInitializationOptions = {
 	typescript: {
 		tsdk: string;
-		requestForwardingCommand?: string;
+		tsserverRequestCommand?: string;
 	};
 };
 

diff --git a/packages/language-server/node.ts b/packages/language-server/node.ts
@@ -18,8 +18,8 @@ connection.onInitialize(params => {
 	if (!options.typescript?.tsdk) {
 		throw new Error('typescript.tsdk is required');
 	}
-	if (!options.typescript?.requestForwardingCommand) {
-		connection.console.warn('typescript.requestForwardingCommand is required since >= 3.0 for complete TS features');
+	if (!options.typescript?.tsserverRequestCommand) {
+		connection.console.warn('typescript.tsserverRequestCommand is required since >= 3.0 for complete TS features');
 	}
 
 	const { typescript: ts } = loadTsdkByPath(options.typescript.tsdk, params.locale);
@@ -42,7 +42,7 @@ connection.onInitialize(params => {
 		{
 			setup() { },
 			async getLanguageService(uri) {
-				if (uri.scheme === 'file' && options.typescript.requestForwardingCommand) {
+				if (uri.scheme === 'file' && options.typescript.tsserverRequestCommand) {
 					const fileName = uri.fsPath.replace(/\\/g, '/');
 					const projectInfo = await sendTsRequest<ts.server.protocol.ProjectInfo>(
 						ts.server.protocol.CommandTypes.ProjectInfo,
@@ -80,7 +80,7 @@ connection.onInitialize(params => {
 				simpleLs = undefined;
 			},
 		},
-		getHybridModeLanguageServicePlugins(ts, options.typescript.requestForwardingCommand ? {
+		getHybridModeLanguageServicePlugins(ts, options.typescript.tsserverRequestCommand ? {
 			collectExtractProps(...args) {
 				return sendTsRequest('vue:collectExtractProps', args);
 			},
@@ -115,7 +115,7 @@ connection.onInitialize(params => {
 	);
 
 	function sendTsRequest<T>(command: string, args: any): Promise<T | null> {
-		return connection.sendRequest<T>(options.typescript.requestForwardingCommand!, [command, args]);
+		return connection.sendRequest<T>(options.typescript.tsserverRequestCommand!, [command, args]);
 	}
 
 	function createLs(server: LanguageServer, tsconfig: string | undefined) {

diff --git a/packages/language-server/tests/server.ts b/packages/language-server/tests/server.ts
@@ -44,7 +44,7 @@ export async function getLanguageServer(): Promise<{
 				return null;
 			});
 		});
-		serverHandle.connection.onRequest('forwardingTsRequest', async ([command, args]) => {
+		serverHandle.connection.onRequest('tsserverRequest', async ([command, args]) => {
 			const res = await tsserver.message({
 				seq: seq++,
 				command: command,
@@ -58,7 +58,7 @@ export async function getLanguageServer(): Promise<{
 			{
 				typescript: {
 					tsdk: path.dirname(require.resolve('typescript/lib/typescript.js')),
-					requestForwardingCommand: 'forwardingTsRequest',
+					tsserverRequestCommand: 'tsserverRequest',
 				},
 			} satisfies VueInitializationOptions,
 			{