Merge pull request #3227 from microsoft/hediet/workerManager

Refactors workerManager

src/language/typescript/workerManager.ts

@@ -8,8 +8,6 @@ import type { TypeScriptWorker } from './tsWorker';
 import { editor, Uri, IDisposable } from '../../fillers/monaco-editor-core';
 
 export class WorkerManager {
-	private _modeId: string;
-	private _defaults: LanguageServiceDefaults;
 	private _configChangeListener: IDisposable;
 	private _updateExtraLibsToken: number;
 	private _extraLibsChangeListener: IDisposable;
@@ -17,9 +15,10 @@ export class WorkerManager {
 	private _worker: editor.MonacoWebWorker<TypeScriptWorker> | null;
 	private _client: Promise<TypeScriptWorker> | null;
 
-	constructor(modeId: string, defaults: LanguageServiceDefaults) {
+	constructor(
-		this._modeId = modeId;
+		private readonly _modeId: string,
-		this._defaults = defaults;
+		private readonly _defaults: LanguageServiceDefaults
+	) {
 		this._worker = null;
 		this._client = null;
 		this._configChangeListener = this._defaults.onDidChange(() => this._stopWorker());
@@ -29,6 +28,12 @@ export class WorkerManager {
 		);
 	}
 
+	dispose(): void {
+		this._configChangeListener.dispose();
+		this._extraLibsChangeListener.dispose();
+		this._stopWorker();
+	}
+
 	private _stopWorker(): void {
 		if (this._worker) {
 			this._worker.dispose();
@@ -37,12 +42,6 @@ export class WorkerManager {
 		this._client = null;
 	}
 
-	dispose(): void {
-		this._configChangeListener.dispose();
-		this._extraLibsChangeListener.dispose();
-		this._stopWorker();
-	}
-
 	private async _updateExtraLibs(): Promise<void> {
 		if (!this._worker) {
 			return;
@@ -58,56 +57,45 @@ export class WorkerManager {
 
 	private _getClient(): Promise<TypeScriptWorker> {
 		if (!this._client) {
-			this._worker = editor.createWebWorker<TypeScriptWorker>({
+			this._client = (async () => {
-				// module that exports the create() method and returns a `TypeScriptWorker` instance
+				this._worker = editor.createWebWorker<TypeScriptWorker>({
-				moduleId: 'vs/language/typescript/tsWorker',
+					// module that exports the create() method and returns a `TypeScriptWorker` instance
-
+					moduleId: 'vs/language/typescript/tsWorker',
-				label: this._modeId,
 
-				keepIdleModels: true,
+					label: this._modeId,
-
-				// passed in to the create() method
-				createData: {
-					compilerOptions: this._defaults.getCompilerOptions(),
-					extraLibs: this._defaults.getExtraLibs(),
-					customWorkerPath: this._defaults.workerOptions.customWorkerPath,
-					inlayHintsOptions: this._defaults.inlayHintsOptions
-				}
-			});
 
-			let p = <Promise<TypeScriptWorker>>this._worker.getProxy();
+					keepIdleModels: true,
 
-			if (this._defaults.getEagerModelSync()) {
+					// passed in to the create() method
-				p = p.then((worker) => {
+					createData: {
-					if (this._worker) {
+						compilerOptions: this._defaults.getCompilerOptions(),
-						return this._worker.withSyncedResources(
+						extraLibs: this._defaults.getExtraLibs(),
-							editor
+						customWorkerPath: this._defaults.workerOptions.customWorkerPath,
-								.getModels()
+						inlayHintsOptions: this._defaults.inlayHintsOptions
-								.filter((model) => model.getLanguageId() === this._modeId)
-								.map((model) => model.uri)
-						);
 					}
-					return worker;
 				});
-			}
 
-			this._client = p;
+				if (this._defaults.getEagerModelSync()) {
+					return await this._worker.withSyncedResources(
+						editor
+							.getModels()
+							.filter((model) => model.getLanguageId() === this._modeId)
+							.map((model) => model.uri)
+					);
+				}
+
+				return await this._worker.getProxy();
+			})();
 		}
 
 		return this._client;
 	}
 
-	getLanguageServiceWorker(...resources: Uri[]): Promise<TypeScriptWorker> {
+	async getLanguageServiceWorker(...resources: Uri[]): Promise<TypeScriptWorker> {
-		let _client: TypeScriptWorker;
+		const client = await this._getClient();
-		return this._getClient()
+		if (this._worker) {
-			.then((client) => {
+			await this._worker.withSyncedResources(resources);
-				_client = client;
+		}
-			})
+		return client;
-			.then((_) => {
-				if (this._worker) {
-					return this._worker.withSyncedResources(resources);
-				}
-			})
-			.then((_) => _client);
 	}
 }