make service instantiation lazy (microsoft#159680)

sandy081 · web-flow · commit 9e183764520f · 2022-08-31T12:20:30.000-04:00
* microsoft#159178 make service instantiation lazy * add comment * update comment * make comment clear about cyclic dep * :lisptick:
diff --git a/src/vs/platform/extensionManagement/electron-sandbox/extensionsScannerService.ts b/src/vs/platform/extensionManagement/electron-sandbox/extensionsScannerService.ts
@@ -35,4 +35,4 @@ export class ExtensionsScannerService extends NativeExtensionsScannerService imp
 
 }
 
-registerSingleton(IExtensionsScannerService, ExtensionsScannerService, false);
+registerSingleton(IExtensionsScannerService, ExtensionsScannerService, true);
diff --git a/src/vs/workbench/api/common/extHost.common.services.ts b/src/vs/workbench/api/common/extHost.common.services.ts
@@ -29,8 +29,8 @@ import { ExtHostLogService } from 'vs/workbench/api/common/extHostLogService';
 import { ExtHostVariableResolverProviderService, IExtHostVariableResolverProvider } from 'vs/workbench/api/common/extHostVariableResolverService';
 import { ExtHostTelemetryLogService, IExtHostTelemetryLogService } from 'vs/workbench/api/common/extHostTelemetryLogService';
 
-registerSingleton(ILoggerService, ExtHostLoggerService, false);
-registerSingleton(ILogService, ExtHostLogService, false);
+registerSingleton(ILoggerService, ExtHostLoggerService, true);
+registerSingleton(ILogService, ExtHostLogService, true);
 registerSingleton(IExtHostApiDeprecationService, ExtHostApiDeprecationService, false);
 registerSingleton(IExtHostCommands, ExtHostCommands, false);
 registerSingleton(IExtHostConfiguration, ExtHostConfiguration, false);
@@ -39,7 +39,7 @@ registerSingleton(IExtHostDebugService, WorkerExtHostDebugService, false);
 registerSingleton(IExtHostDecorations, ExtHostDecorations, false);
 registerSingleton(IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors, false);
 registerSingleton(IExtHostFileSystemInfo, ExtHostFileSystemInfo, false);
-registerSingleton(IExtHostOutputService, ExtHostOutputService, false);
+registerSingleton(IExtHostOutputService, ExtHostOutputService, true);
 registerSingleton(IExtHostSearch, ExtHostSearch, false);
 registerSingleton(IExtHostStorage, ExtHostStorage, false);
 registerSingleton(IExtHostTask, WorkerExtHostTask, false);
diff --git a/src/vs/workbench/api/node/extHost.node.services.ts b/src/vs/workbench/api/node/extHost.node.services.ts
@@ -30,7 +30,7 @@ import { IExtHostVariableResolverProvider } from 'vs/workbench/api/common/extHos
 // #########################################################################
 
 registerSingleton(IExtHostExtensionService, ExtHostExtensionService, false);
-registerSingleton(ILoggerService, ExtHostLoggerService, false);
+registerSingleton(ILoggerService, ExtHostLoggerService, true);
 registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths, false);
 
 registerSingleton(IExtHostDebugService, ExtHostDebugService, false);
diff --git a/src/vs/workbench/browser/parts/views/viewsService.ts b/src/vs/workbench/browser/parts/views/viewsService.ts
@@ -648,4 +648,5 @@ export function getPartByLocation(viewContainerLocation: ViewContainerLocation):
 	}
 }
 
-registerSingleton(IViewsService, ViewsService, false);
+registerSingleton(IViewsService, ViewsService, false /* Eager because of the cyclic dependency when registering PaneComposites (Panel that is active) in its constructor:
+ViewsService is registering a panel that is active -> PaneCompositeParts -> PanelPart (CompositePart) is opening the registered panel that is active -> CompositeProgressIndicator -> ViewsService */);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -81,7 +81,7 @@ import { IStringDictionary } from 'vs/base/common/collections';
 
 // Singletons
 registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService, false);
