fix: wait for services to be ready before registering extensions

Author: Loïc Mangeonjean

src/extensions.ts

@@ -2,7 +2,6 @@ import type * as vscode from 'vscode'
 import { ExtensionType, IExtension, IExtensionContributions, IExtensionManifest, TargetPlatform } from 'vs/platform/extensions/common/extensions'
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'
 import { URI } from 'vs/base/common/uri'
-import { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices'
 import { getExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil'
 import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle'
 import { ITranslations, localizeManifest } from 'vs/platform/extensionManagement/common/extensionNls'
@@ -13,6 +12,7 @@ import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/exten
 import { IExtensionWithExtHostKind, SimpleExtensionService, getLocalExtHostExtensionService } from './service-override/extensions'
 import { registerExtensionFile } from './service-override/files'
 import { setDefaultApi } from './api'
+import { getService } from './services'
 
 const defaultApiInitializeBarrier = new Barrier()
 export async function initialize (): Promise<void> {
@@ -60,7 +60,7 @@ async function deltaExtensions (toAdd: IExtensionWithExtHostKind[], toRemove: IE
   _toRemove.push(...toRemove)
 
   if (lastPromise == null) {
-    const extensionService = StandaloneServices.get(IExtensionService) as SimpleExtensionService
+    const extensionService = await getService(IExtensionService) as SimpleExtensionService
     lastPromise = new Promise(resolve => setTimeout(resolve)).then(async () => {
       await extensionService.deltaExtensions(_toAdd, _toRemove)
       _toAdd = []

src/services.ts

@@ -7,8 +7,8 @@ import { Registry } from 'vs/platform/registry/common/platform'
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'
 import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices'
 import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle'
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'
-import { RunOnceScheduler, runWhenIdle } from 'vs/base/common/async'
+import { IInstantiationService, ServiceIdentifier, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'
+import { Barrier, RunOnceScheduler, runWhenIdle } from 'vs/base/common/async'
 import { Emitter } from 'vs/base/common/event'
 import { IAction } from 'vs/base/common/actions'
 import getLayoutServiceOverride from './service-override/layout'
@@ -46,9 +46,18 @@ async function initServices (overrides: IEditorOverrideServices): Promise<IInsta
 const renderWorkbenchEmitter = new Emitter<ServicesAccessor>()
 export const onRenderWorkbench = renderWorkbenchEmitter.event
 
+const serviceInitializedBarrier = new Barrier()
+
+export async function getService<T> (identifier: ServiceIdentifier<T>): Promise<T> {
+  await serviceInitializedBarrier.wait()
+  return StandaloneServices.get(identifier)
+}
+
 export async function initialize (overrides: IEditorOverrideServices): Promise<void> {
   const instantiationService = await initServices(overrides)
 
+  serviceInitializedBarrier.open()
+
   instantiationService.invokeFunction(accessor => {
     const lifecycleService = accessor.get(ILifecycleService)