Merge pull request microsoft#159314 from microsoft/joh/registerSingleton-explicit

When calling `registerSingleton` you must signal if you support delayed instantiation

Author: jrieken

src/vs/editor/common/languages/languageConfigurationRegistry.ts

@@ -474,4 +474,4 @@ export class ResolvedLanguageConfiguration {
 	}
 }
 
-registerSingleton(ILanguageConfigurationService, LanguageConfigurationService);
+registerSingleton(ILanguageConfigurationService, LanguageConfigurationService, false);

src/vs/editor/contrib/codelens/browser/codeLensCache.ts

@@ -129,4 +129,4 @@ export class CodeLensCache implements ICodeLensCache {
 	}
 }
 
-registerSingleton(ICodeLensCache, CodeLensCache);
+registerSingleton(ICodeLensCache, CodeLensCache, false);

src/vs/editor/contrib/peekView/browser/peekView.ts

@@ -53,7 +53,7 @@ registerSingleton(IPeekViewService, class implements IPeekViewService {
 		};
 		this._widgets.set(editor, { widget, listener: widget.onDidClose(remove) });
 	}
-});
+}, true);
 
 export namespace PeekContext {
 	export const inPeekEditor = new RawContextKey<boolean>('inReferenceSearchEditor', true, nls.localize('inReferenceSearchEditor', "Whether the current code editor is embedded inside peek"));

src/vs/editor/standalone/browser/standaloneCodeEditorService.ts

@@ -103,4 +103,4 @@ export class StandaloneCodeEditorService extends AbstractCodeEditorService {
 	}
 }
 
-registerSingleton(ICodeEditorService, StandaloneCodeEditorService);
+registerSingleton(ICodeEditorService, StandaloneCodeEditorService, false);

src/vs/editor/standalone/browser/standaloneLayoutService.ts

@@ -63,4 +63,4 @@ export class EditorScopedLayoutService extends StandaloneLayoutService {
 	}
 }
 
-registerSingleton(ILayoutService, StandaloneLayoutService);
+registerSingleton(ILayoutService, StandaloneLayoutService, false);

src/vs/editor/standalone/browser/standaloneServices.ts

@@ -959,38 +959,38 @@ export interface IEditorOverrideServices {
 	[index: string]: any;
 }
 