-registerSingleton(IExtensionRecommendationNotificationService, ExtensionRecommendationNotificationService, false);
+registerSingleton(IExtensionRecommendationNotificationService, ExtensionRecommendationNotificationService, true);
 registerSingleton(IExtensionRecommendationsService, ExtensionRecommendationsService, false);
 
 Registry.as<IOutputChannelRegistry>(OutputExtensions.OutputChannels)
diff --git a/src/vs/workbench/contrib/output/browser/output.contribution.ts b/src/vs/workbench/contrib/output/browser/output.contribution.ts
@@ -34,7 +34,7 @@ import { CATEGORIES } from 'vs/workbench/common/actions';
 import { EditorExtensions } from 'vs/workbench/common/editor';
 
 // Register Service
-registerSingleton(IOutputService, OutputService, false);
+registerSingleton(IOutputService, OutputService, true);
 
 // Register Output Mode
 ModesRegistry.registerLanguage({
diff --git a/src/vs/workbench/contrib/output/common/outputChannelModelService.ts b/src/vs/workbench/contrib/output/common/outputChannelModelService.ts
@@ -57,4 +57,4 @@ export class OutputChannelModelService extends AbstractOutputChannelModelService
 	}
 }
 
-registerSingleton(IOutputChannelModelService, OutputChannelModelService, false);
+registerSingleton(IOutputChannelModelService, OutputChannelModelService, true);
diff --git a/src/vs/workbench/contrib/output/electron-sandbox/outputChannelModelService.ts b/src/vs/workbench/contrib/output/electron-sandbox/outputChannelModelService.ts
@@ -26,4 +26,4 @@ export class OutputChannelModelService extends AbstractOutputChannelModelService
 
 }
 
-registerSingleton(IOutputChannelModelService, OutputChannelModelService, false);
+registerSingleton(IOutputChannelModelService, OutputChannelModelService, true);
diff --git a/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts b/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts
@@ -113,4 +113,4 @@ export class BuiltinExtensionsScannerService implements IBuiltinExtensionsScanne
 	}
 }
 
-registerSingleton(IBuiltinExtensionsScannerService, BuiltinExtensionsScannerService, false);
+registerSingleton(IBuiltinExtensionsScannerService, BuiltinExtensionsScannerService, true);
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -711,4 +711,4 @@ class ExtensionsManager extends Disposable {
 	}
 }
 
-registerSingleton(IWorkbenchExtensionEnablementService, ExtensionEnablementService, false);
+registerSingleton(IWorkbenchExtensionEnablementService, ExtensionEnablementService, true);
diff --git a/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts b/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts
@@ -108,7 +108,6 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
 		if (isWeb) {
 			this.systemExtensionsCacheResource = joinPath(environmentService.userRoamingDataHome, 'systemExtensionsCache.json');
 			this.customBuiltinExtensionsCacheResource = joinPath(environmentService.userRoamingDataHome, 'customBuiltinExtensionsCache.json');
-			this.registerActions();
 
 			// Eventually update caches
 			lifecycleService.when(LifecyclePhase.Eventually).then(() => this.updateCaches());
@@ -867,25 +866,25 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
 		return resourceQueue;
 	}
 
-	private registerActions(): void {
-		this._register(registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: 'workbench.extensions.action.openInstalledWebExtensionsResource',
-					title: { value: localize('openInstalledWebExtensionsResource', "Open Installed Web Extensions Resource"), original: 'Open Installed Web Extensions Resource' },
-					category: CATEGORIES.Developer,
-					f1: true,
-					precondition: IsWebContext
-				});
-			}
-			run(serviceAccessor: ServicesAccessor): void {
-				const editorService = serviceAccessor.get(IEditorService);
-				const userDataProfileService = serviceAccessor.get(IUserDataProfileService);
-				editorService.openEditor({ resource: userDataProfileService.currentProfile.extensionsResource });
-			}
-		}));
-	}
+}
 
