refactor(language-server): remove typescript.tsserverRequestCommand initialization option (#5410)

Author: johnsoncodehk

extensions/vscode/src/languageClient.ts

@@ -1,5 +1,4 @@
 import * as lsp from '@volar/vscode';
-import type { VueInitializationOptions } from '@vue/language-server';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import {
@@ -25,7 +24,6 @@ type CreateLanguageClient = (
 	id: string,
 	name: string,
 	langs: lsp.DocumentSelector,
-	initOptions: VueInitializationOptions,
 	port: number,
 	outputChannel: vscode.OutputChannel
 ) => lsp.BaseLanguageClient;
@@ -72,11 +70,6 @@ async function activateLc(
 		'vue',
 		'Vue',
 		selectors,
-		{
-			typescript: {
-				tsserverRequestCommand: 'typescript.tsserverRequest',
-			},
-		} satisfies VueInitializationOptions,
 		6009,
 		outputChannel
 	);

extensions/vscode/src/nodeClientMain.ts

@@ -41,7 +41,7 @@ export const { activate, deactivate } = defineExtension(async () => {
 	const context = extensionContext.value!;
 	activateLanguageClient(
 		context,
-		(id, name, documentSelector, initOptions, port, outputChannel) => {
+		(id, name, documentSelector, port, outputChannel) => {
 			class _LanguageClient extends lsp.LanguageClient {
 				fillInitializeParams(params: lsp.InitializeParams) {
 					// fix https://github.com/vuejs/language-tools/issues/1959
@@ -66,7 +66,6 @@ export const { activate, deactivate } = defineExtension(async () => {
 			const clientOptions: lsp.LanguageClientOptions = {
 				middleware,
 				documentSelector: documentSelector,
-				initializationOptions: initOptions,
 				markdown: {
 					isTrusted: true,
 					supportHtml: true
@@ -85,7 +84,7 @@ export const { activate, deactivate } = defineExtension(async () => {
 
 			updateProviders(client);
 
-			client.onRequest('typescript.tsserverRequest', async ([command, args]) => {
+			client.onNotification('tsserver/request', async ([id, command, args]) => {
 				const tsserver = (globalThis as any).__TSSERVER__?.semantic;
 				if (!tsserver) {
 					return;
@@ -97,7 +96,7 @@ export const { activate, deactivate } = defineExtension(async () => {
 						lowPriority: true,
 						requireSemantic: true,
 					})[0];
-					return res.body;
+					client.sendNotification('tsserver/response', [id, res.body]);
 				} catch {
 					// noop
 				}

packages/language-server/lib/types.ts

@@ -1,9 +1,3 @@
-export type VueInitializationOptions = {
-	typescript: {
-		tsserverRequestCommand?: string | [request: string, response: string];
-	};
-};
-
 export * from '@volar/language-server/lib/types';
 export * from '@vue/language-service/lib/types';
 

packages/language-server/node.ts

@@ -5,20 +5,13 @@ import { createLanguage, createParsedCommandLine, createVueLanguagePlugin, getDe
 import { createLanguageService, createUriMap, getHybridModeLanguageServicePlugins, type LanguageService } from '@vue/language-service';
 import * as ts from 'typescript';
 import { URI } from 'vscode-uri';
-import type { VueInitializationOptions } from './lib/types';
 
 const connection = createConnection();
 const server = createServer(connection);
 
 connection.listen();
 
 connection.onInitialize(params => {
-	const options: VueInitializationOptions = params.initializationOptions;
-
-	if (!options.typescript?.tsserverRequestCommand) {
-		connection.console.warn('typescript.tsserverRequestCommand is required since >= 3.0 for complete TS features');
-	}
-
 	const tsconfigProjects = createUriMap<LanguageService>();
 	const file2ProjectInfo = new Map<string, Promise<ts.server.protocol.ProjectInfo | null>>();
 
@@ -38,19 +31,17 @@ connection.onInitialize(params => {
 
 	const tsserverRequestHandlers = new Map<number, (res: any) => void>();
 
-	if (Array.isArray(options.typescript.tsserverRequestCommand)) {
-		connection.onNotification(options.typescript.tsserverRequestCommand[1], ([id, res]) => {
-			tsserverRequestHandlers.get(id)?.(res);
-			tsserverRequestHandlers.delete(id);
-		});
-	}
+	connection.onNotification('tsserver/response', ([id, res]) => {
+		tsserverRequestHandlers.get(id)?.(res);
+		tsserverRequestHandlers.delete(id);
+	});
 
 	return server.initialize(
 		params,
 		{
 			setup() { },
 			async getLanguageService(uri) {
-				if (uri.scheme === 'file' && options.typescript.tsserverRequestCommand) {
+				if (uri.scheme === 'file') {
 					const fileName = uri.fsPath.replace(/\\/g, '/');
 					let projectInfoPromise = file2ProjectInfo.get(fileName);
 					if (!projectInfoPromise) {
@@ -83,17 +74,17 @@ connection.onInitialize(params => {
 				].filter(promise => !!promise));
 			},
 			reload() {
-				for (const ls of [
-					...tsconfigProjects.values(),
-					simpleLs,
-				]) {
-					ls?.dispose();
+				for (const ls of tsconfigProjects.values()) {
+					ls.dispose();
 				}
 				tsconfigProjects.clear();
-				simpleLs = undefined;
+				if (simpleLs) {
+					simpleLs.dispose();
+					simpleLs = undefined;
+				}
 			},
 		},
-		getHybridModeLanguageServicePlugins(ts, options.typescript.tsserverRequestCommand ? {
+		getHybridModeLanguageServicePlugins(ts, {
 			collectExtractProps(...args) {
 				return sendTsRequest('vue:collectExtractProps', args);
 			},
@@ -142,20 +133,15 @@ connection.onInitialize(params => {
 				);
 				return ts.displayPartsToString(result?.displayParts ?? []);
 			},
-		} : undefined)
+		})
 	);
 
 	async function sendTsRequest<T>(command: string, args: any): Promise<T | null> {
-		if (typeof options.typescript.tsserverRequestCommand === 'string') {
-			return await connection.sendRequest<T>(options.typescript.tsserverRequestCommand, [command, args]);
-		} else {
-			const [requestCommand] = options.typescript.tsserverRequestCommand!;
-			return await new Promise<T | null>(resolve => {
-				const requestId = ++tsserverRequestId;
-				tsserverRequestHandlers.set(requestId, resolve);
-				connection.sendNotification(requestCommand, [command, args, requestId]);
-			});
-		}
+		return await new Promise<T | null>(resolve => {
+			const requestId = ++tsserverRequestId;
+			tsserverRequestHandlers.set(requestId, resolve);
+			connection.sendNotification('tsserver/request', [requestId, command, args]);
+		});
 	}
 
 	function createLs(server: LanguageServer, tsconfig: string | undefined) {

packages/language-server/tests/server.ts

@@ -4,7 +4,6 @@ import type { LanguageServerHandle } from '@volar/test-utils';
 import { startLanguageServer } from '@volar/test-utils';
 import * as path from 'node:path';
 import { URI } from 'vscode-uri';
-import type { VueInitializationOptions } from '../lib/types';
 
 let serverHandle: LanguageServerHandle | undefined;
 let tsserver: import('@typescript/server-harness').Server;
@@ -44,22 +43,18 @@ export async function getLanguageServer(): Promise<{
 				return null;
 			});
 		});
-		serverHandle.connection.onRequest('tsserverRequest', async ([command, args]) => {
+		serverHandle.connection.onNotification('tsserver/request', async ([id, command, args]) => {
 			const res = await tsserver.message({
 				seq: seq++,
 				command: command,
 				arguments: args,
 			});
-			return res.body;
+			serverHandle!.connection.sendNotification('tsserver/response', [id, res.body]);
 		});
 
 		await serverHandle.initialize(
 			URI.file(testWorkspacePath).toString(),
-			{
-				typescript: {
-					tsserverRequestCommand: 'tsserverRequest',
-				},
-			} satisfies VueInitializationOptions,
+			{},
 			{
 				workspace: {
 					configuration: true,