-registerSingleton(IConfigurationService, StandaloneConfigurationService);
-registerSingleton(ITextResourceConfigurationService, StandaloneResourceConfigurationService);
-registerSingleton(ITextResourcePropertiesService, StandaloneResourcePropertiesService);
-registerSingleton(IWorkspaceContextService, StandaloneWorkspaceContextService);
-registerSingleton(ILabelService, StandaloneUriLabelService);
-registerSingleton(ITelemetryService, StandaloneTelemetryService);
-registerSingleton(IDialogService, StandaloneDialogService);
-registerSingleton(INotificationService, StandaloneNotificationService);
-registerSingleton(IMarkerService, MarkerService);
-registerSingleton(ILanguageService, StandaloneLanguageService);
-registerSingleton(IStandaloneThemeService, StandaloneThemeService);
-registerSingleton(ILogService, StandaloneLogService);
-registerSingleton(IModelService, ModelService);
-registerSingleton(IMarkerDecorationsService, MarkerDecorationsService);
-registerSingleton(IContextKeyService, ContextKeyService);
-registerSingleton(IProgressService, StandaloneProgressService);
-registerSingleton(IEditorProgressService, StandaloneEditorProgressService);
-registerSingleton(IStorageService, InMemoryStorageService);
-registerSingleton(IEditorWorkerService, EditorWorkerService);
-registerSingleton(IBulkEditService, StandaloneBulkEditService);
-registerSingleton(IWorkspaceTrustManagementService, StandaloneWorkspaceTrustManagementService);
-registerSingleton(ITextModelService, StandaloneTextModelService);
-registerSingleton(IAccessibilityService, AccessibilityService);
-registerSingleton(IListService, ListService);
-registerSingleton(ICommandService, StandaloneCommandService);
-registerSingleton(IKeybindingService, StandaloneKeybindingService);
-registerSingleton(IQuickInputService, StandaloneQuickInputService);
-registerSingleton(IContextViewService, StandaloneContextViewService);
-registerSingleton(IOpenerService, OpenerService);
-registerSingleton(IClipboardService, BrowserClipboardService);
-registerSingleton(IContextMenuService, StandaloneContextMenuService);
-registerSingleton(IMenuService, MenuService);
+registerSingleton(IConfigurationService, StandaloneConfigurationService, false);
+registerSingleton(ITextResourceConfigurationService, StandaloneResourceConfigurationService, false);
+registerSingleton(ITextResourcePropertiesService, StandaloneResourcePropertiesService, false);
+registerSingleton(IWorkspaceContextService, StandaloneWorkspaceContextService, false);
+registerSingleton(ILabelService, StandaloneUriLabelService, false);
+registerSingleton(ITelemetryService, StandaloneTelemetryService, false);
+registerSingleton(IDialogService, StandaloneDialogService, false);
+registerSingleton(INotificationService, StandaloneNotificationService, false);
+registerSingleton(IMarkerService, MarkerService, false);
+registerSingleton(ILanguageService, StandaloneLanguageService, false);
+registerSingleton(IStandaloneThemeService, StandaloneThemeService, false);
+registerSingleton(ILogService, StandaloneLogService, false);
+registerSingleton(IModelService, ModelService, false);
+registerSingleton(IMarkerDecorationsService, MarkerDecorationsService, false);
+registerSingleton(IContextKeyService, ContextKeyService, false);
+registerSingleton(IProgressService, StandaloneProgressService, false);
+registerSingleton(IEditorProgressService, StandaloneEditorProgressService, false);
+registerSingleton(IStorageService, InMemoryStorageService, false);
+registerSingleton(IEditorWorkerService, EditorWorkerService, false);
+registerSingleton(IBulkEditService, StandaloneBulkEditService, false);
+registerSingleton(IWorkspaceTrustManagementService, StandaloneWorkspaceTrustManagementService, false);
+registerSingleton(ITextModelService, StandaloneTextModelService, false);
+registerSingleton(IAccessibilityService, AccessibilityService, false);
+registerSingleton(IListService, ListService, false);
+registerSingleton(ICommandService, StandaloneCommandService, false);
+registerSingleton(IKeybindingService, StandaloneKeybindingService, false);
+registerSingleton(IQuickInputService, StandaloneQuickInputService, false);
+registerSingleton(IContextViewService, StandaloneContextViewService, false);
+registerSingleton(IOpenerService, OpenerService, false);
+registerSingleton(IClipboardService, BrowserClipboardService, false);
+registerSingleton(IContextMenuService, StandaloneContextMenuService, false);
+registerSingleton(IMenuService, MenuService, false);
 
 /**
  * We don't want to eagerly instantiate services because embedders get a one time chance

src/vs/platform/extensionManagement/electron-sandbox/extensionsScannerService.ts

@@ -35,4 +35,4 @@ export class ExtensionsScannerService extends NativeExtensionsScannerService imp
 
 }
 
-registerSingleton(IExtensionsScannerService, ExtensionsScannerService);
+registerSingleton(IExtensionsScannerService, ExtensionsScannerService, false);

src/vs/platform/instantiation/common/extensions.ts

@@ -8,7 +8,7 @@ import { BrandedService, ServiceIdentifier } from './instantiation';
 
 const _registry: [ServiceIdentifier<any>, SyncDescriptor<any>][] = [];
 
-export function registerSingleton<T, Services extends BrandedService[]>(id: ServiceIdentifier<T>, ctor: new (...services: Services) => T, supportsDelayedInstantiation?: boolean): void;
+export function registerSingleton<T, Services extends BrandedService[]>(id: ServiceIdentifier<T>, ctor: new (...services: Services) => T, supportsDelayedInstantiation: boolean): void;
 export function registerSingleton<T, Services extends BrandedService[]>(id: ServiceIdentifier<T>, descriptor: SyncDescriptor<any>): void;
 export function registerSingleton<T, Services extends BrandedService[]>(id: ServiceIdentifier<T>, ctorOrDescriptor: { new(...services: Services): T } | SyncDescriptor<any>, supportsDelayedInstantiation?: boolean): void {
 	if (!(ctorOrDescriptor instanceof SyncDescriptor)) {

src/vs/platform/undoRedo/common/undoRedoService.ts

@@ -1393,4 +1393,4 @@ class WorkspaceVerificationError {
 	constructor(public readonly returnValue: Promise<void> | void) { }
 }
 
-registerSingleton(IUndoRedoService, UndoRedoService);
+registerSingleton(IUndoRedoService, UndoRedoService, false);

src/vs/workbench/api/common/extHost.common.services.ts

@@ -29,26 +29,26 @@ 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);
-registerSingleton(ILogService, ExtHostLogService);
-registerSingleton(IExtHostApiDeprecationService, ExtHostApiDeprecationService);
-registerSingleton(IExtHostCommands, ExtHostCommands);
-registerSingleton(IExtHostConfiguration, ExtHostConfiguration);
-registerSingleton(IExtHostConsumerFileSystem, ExtHostConsumerFileSystem);
-registerSingleton(IExtHostDebugService, WorkerExtHostDebugService);
-registerSingleton(IExtHostDecorations, ExtHostDecorations);
-registerSingleton(IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors);
-registerSingleton(IExtHostFileSystemInfo, ExtHostFileSystemInfo);
-registerSingleton(IExtHostOutputService, ExtHostOutputService);
-registerSingleton(IExtHostSearch, ExtHostSearch);
-registerSingleton(IExtHostStorage, ExtHostStorage);
-registerSingleton(IExtHostTask, WorkerExtHostTask);
-registerSingleton(IExtHostTerminalService, WorkerExtHostTerminalService);
-registerSingleton(IExtHostTunnelService, ExtHostTunnelService);
-registerSingleton(IExtHostWindow, ExtHostWindow);
-registerSingleton(IExtHostWorkspace, ExtHostWorkspace);
-registerSingleton(IExtHostSecretState, ExtHostSecretState);
-registerSingleton(IExtHostTelemetry, ExtHostTelemetry);
-registerSingleton(IExtHostTelemetryLogService, ExtHostTelemetryLogService);
-registerSingleton(IExtHostEditorTabs, ExtHostEditorTabs);
-registerSingleton(IExtHostVariableResolverProvider, ExtHostVariableResolverProviderService);
+registerSingleton(ILoggerService, ExtHostLoggerService, false);
+registerSingleton(ILogService, ExtHostLogService, false);
+registerSingleton(IExtHostApiDeprecationService, ExtHostApiDeprecationService, false);
+registerSingleton(IExtHostCommands, ExtHostCommands, false);
+registerSingleton(IExtHostConfiguration, ExtHostConfiguration, false);
+registerSingleton(IExtHostConsumerFileSystem, ExtHostConsumerFileSystem, false);
+registerSingleton(IExtHostDebugService, WorkerExtHostDebugService, false);
+registerSingleton(IExtHostDecorations, ExtHostDecorations, false);
+registerSingleton(IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors, false);
+registerSingleton(IExtHostFileSystemInfo, ExtHostFileSystemInfo, false);
+registerSingleton(IExtHostOutputService, ExtHostOutputService, false);
+registerSingleton(IExtHostSearch, ExtHostSearch, false);
+registerSingleton(IExtHostStorage, ExtHostStorage, false);
+registerSingleton(IExtHostTask, WorkerExtHostTask, false);
+registerSingleton(IExtHostTerminalService, WorkerExtHostTerminalService, false);
+registerSingleton(IExtHostTunnelService, ExtHostTunnelService, false);
+registerSingleton(IExtHostWindow, ExtHostWindow, false);
+registerSingleton(IExtHostWorkspace, ExtHostWorkspace, false);
+registerSingleton(IExtHostSecretState, ExtHostSecretState, false);
+registerSingleton(IExtHostTelemetry, ExtHostTelemetry, false);
+registerSingleton(IExtHostTelemetryLogService, ExtHostTelemetryLogService, false);
+registerSingleton(IExtHostEditorTabs, ExtHostEditorTabs, false);
+registerSingleton(IExtHostVariableResolverProvider, ExtHostVariableResolverProviderService, false);