+if (isWeb) {
+	registerAction2(class extends Action2 {
+		constructor() {
+			super({
+				id: 'workbench.extensions.action.openInstalledWebExtensionsResource',
+				title: { value: localize('openInstalledWebExtensionsResource', "Open Installed Web Extensions Resource"), original: 'Open Installed Web Extensions Resource' },
+				category: CATEGORIES.Developer,
+				f1: true,
+				precondition: IsWebContext
+			});
+		}
+		run(serviceAccessor: ServicesAccessor): void {
+			const editorService = serviceAccessor.get(IEditorService);
+			const userDataProfileService = serviceAccessor.get(IUserDataProfileService);
+			editorService.openEditor({ resource: userDataProfileService.currentProfile.extensionsResource });
+		}
+	});
 }
 
-registerSingleton(IWebExtensionsScannerService, WebExtensionsScannerService, false);
+registerSingleton(IWebExtensionsScannerService, WebExtensionsScannerService, true);
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementServerService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementServerService.ts
@@ -67,4 +67,4 @@ export class ExtensionManagementServerService implements IExtensionManagementSer
 	}
 }
 
-registerSingleton(IExtensionManagementServerService, ExtensionManagementServerService, false);
+registerSingleton(IExtensionManagementServerService, ExtensionManagementServerService, true);
diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementServerService.ts b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementServerService.ts
@@ -66,4 +66,4 @@ export class ExtensionManagementServerService extends Disposable implements IExt
 	}
 }
 
-registerSingleton(IExtensionManagementServerService, ExtensionManagementServerService, false);
+registerSingleton(IExtensionManagementServerService, ExtensionManagementServerService, true);
diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts
@@ -53,4 +53,4 @@ class NativeExtensionTipsService extends ExtensionTipsService implements IExtens
 
 }
 
-registerSingleton(IExtensionTipsService, NativeExtensionTipsService, false);
+registerSingleton(IExtensionTipsService, NativeExtensionTipsService, true);
diff --git a/src/vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService.ts b/src/vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService.ts
@@ -108,4 +108,4 @@ export class ExtensionIgnoredRecommendationsService extends Disposable implement
 
 }
 
-registerSingleton(IExtensionIgnoredRecommendationsService, ExtensionIgnoredRecommendationsService, false);
+registerSingleton(IExtensionIgnoredRecommendationsService, ExtensionIgnoredRecommendationsService, true);
diff --git a/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.ts b/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.ts
@@ -266,4 +266,4 @@ export class WorkspaceExtensionsConfigService extends Disposable implements IWor
 
 }
 
-registerSingleton(IWorkspaceExtensionsConfigService, WorkspaceExtensionsConfigService, false);
+registerSingleton(IWorkspaceExtensionsConfigService, WorkspaceExtensionsConfigService, true);
diff --git a/src/vs/workbench/services/extensionResourceLoader/browser/extensionResourceLoaderService.ts b/src/vs/workbench/services/extensionResourceLoader/browser/extensionResourceLoaderService.ts
@@ -52,4 +52,4 @@ class ExtensionResourceLoaderService extends AbstractExtensionResourceLoaderServ
 	}
 }
 
-registerSingleton(IExtensionResourceLoaderService, ExtensionResourceLoaderService, false);
+registerSingleton(IExtensionResourceLoaderService, ExtensionResourceLoaderService, true);
diff --git a/src/vs/workbench/services/extensionResourceLoader/electron-sandbox/extensionResourceLoaderService.ts b/src/vs/workbench/services/extensionResourceLoader/electron-sandbox/extensionResourceLoaderService.ts
@@ -39,4 +39,4 @@ export class ExtensionResourceLoaderService extends AbstractExtensionResourceLoa
 
 }
 
