fix: split initialization file to initialize in correct order

Author: Loïc Mangeonjean

src/service-override/configuration.ts

@@ -35,7 +35,7 @@ import 'vs/workbench/api/common/configurationExtensionPoint'
 import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService'
 import getFileServiceOverride from './files'
 import { memoizedConstructor, unsupported } from '../tools'
-import { registerServiceInitializeParticipant } from '../services'
+import { registerServiceInitializePreParticipant } from '../services'
 
 async function updateUserConfiguration (configurationJson: string): Promise<void> {
   const userDataProfilesService = StandaloneServices.get(IUserDataProfilesService)
@@ -79,7 +79,7 @@ class MonacoWorkspaceEditingService extends AbstractWorkspaceEditingService {
 }
 
 let _defaultWorkspaceUri = URI.file('/workspace')
-registerServiceInitializeParticipant(async (accessor) => {
+registerServiceInitializePreParticipant(async (accessor) => {
   const workspaceService = accessor.get(IWorkspaceContextService) as WorkspaceService
   workspaceService.acquireInstantiationService(accessor.get(IInstantiationService))
 

src/services.ts

@@ -19,10 +19,18 @@ import getFileServiceOverride from './service-override/files'
 interface ServiceInitializeParticipant {
   (accessor: ServicesAccessor): Promise<void>
 }
+const serviceInitializePreParticipants: ServiceInitializeParticipant[] = []
 const serviceInitializeParticipants: ServiceInitializeParticipant[] = []
+const serviceInitializePostParticipants: ServiceInitializeParticipant[] = []
+export function registerServiceInitializePreParticipant (participant: ServiceInitializeParticipant): void {
+  serviceInitializePreParticipants.push(participant)
+}
 export function registerServiceInitializeParticipant (participant: ServiceInitializeParticipant): void {
   serviceInitializeParticipants.push(participant)
 }
+export function registerServiceInitializePostParticipant (participant: ServiceInitializeParticipant): void {
+  serviceInitializePostParticipants.push(participant)
+}
 
 async function initServices (overrides: IEditorOverrideServices): Promise<IInstantiationService> {
   const instantiationService = StandaloneServices.initialize({
@@ -33,6 +41,10 @@ async function initServices (overrides: IEditorOverrideServices): Promise<IInsta
     ...overrides
   })
 
+  await instantiationService.invokeFunction(async accessor => {
+    await Promise.all(serviceInitializePreParticipants.map(participant => participant(accessor)))
+  })
+
   await instantiationService.invokeFunction(async accessor => {
     const lifecycleService = accessor.get(ILifecycleService)
 
@@ -42,6 +54,10 @@ async function initServices (overrides: IEditorOverrideServices): Promise<IInsta
     lifecycleService.phase = LifecyclePhase.Ready
   })
 
+  await instantiationService.invokeFunction(async accessor => {
+    await Promise.all(serviceInitializePostParticipants.map(participant => participant(accessor)))
+  })
+
   return instantiationService
 }