Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extensions/vscode/src/languageClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ async function getInitializationOptions(context: vscode.ExtensionContext): Promi
return {
typescript: {
tsdk: (await lsp.getTsdk(context))!.tsdk,
tsserverRequestCommand: 'tsserverRequest',
tsserverRequestCommand: 'typescript.tsserverRequest',
},
};
}
2 changes: 1 addition & 1 deletion extensions/vscode/src/nodeClientMain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const { activate, deactivate } = defineExtension(async () => {

updateProviders(client);

client.onRequest('tsserverRequest', async ([command, args]) => {
client.onRequest('typescript.tsserverRequest', async ([command, args]) => {
const tsserver = (globalThis as any).__TSSERVER__?.semantic;
if (!tsserver) {
return;
Expand Down
2 changes: 1 addition & 1 deletion packages/language-server/lib/types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export type VueInitializationOptions = {
typescript: {
tsdk: string;
tsserverRequestCommand?: string;
tsserverRequestCommand?: string | [request: string, response: string];
};
};

Expand Down
24 changes: 22 additions & 2 deletions packages/language-server/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ connection.onInitialize(params => {
});

let simpleLs: LanguageService | undefined;
let tsserverRequestId = 0;

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);
});
}

return server.initialize(
params,
Expand Down Expand Up @@ -139,8 +149,17 @@ connection.onInitialize(params => {
} : undefined)
);

function sendTsRequest<T>(command: string, args: any): Promise<T | null> {
return connection.sendRequest<T>(options.typescript.tsserverRequestCommand!, [command, args]);
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]);
});
}
}

function createLs(server: LanguageServer, tsconfig: string | undefined) {
Expand Down Expand Up @@ -185,3 +204,4 @@ connection.onInitialize(params => {
connection.onInitialized(server.initialized);

connection.onShutdown(server.shutdown);