Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-19 16:18:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Give debug name to the TS Server workers (#172328)

Browse Source 
Give a debug name to the TS Server workers

This gives the TS Server worker process debug name, which helps with debugging and profiling
This commit is contained in:
Matt Bierner
2023-01-24 17:07:33 -08:00
committed by GitHub
parent 983ee9c0f9
commit 6c710f3324
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/typescript-language-features/src/tsServer/serverProcess.browser.ts
View File

@@ -43,8 +43,7 @@ export class WorkerServerProcess implements TsServerProcess {
extensionUri: vscode.Uri,
) {
const tsServerPath = version.tsServerPath;
const worker = new Worker(tsServerPath);
return new WorkerServerProcess(kind, worker, extensionUri, [
return new WorkerServerProcess(kind, tsServerPath, extensionUri, [
...args,
// Explicitly give TS Server its path so it can
@@ -62,6 +61,8 @@ export class WorkerServerProcess implements TsServerProcess {
private readonly _onExitHandlers = new Set<(code: number | null, signal: string | null) => void>();
private readonly watches = new FileWatcherManager();
private readonly worker: Worker;
/** For communicating with TS server synchronously */
private readonly tsserver: MessagePort;
/** For communicating watches asynchronously */
@@ -71,11 +72,12 @@ export class WorkerServerProcess implements TsServerProcess {
public constructor(
private readonly kind: TsServerProcessKind,
/** For logging and initial setup */
private readonly mainChannel: Worker,
tsServerPath: string,
extensionUri: vscode.Uri,
args: readonly string[],
) {
this.worker = new Worker(tsServerPath, { name: `TS ${kind} server #${this.id}` });
const tsserverChannel = new MessageChannel();
const watcherChannel = new MessageChannel();
const syncChannel = new MessageChannel();
@@ -113,7 +115,7 @@ export class WorkerServerProcess implements TsServerProcess {
}
};
mainChannel.onmessage = (msg: any) => {
this.worker.onmessage = (msg: any) => {
// for logging only
if (msg.data.type === 'log') {
this.appendOutput(msg.data.body);
@@ -122,7 +124,7 @@ export class WorkerServerProcess implements TsServerProcess {
console.error(`unexpected message on main channel: ${JSON.stringify(msg)}`);
};
mainChannel.onerror = (err: ErrorEvent) => {
this.worker.onerror = (err: ErrorEvent) => {
console.error('error! ' + JSON.stringify(err));
for (const handler of this._onErrorHandlers) {
// TODO: The ErrorEvent type might be wrong; previously this was typed as Error and didn't have the property access.
@@ -131,7 +133,7 @@ export class WorkerServerProcess implements TsServerProcess {
};
this.appendOutput(`creating new MessageChannel and posting its port2 + args: ${args.join(' ')}\n`);
mainChannel.postMessage(
this.worker.postMessage(
{ args, extensionUri },
[syncChannel.port1, tsserverChannel.port1, watcherChannel.port1]
);
@@ -160,7 +162,7 @@ export class WorkerServerProcess implements TsServerProcess {
}
kill(): void {
this.mainChannel.terminate();
this.worker.terminate();
this.tsserver.close();
this.watcher.close();
this.syncFs.close();