-registerSingleton(IExtensionResourceLoaderService, ExtensionResourceLoaderService, false);
+registerSingleton(IExtensionResourceLoaderService, ExtensionResourceLoaderService, true);
diff --git a/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts b/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts
@@ -371,4 +371,4 @@ export class ExtensionManifestPropertiesService extends Disposable implements IE
 	}
 }
 
-registerSingleton(IExtensionManifestPropertiesService, ExtensionManifestPropertiesService, false);
+registerSingleton(IExtensionManifestPropertiesService, ExtensionManifestPropertiesService, true);
diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -605,4 +605,4 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	}
 }
 
-registerSingleton(IPreferencesService, PreferencesService, false);
+registerSingleton(IPreferencesService, PreferencesService, true);
diff --git a/src/vs/workbench/services/userDataProfile/common/userDataProfileImportExportService.ts b/src/vs/workbench/services/userDataProfile/common/userDataProfileImportExportService.ts
@@ -93,4 +93,4 @@ export class UserDataProfileImportExportService implements IUserDataProfileImpor
 
 }
 
-registerSingleton(IUserDataProfileImportExportService, UserDataProfileImportExportService, false);
+registerSingleton(IUserDataProfileImportExportService, UserDataProfileImportExportService, true);
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncEnablementService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncEnablementService.ts
@@ -18,4 +18,4 @@ export class UserDataSyncEnablementService extends BaseUserDataSyncEnablementSer
 
 }
 
-registerSingleton(IUserDataSyncEnablementService, UserDataSyncEnablementService, false);
+registerSingleton(IUserDataSyncEnablementService, UserDataSyncEnablementService, true);
diff --git a/src/vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService.ts b/src/vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService.ts
@@ -51,4 +51,4 @@ export class WebUserDataSyncEnablementService extends UserDataSyncEnablementServ
 
 }
 
-registerSingleton(IUserDataSyncEnablementService, WebUserDataSyncEnablementService, false);
+registerSingleton(IUserDataSyncEnablementService, WebUserDataSyncEnablementService, true);
diff --git a/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts b/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts
@@ -53,4 +53,4 @@ class UserDataSyncUtilService implements IUserDataSyncUtilService {
 
 }
 
-registerSingleton(IUserDataSyncUtilService, UserDataSyncUtilService, false);
+registerSingleton(IUserDataSyncUtilService, UserDataSyncUtilService, true);
diff --git a/src/vs/workbench/services/userDataSync/electron-sandbox/userDataAutoSyncService.ts b/src/vs/workbench/services/userDataSync/electron-sandbox/userDataAutoSyncService.ts
@@ -36,4 +36,4 @@ class UserDataAutoSyncService implements IUserDataAutoSyncService {
 
 }
 
-registerSingleton(IUserDataAutoSyncService, UserDataAutoSyncService, false);
+registerSingleton(IUserDataAutoSyncService, UserDataAutoSyncService, true);
diff --git a/src/vs/workbench/services/userDataSync/electron-sandbox/userDataSyncMachinesService.ts b/src/vs/workbench/services/userDataSync/electron-sandbox/userDataSyncMachinesService.ts
@@ -47,4 +47,4 @@ class UserDataSyncMachinesService extends Disposable implements IUserDataSyncMac
 
 }
 
-registerSingleton(IUserDataSyncMachinesService, UserDataSyncMachinesService, false);
+registerSingleton(IUserDataSyncMachinesService, UserDataSyncMachinesService, true);
diff --git a/src/vs/workbench/services/userDataSync/electron-sandbox/userDataSyncStoreManagementService.ts b/src/vs/workbench/services/userDataSync/electron-sandbox/userDataSyncStoreManagementService.ts
@@ -37,4 +37,4 @@ class UserDataSyncStoreManagementService extends AbstractUserDataSyncStoreManage
 
 }
 
