diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditorService.ts b/src/vs/editor/standalone/browser/standaloneCodeEditorService.ts index ede841ad4492a..f5b83651667bb 100644 --- a/src/vs/editor/standalone/browser/standaloneCodeEditorService.ts +++ b/src/vs/editor/standalone/browser/standaloneCodeEditorService.ts @@ -14,7 +14,7 @@ import { ScrollType } from 'vs/editor/common/editorCommon'; import { ITextModel } from 'vs/editor/common/model'; import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { ITextResourceEditorInput } from 'vs/platform/editor/common/editor'; -import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; +import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { IThemeService } from 'vs/platform/theme/common/themeService'; export class StandaloneCodeEditorService extends AbstractCodeEditorService { @@ -103,4 +103,4 @@ export class StandaloneCodeEditorService extends AbstractCodeEditorService { } } -registerSingleton(ICodeEditorService, StandaloneCodeEditorService, false); +registerSingleton(ICodeEditorService, StandaloneCodeEditorService, InstantiationType.Eager); diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts index 6dadd4d31c6cf..330e8e9b00bed 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts @@ -58,7 +58,7 @@ import { ContextViewService } from 'vs/platform/contextview/browser/contextViewS import { LanguageService } from 'vs/editor/common/services/languageService'; import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { getSingletonServiceDescriptors, registerSingleton } from 'vs/platform/instantiation/common/extensions'; +import { getSingletonServiceDescriptors, InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { OpenerService } from 'vs/editor/browser/services/openerService'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker'; import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService'; @@ -975,38 +975,38 @@ export interface IEditorOverrideServices { [index: string]: any; } -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); +registerSingleton(IConfigurationService, StandaloneConfigurationService, InstantiationType.Eager); +registerSingleton(ITextResourceConfigurationService, StandaloneResourceConfigurationService, InstantiationType.Eager); +registerSingleton(ITextResourcePropertiesService, StandaloneResourcePropertiesService, InstantiationType.Eager); +registerSingleton(IWorkspaceContextService, StandaloneWorkspaceContextService, InstantiationType.Eager); +registerSingleton(ILabelService, StandaloneUriLabelService, InstantiationType.Eager); +registerSingleton(ITelemetryService, StandaloneTelemetryService, InstantiationType.Eager); +registerSingleton(IDialogService, StandaloneDialogService, InstantiationType.Eager); +registerSingleton(INotificationService, StandaloneNotificationService, InstantiationType.Eager); +registerSingleton(IMarkerService, MarkerService, InstantiationType.Eager); +registerSingleton(ILanguageService, StandaloneLanguageService, InstantiationType.Eager); +registerSingleton(IStandaloneThemeService, StandaloneThemeService, InstantiationType.Eager); +registerSingleton(ILogService, StandaloneLogService, InstantiationType.Eager); +registerSingleton(IModelService, ModelService, InstantiationType.Eager); +registerSingleton(IMarkerDecorationsService, MarkerDecorationsService, InstantiationType.Eager); +registerSingleton(IContextKeyService, ContextKeyService, InstantiationType.Eager); +registerSingleton(IProgressService, StandaloneProgressService, InstantiationType.Eager); +registerSingleton(IEditorProgressService, StandaloneEditorProgressService, InstantiationType.Eager); +registerSingleton(IStorageService, InMemoryStorageService, InstantiationType.Eager); +registerSingleton(IEditorWorkerService, EditorWorkerService, InstantiationType.Eager); +registerSingleton(IBulkEditService, StandaloneBulkEditService, InstantiationType.Eager); +registerSingleton(IWorkspaceTrustManagementService, StandaloneWorkspaceTrustManagementService, InstantiationType.Eager); +registerSingleton(ITextModelService, StandaloneTextModelService, InstantiationType.Eager); +registerSingleton(IAccessibilityService, AccessibilityService, InstantiationType.Eager); +registerSingleton(IListService, ListService, InstantiationType.Eager); +registerSingleton(ICommandService, StandaloneCommandService, InstantiationType.Eager); +registerSingleton(IKeybindingService, StandaloneKeybindingService, InstantiationType.Eager); +registerSingleton(IQuickInputService, StandaloneQuickInputService, InstantiationType.Eager); +registerSingleton(IContextViewService, StandaloneContextViewService, InstantiationType.Eager); +registerSingleton(IOpenerService, OpenerService, InstantiationType.Eager); +registerSingleton(IClipboardService, BrowserClipboardService, InstantiationType.Eager); +registerSingleton(IContextMenuService, StandaloneContextMenuService, InstantiationType.Eager); +registerSingleton(IMenuService, MenuService, InstantiationType.Eager); /** * We don't want to eagerly instantiate services because embedders get a one time chance diff --git a/src/vs/platform/instantiation/common/extensions.ts b/src/vs/platform/instantiation/common/extensions.ts index 6b3cb6ac484bd..01d53e95eaa94 100644 --- a/src/vs/platform/instantiation/common/extensions.ts +++ b/src/vs/platform/instantiation/common/extensions.ts @@ -22,7 +22,7 @@ export const enum InstantiationType { Delayed = 1 } -export function registerSingleton(id: ServiceIdentifier, ctor: new (...services: Services) => T, supportsDelayedInstantiation: false | InstantiationType): void; +export function registerSingleton(id: ServiceIdentifier, ctor: new (...services: Services) => T, supportsDelayedInstantiation: InstantiationType): void; export function registerSingleton(id: ServiceIdentifier, descriptor: SyncDescriptor): void; export function registerSingleton(id: ServiceIdentifier, ctorOrDescriptor: { new(...services: Services): T } | SyncDescriptor, supportsDelayedInstantiation?: boolean | InstantiationType): void { if (!(ctorOrDescriptor instanceof SyncDescriptor)) { diff --git a/src/vs/workbench/api/common/extHost.common.services.ts b/src/vs/workbench/api/common/extHost.common.services.ts index f5e48cd8854ce..832f25d8f5ad9 100644 --- a/src/vs/workbench/api/common/extHost.common.services.ts +++ b/src/vs/workbench/api/common/extHost.common.services.ts @@ -32,23 +32,23 @@ import { ExtHostLocalizationService, IExtHostLocalizationService } from 'vs/work registerSingleton(IExtHostLocalizationService, ExtHostLocalizationService, InstantiationType.Delayed); registerSingleton(ILoggerService, ExtHostLoggerService, InstantiationType.Delayed); registerSingleton(ILogService, ExtHostLogService, InstantiationType.Delayed); -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(IExtHostApiDeprecationService, ExtHostApiDeprecationService, InstantiationType.Delayed); +registerSingleton(IExtHostCommands, ExtHostCommands, InstantiationType.Eager); +registerSingleton(IExtHostConfiguration, ExtHostConfiguration, InstantiationType.Eager); +registerSingleton(IExtHostConsumerFileSystem, ExtHostConsumerFileSystem, InstantiationType.Eager); +registerSingleton(IExtHostDebugService, WorkerExtHostDebugService, InstantiationType.Eager); +registerSingleton(IExtHostDecorations, ExtHostDecorations, InstantiationType.Eager); +registerSingleton(IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors, InstantiationType.Eager); +registerSingleton(IExtHostFileSystemInfo, ExtHostFileSystemInfo, InstantiationType.Eager); registerSingleton(IExtHostOutputService, ExtHostOutputService, InstantiationType.Delayed); -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(IExtHostEditorTabs, ExtHostEditorTabs, false); -registerSingleton(IExtHostVariableResolverProvider, ExtHostVariableResolverProviderService, false); +registerSingleton(IExtHostSearch, ExtHostSearch, InstantiationType.Eager); +registerSingleton(IExtHostStorage, ExtHostStorage, InstantiationType.Eager); +registerSingleton(IExtHostTask, WorkerExtHostTask, InstantiationType.Eager); +registerSingleton(IExtHostTerminalService, WorkerExtHostTerminalService, InstantiationType.Eager); +registerSingleton(IExtHostTunnelService, ExtHostTunnelService, InstantiationType.Eager); +registerSingleton(IExtHostWindow, ExtHostWindow, InstantiationType.Eager); +registerSingleton(IExtHostWorkspace, ExtHostWorkspace, InstantiationType.Eager); +registerSingleton(IExtHostSecretState, ExtHostSecretState, InstantiationType.Eager); +registerSingleton(IExtHostTelemetry, ExtHostTelemetry, InstantiationType.Eager); +registerSingleton(IExtHostEditorTabs, ExtHostEditorTabs, InstantiationType.Eager); +registerSingleton(IExtHostVariableResolverProvider, ExtHostVariableResolverProviderService, InstantiationType.Eager); diff --git a/src/vs/workbench/api/node/extHost.node.services.ts b/src/vs/workbench/api/node/extHost.node.services.ts index 98d300f7d8c00..71f2dcabb81ba 100644 --- a/src/vs/workbench/api/node/extHost.node.services.ts +++ b/src/vs/workbench/api/node/extHost.node.services.ts @@ -29,13 +29,13 @@ import { IExtHostVariableResolverProvider } from 'vs/workbench/api/common/extHos // ### ### // ######################################################################### -registerSingleton(IExtHostExtensionService, ExtHostExtensionService, false); +registerSingleton(IExtHostExtensionService, ExtHostExtensionService, InstantiationType.Eager); registerSingleton(ILoggerService, ExtHostLoggerService, InstantiationType.Delayed); -registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths, false); +registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths, InstantiationType.Eager); -registerSingleton(IExtHostDebugService, ExtHostDebugService, false); -registerSingleton(IExtHostSearch, NativeExtHostSearch, false); -registerSingleton(IExtHostTask, ExtHostTask, false); -registerSingleton(IExtHostTerminalService, ExtHostTerminalService, false); -registerSingleton(IExtHostTunnelService, ExtHostTunnelService, false); -registerSingleton(IExtHostVariableResolverProvider, NodeExtHostVariableResolverProviderService, false); +registerSingleton(IExtHostDebugService, ExtHostDebugService, InstantiationType.Eager); +registerSingleton(IExtHostSearch, NativeExtHostSearch, InstantiationType.Eager); +registerSingleton(IExtHostTask, ExtHostTask, InstantiationType.Eager); +registerSingleton(IExtHostTerminalService, ExtHostTerminalService, InstantiationType.Eager); +registerSingleton(IExtHostTunnelService, ExtHostTunnelService, InstantiationType.Eager); +registerSingleton(IExtHostVariableResolverProvider, NodeExtHostVariableResolverProviderService, InstantiationType.Eager); diff --git a/src/vs/workbench/api/worker/extHost.worker.services.ts b/src/vs/workbench/api/worker/extHost.worker.services.ts index 78778cc446f5f..e284ed6752b42 100644 --- a/src/vs/workbench/api/worker/extHost.worker.services.ts +++ b/src/vs/workbench/api/worker/extHost.worker.services.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; +import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService'; import { ExtensionStoragePaths, IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths'; import { ExtHostExtensionService } from 'vs/workbench/api/worker/extHostExtensionService'; @@ -14,5 +14,5 @@ import { ExtHostExtensionService } from 'vs/workbench/api/worker/extHostExtensio // ### ### // ######################################################################### -registerSingleton(IExtHostExtensionService, ExtHostExtensionService, false); -registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths, false); +registerSingleton(IExtHostExtensionService, ExtHostExtensionService, InstantiationType.Eager); +registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths, InstantiationType.Eager);