make registerSingleton only accept InstantiationType or false

src/vs/editor/common/services/languageFeatureDebounce.ts

@@ -8,7 +8,7 @@ import { LRUCache } from 'vs/base/common/map';
 import { clamp, MovingAverage, SlidingWindowAverage } from 'vs/base/common/numbers';
 import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
 import { ITextModel } from 'vs/editor/common/model';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import { matchesScheme } from 'vs/platform/opener/common/opener';
@@ -136,4 +136,4 @@ export class LanguageFeatureDebounceService implements ILanguageFeatureDebounceS
 	}
 }
 
-registerSingleton(ILanguageFeatureDebounceService, LanguageFeatureDebounceService, true);
+registerSingleton(ILanguageFeatureDebounceService, LanguageFeatureDebounceService, InstantiationType.Delayed);

src/vs/editor/common/services/languageFeaturesService.ts

@@ -7,7 +7,7 @@ import { URI } from 'vs/base/common/uri';
 import { LanguageFeatureRegistry, NotebookInfo, NotebookInfoResolver } from 'vs/editor/common/languageFeatureRegistry';
 import { CodeActionProvider, CodeLensProvider, CompletionItemProvider, DocumentPasteEditProvider, DeclarationProvider, DefinitionProvider, DocumentColorProvider, DocumentFormattingEditProvider, DocumentHighlightProvider, DocumentOnDropEditProvider, DocumentRangeFormattingEditProvider, DocumentRangeSemanticTokensProvider, DocumentSemanticTokensProvider, DocumentSymbolProvider, EvaluatableExpressionProvider, FoldingRangeProvider, HoverProvider, ImplementationProvider, InlayHintsProvider, InlineCompletionsProvider, InlineValuesProvider, LinkedEditingRangeProvider, LinkProvider, OnTypeFormattingEditProvider, ReferenceProvider, RenameProvider, SelectionRangeProvider, SignatureHelpProvider, TypeDefinitionProvider } from 'vs/editor/common/languages';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export class LanguageFeaturesService implements ILanguageFeaturesService {
 
@@ -55,4 +55,4 @@ export class LanguageFeaturesService implements ILanguageFeaturesService {
 
 }
 
-registerSingleton(ILanguageFeaturesService, LanguageFeaturesService, true);
+registerSingleton(ILanguageFeaturesService, LanguageFeaturesService, InstantiationType.Delayed);

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

@@ -10,7 +10,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
 import { CodeLens, CodeLensList, CodeLensProvider } from 'vs/editor/common/languages';
 import { CodeLensModel } from 'vs/editor/contrib/codelens/browser/codelens';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from 'vs/platform/storage/common/storage';
 
@@ -129,4 +129,4 @@ export class CodeLensCache implements ICodeLensCache {
 	}
 }
 
-registerSingleton(ICodeLensCache, CodeLensCache, true);
+registerSingleton(ICodeLensCache, CodeLensCache, InstantiationType.Delayed);

src/vs/editor/contrib/documentSymbols/browser/outlineModel.ts

@@ -17,7 +17,7 @@ import { DocumentSymbol, DocumentSymbolProvider } from 'vs/editor/common/languag
 import { MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IModelService } from 'vs/editor/common/services/model';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
@@ -485,4 +485,4 @@ export class OutlineModelService implements IOutlineModelService {
 	}
 }
 
-registerSingleton(IOutlineModelService, OutlineModelService, true);
+registerSingleton(IOutlineModelService, OutlineModelService, InstantiationType.Delayed);

src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts

@@ -12,7 +12,7 @@ import { URI } from 'vs/base/common/uri';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IMarker, IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -221,4 +221,4 @@ class MarkerNavigationService implements IMarkerNavigationService, IMarkerListPr
 	}
 }
 
-registerSingleton(IMarkerNavigationService, MarkerNavigationService, true);
+registerSingleton(IMarkerNavigationService, MarkerNavigationService, InstantiationType.Delayed);

src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.ts

@@ -15,7 +15,7 @@ import { OneReference, ReferencesModel } from 'vs/editor/contrib/gotoSymbol/brow
 import { localize } from 'vs/nls';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { createDecorator, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -149,7 +149,7 @@ class SymbolNavigationService implements ISymbolNavigationService {
 	}
 }
 