-registerSingleton(IUserDataSyncStoreManagementService, UserDataSyncStoreManagementService, false);
+registerSingleton(IUserDataSyncStoreManagementService, UserDataSyncStoreManagementService, true);
diff --git a/src/vs/workbench/services/views/browser/viewDescriptorService.ts b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
@@ -923,4 +923,4 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 	}
 }
 
-registerSingleton(IViewDescriptorService, ViewDescriptorService, false);
+registerSingleton(IViewDescriptorService, ViewDescriptorService, true);
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
@@ -128,21 +128,21 @@ import { IUserDataSyncLogService } from 'vs/platform/userDataSync/common/userDat
 import { UserDataSyncLogService } from 'vs/platform/userDataSync/common/userDataSyncLog';
 import { IExtensionsProfileScannerService, ExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
 
-registerSingleton(IUserDataSyncLogService, UserDataSyncLogService, false);
-registerSingleton(IIgnoredExtensionsManagementService, IgnoredExtensionsManagementService, false);
-registerSingleton(IGlobalExtensionEnablementService, GlobalExtensionEnablementService, false);
-registerSingleton(IExtensionStorageService, ExtensionStorageService, false);
+registerSingleton(IUserDataSyncLogService, UserDataSyncLogService, true);
+registerSingleton(IIgnoredExtensionsManagementService, IgnoredExtensionsManagementService, true);
+registerSingleton(IGlobalExtensionEnablementService, GlobalExtensionEnablementService, true);
+registerSingleton(IExtensionStorageService, ExtensionStorageService, true);
 registerSingleton(IExtensionGalleryService, ExtensionGalleryService, true);
 registerSingleton(IContextViewService, ContextViewService, true);
 registerSingleton(IListService, ListService, true);
 registerSingleton(IEditorWorkerService, EditorWorkerService, false);
-registerSingleton(IMarkerDecorationsService, MarkerDecorationsService, false);
+registerSingleton(IMarkerDecorationsService, MarkerDecorationsService, true);
 registerSingleton(IMarkerService, MarkerService, true);
 registerSingleton(IContextKeyService, ContextKeyService, false);
-registerSingleton(ITextResourceConfigurationService, TextResourceConfigurationService, false);
+registerSingleton(ITextResourceConfigurationService, TextResourceConfigurationService, true);
 registerSingleton(IDownloadService, DownloadService, true);
 registerSingleton(IOpenerService, OpenerService, true);
-registerSingleton(IExtensionsProfileScannerService, ExtensionsProfileScannerService, false);
+registerSingleton(IExtensionsProfileScannerService, ExtensionsProfileScannerService, true);
 
 //#endregion
 
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
@@ -88,7 +88,7 @@ import 'vs/workbench/services/extensions/electron-sandbox/sandboxExtensionServic
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IUserDataInitializationService, UserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit';
 
-registerSingleton(IUserDataInitializationService, UserDataInitializationService, false);
+registerSingleton(IUserDataInitializationService, UserDataInitializationService, true);
 
 //#endregion
 
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
@@ -91,18 +91,18 @@ import { IDiagnosticsService, NullDiagnosticsService } from 'vs/platform/diagnos
 import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
 import { WebLanguagePacksService } from 'vs/platform/languagePacks/browser/languagePacks';
 
-registerSingleton(IWorkbenchExtensionManagementService, ExtensionManagementService, false);
+registerSingleton(IWorkbenchExtensionManagementService, ExtensionManagementService, true);
 registerSingleton(IAccessibilityService, AccessibilityService, true);
 registerSingleton(IContextMenuService, ContextMenuService, false);
-registerSingleton(ILoggerService, FileLoggerService, false);
-registerSingleton(IUserDataSyncStoreService, UserDataSyncStoreService, false);
-registerSingleton(IUserDataSyncMachinesService, UserDataSyncMachinesService, false);
-registerSingleton(IUserDataSyncBackupStoreService, UserDataSyncBackupStoreService, false);
-registerSingleton(IUserDataSyncAccountService, UserDataSyncAccountService, false);
-registerSingleton(IUserDataSyncService, UserDataSyncService, false);
+registerSingleton(ILoggerService, FileLoggerService, true);
+registerSingleton(IUserDataSyncStoreService, UserDataSyncStoreService, true);
+registerSingleton(IUserDataSyncMachinesService, UserDataSyncMachinesService, true);
+registerSingleton(IUserDataSyncBackupStoreService, UserDataSyncBackupStoreService, true);
+registerSingleton(IUserDataSyncAccountService, UserDataSyncAccountService, true);
+registerSingleton(IUserDataSyncService, UserDataSyncService, true);
 registerSingleton(IUserDataAutoSyncService, UserDataAutoSyncService, false);
 registerSingleton(ITitleService, TitlebarPart, false);
-registerSingleton(IExtensionTipsService, ExtensionTipsService, false);
+registerSingleton(IExtensionTipsService, ExtensionTipsService, true);
 registerSingleton(ITimerService, TimerService, false);
 registerSingleton(ICustomEndpointTelemetryService, NullEndpointTelemetryService, true);
 registerSingleton(IDiagnosticsService, NullDiagnosticsService, true);

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,4 @@ export class ExtensionsScannerService extends NativeExtensionsScannerService imp`
`35`	`35`
`36`	`36`	`}`
`37`	`37`
`38`		`-registerSingleton(IExtensionsScannerService, ExtensionsScannerService, false);`
	`38`	`+registerSingleton(IExtensionsScannerService, ExtensionsScannerService, true);`
Original file line number	Diff line number	Diff line change
`@@ -648,4 +648,5 @@ export function getPartByLocation(viewContainerLocation: ViewContainerLocation):`
`648`	`648`	`}`
`649`	`649`	`}`
`650`	`650`
`651`		`-registerSingleton(IViewsService, ViewsService, false);`
	`651`	`+registerSingleton(IViewsService, ViewsService, false /* Eager because of the cyclic dependency when registering PaneComposites (Panel that is active) in its constructor:`
	`652`	`+ViewsService is registering a panel that is active -> PaneCompositeParts -> PanelPart (CompositePart) is opening the registered panel that is active -> CompositeProgressIndicator -> ViewsService */);`
Original file line number	Diff line number	Diff line change
`@@ -57,4 +57,4 @@ export class OutputChannelModelService extends AbstractOutputChannelModelService`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`-registerSingleton(IOutputChannelModelService, OutputChannelModelService, false);`
	`60`	`+registerSingleton(IOutputChannelModelService, OutputChannelModelService, true);`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@ export class OutputChannelModelService extends AbstractOutputChannelModelService`
`26`	`26`
`27`	`27`	`}`
`28`	`28`
`29`		`-registerSingleton(IOutputChannelModelService, OutputChannelModelService, false);`
	`29`	`+registerSingleton(IOutputChannelModelService, OutputChannelModelService, true);`
Original file line number	Diff line number	Diff line change
`@@ -113,4 +113,4 @@ export class BuiltinExtensionsScannerService implements IBuiltinExtensionsScanne`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`-registerSingleton(IBuiltinExtensionsScannerService, BuiltinExtensionsScannerService, false);`
	`116`	`+registerSingleton(IBuiltinExtensionsScannerService, BuiltinExtensionsScannerService, true);`
Original file line number	Diff line number	Diff line change
`@@ -711,4 +711,4 @@ class ExtensionsManager extends Disposable {`
`711`	`711`	`}`
`712`	`712`	`}`
`713`	`713`
`714`		`-registerSingleton(IWorkbenchExtensionEnablementService, ExtensionEnablementService, false);`
	`714`	`+registerSingleton(IWorkbenchExtensionEnablementService, ExtensionEnablementService, true);`