From 52d462293dba671b3d2417a299d3b61dfd4c8124 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Fri, 14 Jul 2023 01:04:15 +0200
Subject: [PATCH] Avoid creating services in APIs used by the monaco-editor
 repo itself (#187881)

Fixes #169268: Avoid creating services in APIs used by the monaco-editor repo itself
---
 .../standalone/browser/standaloneLanguages.ts | 40 ++++++++++---------
 .../standalone/browser/standaloneServices.ts  | 22 ++++++++++
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/vs/editor/standalone/browser/standaloneLanguages.ts b/src/vs/editor/standalone/browser/standaloneLanguages.ts
index 78d683d2fe5..939d3391034 100644
--- a/src/vs/editor/standalone/browser/standaloneLanguages.ts
+++ b/src/vs/editor/standalone/browser/standaloneLanguages.ts
@@ -54,16 +54,18 @@ export function getEncodedLanguageId(languageId: string): number {
  * @event
  */
 export function onLanguage(languageId: string, callback: () => void): IDisposable {
-	const languageService = StandaloneServices.get(ILanguageService);
-	const disposable = languageService.onDidRequestRichLanguageFeatures((encounteredLanguageId) => {
-		if (encounteredLanguageId === languageId) {
-			// stop listening
-			disposable.dispose();
-			// invoke actual listener
-			callback();
-		}
+	return StandaloneServices.withServices(() => {
+		const languageService = StandaloneServices.get(ILanguageService);
+		const disposable = languageService.onDidRequestRichLanguageFeatures((encounteredLanguageId) => {
+			if (encounteredLanguageId === languageId) {
+				// stop listening
+				disposable.dispose();
+				// invoke actual listener
+				callback();
+			}
+		});
+		return disposable;
 	});
-	return disposable;
 }
 
 /**
@@ -72,16 +74,18 @@ export function onLanguage(languageId: string, callback: () => void): IDisposabl
  * @event
  */
 export function onLanguageEncountered(languageId: string, callback: () => void): IDisposable {
-	const languageService = StandaloneServices.get(ILanguageService);
-	const disposable = languageService.onDidRequestBasicLanguageFeatures((encounteredLanguageId) => {
-		if (encounteredLanguageId === languageId) {
-			// stop listening
-			disposable.dispose();
-			// invoke actual listener
-			callback();
-		}
+	return StandaloneServices.withServices(() => {
+		const languageService = StandaloneServices.get(ILanguageService);
+		const disposable = languageService.onDidRequestBasicLanguageFeatures((encounteredLanguageId) => {
+			if (encounteredLanguageId === languageId) {
+				// stop listening
+				disposable.dispose();
+				// invoke actual listener
+				callback();
+			}
+		});
+		return disposable;
 	});
-	return disposable;
 }
 
 /**
diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts
index cc2ede5219c..0546f5fc282 100644
--- a/src/vs/editor/standalone/browser/standaloneServices.ts
+++ b/src/vs/editor/standalone/browser/standaloneServices.ts
@@ -1128,6 +1128,7 @@ export module StandaloneServices {
 	}
 
 	let initialized = false;
+	const onDidInitialize = new Emitter<void>();
 	export function initialize(overrides: IEditorOverrideServices): IInstantiationService {
 		if (initialized) {
 			return instantiationService;
@@ -1163,6 +1164,27 @@ export module StandaloneServices {
 			}
 		}
 
+		onDidInitialize.fire();
+
 		return instantiationService;
 	}
+
+	/**
+	 * Executes callback once services are initialized.
+	 */
+	export function withServices(callback: () => IDisposable): IDisposable {
+		if (initialized) {
+			return callback();
+		}
+
+		const disposable = new DisposableStore();
+
+		const listener = disposable.add(onDidInitialize.event(() => {
+			listener.dispose();
+			disposable.add(callback());
+		}));
+
+		return disposable;
+	}
+
 }