-registerSingleton(ISymbolNavigationService, SymbolNavigationService, true);
+registerSingleton(ISymbolNavigationService, SymbolNavigationService, InstantiationType.Delayed);
 
 registerEditorCommand(new class extends EditorCommand {
 

src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts

@@ -29,7 +29,7 @@ import { ClickLinkGesture, ClickLinkMouseEvent } from 'vs/editor/contrib/gotoSym
 import { InlayHintAnchor, InlayHintItem, InlayHintsFragments } from 'vs/editor/contrib/inlayHints/browser/inlayHints';
 import { goToDefinitionWithLocation, showGoToContextMenu } from 'vs/editor/contrib/inlayHints/browser/inlayHintsLocations';
 import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import * as colors from 'vs/platform/theme/common/colorRegistry';
@@ -60,7 +60,7 @@ class InlayHintsCache {
 
 interface IInlayHintsCache extends InlayHintsCache { }
 const IInlayHintsCache = createDecorator<IInlayHintsCache>('IInlayHintsCache');
-registerSingleton(IInlayHintsCache, InlayHintsCache, true);
+registerSingleton(IInlayHintsCache, InlayHintsCache, InstantiationType.Delayed);
 
 // --- rendered label
 

src/vs/editor/contrib/suggest/browser/suggestMemory.ts

@@ -12,7 +12,7 @@ import { ITextModel } from 'vs/editor/common/model';
 import { CompletionItemKind, CompletionItemKinds } from 'vs/editor/common/languages';
 import { CompletionItem } from 'vs/editor/contrib/suggest/browser/suggest';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from 'vs/platform/storage/common/storage';
 
@@ -306,4 +306,4 @@ export interface ISuggestMemoryService {
 	select(model: ITextModel, pos: IPosition, items: CompletionItem[]): number;
 }
 
-registerSingleton(ISuggestMemoryService, SuggestMemoryService, true);
+registerSingleton(ISuggestMemoryService, SuggestMemoryService, InstantiationType.Delayed);

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

@@ -7,7 +7,7 @@ import * as dom from 'vs/base/browser/dom';
 import { Event } from 'vs/base/common/event';
 import { ILayoutService, ILayoutOffsetInfo } from 'vs/platform/layout/browser/layoutService';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 class StandaloneLayoutService implements ILayoutService {
 	declare readonly _serviceBrand: undefined;
@@ -63,4 +63,4 @@ export class EditorScopedLayoutService extends StandaloneLayoutService {
 	}
 }
 
-registerSingleton(ILayoutService, StandaloneLayoutService, true);
+registerSingleton(ILayoutService, StandaloneLayoutService, InstantiationType.Delayed);

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

@@ -8,7 +8,7 @@ import { INativeEnvironmentService } from 'vs/platform/environment/common/enviro
 import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
 import { IExtensionsScannerService, NativeExtensionsScannerService, } from 'vs/platform/extensionManagement/common/extensionsScannerService';
 import { IFileService } from 'vs/platform/files/common/files';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IProductService } from 'vs/platform/product/common/productService';
@@ -35,4 +35,4 @@ export class ExtensionsScannerService extends NativeExtensionsScannerService imp
 
 }
 
-registerSingleton(IExtensionsScannerService, ExtensionsScannerService, true);
+registerSingleton(IExtensionsScannerService, ExtensionsScannerService, InstantiationType.Delayed);

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

@@ -22,7 +22,7 @@ export const enum InstantiationType {
 	Delayed = 1
 }
 
-export function registerSingleton<T, Services extends BrandedService[]>(id: ServiceIdentifier<T>, ctor: new (...services: Services) => T, supportsDelayedInstantiation: boolean | InstantiationType): void;
+export function registerSingleton<T, Services extends BrandedService[]>(id: ServiceIdentifier<T>, ctor: new (...services: Services) => T, supportsDelayedInstantiation: false | InstantiationType): 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 | InstantiationType): void {
 	if (!(ctorOrDescriptor instanceof SyncDescriptor)) {

src/vs/platform/uriIdentity/common/uriIdentityService.ts

@@ -5,7 +5,7 @@
 
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { URI } from 'vs/base/common/uri';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IFileService, FileSystemProviderCapabilities, IFileSystemProviderCapabilitiesChangeEvent, IFileSystemProviderRegistrationEvent } from 'vs/platform/files/common/files';
 import { ExtUri, IExtUri, normalizePath } from 'vs/base/common/resources';
 import { SkipList } from 'vs/base/common/skipList';
@@ -114,4 +114,4 @@ export class UriIdentityService implements IUriIdentityService {
 	}
 }
 
-registerSingleton(IUriIdentityService, UriIdentityService, true);
+registerSingleton(IUriIdentityService, UriIdentityService, InstantiationType.Delayed);

src/vs/workbench/api/common/extHost.common.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 { IExtHostOutputService, ExtHostOutputService } from 'vs/workbench/api/common/extHostOutput';
 import { IExtHostWorkspace, ExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
 import { IExtHostDecorations, ExtHostDecorations } from 'vs/workbench/api/common/extHostDecorations';
@@ -30,9 +30,9 @@ import { ExtHostVariableResolverProviderService, IExtHostVariableResolverProvide
 import { ExtHostTelemetryLogService, IExtHostTelemetryLogService } from 'vs/workbench/api/common/extHostTelemetryLogService';
 import { ExtHostLocalizationService, IExtHostLocalizationService } from 'vs/workbench/api/common/extHostLocalizationService';
 
-registerSingleton(IExtHostLocalizationService, ExtHostLocalizationService, true);
-registerSingleton(ILoggerService, ExtHostLoggerService, true);
-registerSingleton(ILogService, ExtHostLogService, true);
+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);
@@ -41,7 +41,7 @@ registerSingleton(IExtHostDebugService, WorkerExtHostDebugService, false);
 registerSingleton(IExtHostDecorations, ExtHostDecorations, false);
 registerSingleton(IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors, false);
 registerSingleton(IExtHostFileSystemInfo, ExtHostFileSystemInfo, false);
-registerSingleton(IExtHostOutputService, ExtHostOutputService, true);
+registerSingleton(IExtHostOutputService, ExtHostOutputService, InstantiationType.Delayed);
 registerSingleton(IExtHostSearch, ExtHostSearch, false);
 registerSingleton(IExtHostStorage, ExtHostStorage, false);
 registerSingleton(IExtHostTask, WorkerExtHostTask, false);

src/vs/workbench/api/node/extHost.node.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 { ExtHostTerminalService } from 'vs/workbench/api/node/extHostTerminalService';
 import { ExtHostTask } from 'vs/workbench/api/node/extHostTask';
 import { ExtHostDebugService } from 'vs/workbench/api/node/extHostDebugService';
@@ -30,7 +30,7 @@ import { IExtHostVariableResolverProvider } from 'vs/workbench/api/common/extHos
 // #########################################################################
 
 registerSingleton(IExtHostExtensionService, ExtHostExtensionService, false);
-registerSingleton(ILoggerService, ExtHostLoggerService, true);
+registerSingleton(ILoggerService, ExtHostLoggerService, InstantiationType.Delayed);
 registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths, false);
 
 registerSingleton(IExtHostDebugService, ExtHostDebugService, false);

src/vs/workbench/browser/parts/editor/breadcrumbs.ts

@@ -10,7 +10,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { localize } from 'vs/nls';
 import { IConfigurationOverrides, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Extensions, IConfigurationRegistry, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { GroupIdentifier, IEditorPartOptions } from 'vs/workbench/common/editor';
@@ -48,7 +48,7 @@ export class BreadcrumbsService implements IBreadcrumbsService {
 	}
 }
 
-registerSingleton(IBreadcrumbsService, BreadcrumbsService, true);
+registerSingleton(IBreadcrumbsService, BreadcrumbsService, InstantiationType.Delayed);
 
 
 //#region config

src/vs/workbench/browser/parts/paneCompositePart.ts

@@ -5,7 +5,7 @@
 
 import { Event } from 'vs/base/common/event';
 import { assertIsDefined } from 'vs/base/common/types';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IProgressIndicator } from 'vs/platform/progress/common/progress';
 import { PaneCompositeDescriptor } from 'vs/workbench/browser/panecomposite';
@@ -159,4 +159,4 @@ export class PaneCompositeParts extends Disposable implements IPaneCompositePart
 	}
 }
 
-registerSingleton(IPaneCompositePartService, PaneCompositeParts, true);
+registerSingleton(IPaneCompositePartService, PaneCompositeParts, InstantiationType.Delayed);

src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts

@@ -16,7 +16,7 @@ import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IProgress, IProgressStep, Progress } from 'vs/platform/progress/common/progress';
@@ -289,7 +289,7 @@ export class BulkEditService implements IBulkEditService {
 	}
 }
 
-registerSingleton(IBulkEditService, BulkEditService, true);
+registerSingleton(IBulkEditService, BulkEditService, InstantiationType.Delayed);
 
 const autoSaveSetting = 'files.refactoring.autoSave';
 

src/vs/workbench/contrib/debug/browser/debug.contribution.ts

@@ -9,7 +9,7 @@ import * as nls from 'vs/nls';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { BreakpointsView } from 'vs/workbench/contrib/debug/browser/breakpointsView';
 import { CallStackView } from 'vs/workbench/contrib/debug/browser/callStackView';
@@ -61,7 +61,7 @@ import { DebugConsoleQuickAccess } from 'vs/workbench/contrib/debug/browser/debu
 
 const debugCategory = nls.localize('debugCategory', "Debug");
 registerColors();
-registerSingleton(IDebugService, DebugService, true);
+registerSingleton(IDebugService, DebugService, InstantiationType.Delayed);
 
 // Register Debug Workbench Contributions
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DebugStatusContribution, LifecyclePhase.Eventually);