diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts index 850ae498d0c..f322681653b 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts @@ -95,7 +95,7 @@ class MainProcessService implements IMainProcessService { private mainRouter: StaticRouter ) { } - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; getChannel(channelName: string): IChannel { return this.server.getChannel(channelName, this.mainRouter); diff --git a/src/vs/code/electron-main/auth.ts b/src/vs/code/electron-main/auth.ts index 5e09e170c84..83597f68e02 100644 --- a/src/vs/code/electron-main/auth.ts +++ b/src/vs/code/electron-main/auth.ts @@ -23,7 +23,7 @@ type Credentials = { export class ProxyAuthHandler extends Disposable { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private retryCount = 0; diff --git a/src/vs/editor/browser/core/keybindingCancellation.ts b/src/vs/editor/browser/core/keybindingCancellation.ts index df5795ffe28..1f260f9b6cd 100644 --- a/src/vs/editor/browser/core/keybindingCancellation.ts +++ b/src/vs/editor/browser/core/keybindingCancellation.ts @@ -17,7 +17,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; const IEditorCancellationTokens = createDecorator('IEditorCancelService'); interface IEditorCancellationTokens { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; add(editor: ICodeEditor, cts: CancellationTokenSource): () => void; cancel(editor: ICodeEditor): void; } @@ -26,7 +26,7 @@ const ctxCancellableOperation = new RawContextKey('cancellableOperation', false) registerSingleton(IEditorCancellationTokens, class implements IEditorCancellationTokens { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _tokens = new WeakMap, tokens: LinkedList }>(); diff --git a/src/vs/editor/browser/services/abstractCodeEditorService.ts b/src/vs/editor/browser/services/abstractCodeEditorService.ts index 7d2f5067574..f48a9cff839 100644 --- a/src/vs/editor/browser/services/abstractCodeEditorService.ts +++ b/src/vs/editor/browser/services/abstractCodeEditorService.ts @@ -14,7 +14,7 @@ import { URI } from 'vs/base/common/uri'; export abstract class AbstractCodeEditorService extends Disposable implements ICodeEditorService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onCodeEditorAdd: Emitter = this._register(new Emitter()); public readonly onCodeEditorAdd: Event = this._onCodeEditorAdd.event; diff --git a/src/vs/editor/browser/services/bulkEditService.ts b/src/vs/editor/browser/services/bulkEditService.ts index f6fdac9c874..37393b426e3 100644 --- a/src/vs/editor/browser/services/bulkEditService.ts +++ b/src/vs/editor/browser/services/bulkEditService.ts @@ -26,7 +26,7 @@ export interface IBulkEditResult { export type IBulkEditPreviewHandler = (edit: WorkspaceEdit, options?: IBulkEditOptions) => Promise; export interface IBulkEditService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; hasPreviewHandler(): boolean; diff --git a/src/vs/editor/browser/services/codeEditorService.ts b/src/vs/editor/browser/services/codeEditorService.ts index 937875bb767..0174886d201 100644 --- a/src/vs/editor/browser/services/codeEditorService.ts +++ b/src/vs/editor/browser/services/codeEditorService.ts @@ -14,7 +14,7 @@ import { URI } from 'vs/base/common/uri'; export const ICodeEditorService = createDecorator('codeEditorService'); export interface ICodeEditorService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly onCodeEditorAdd: Event; readonly onCodeEditorRemove: Event; diff --git a/src/vs/editor/browser/services/openerService.ts b/src/vs/editor/browser/services/openerService.ts index 0390927a4c4..207e7a3bfa7 100644 --- a/src/vs/editor/browser/services/openerService.ts +++ b/src/vs/editor/browser/services/openerService.ts @@ -85,7 +85,7 @@ class EditorOpener implements IOpener { export class OpenerService implements IOpenerService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _openers = new LinkedList(); private readonly _validators = new LinkedList(); diff --git a/src/vs/editor/common/services/editorWorkerService.ts b/src/vs/editor/common/services/editorWorkerService.ts index ab850e96a2c..a99c84822d8 100644 --- a/src/vs/editor/common/services/editorWorkerService.ts +++ b/src/vs/editor/common/services/editorWorkerService.ts @@ -19,7 +19,7 @@ export interface IDiffComputationResult { } export interface IEditorWorkerService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; canComputeDiff(original: URI, modified: URI): boolean; computeDiff(original: URI, modified: URI, ignoreTrimWhitespace: boolean, maxComputationTime: number): Promise; diff --git a/src/vs/editor/common/services/editorWorkerServiceImpl.ts b/src/vs/editor/common/services/editorWorkerServiceImpl.ts index 0afaa0abca4..bb4470fd96d 100644 --- a/src/vs/editor/common/services/editorWorkerServiceImpl.ts +++ b/src/vs/editor/common/services/editorWorkerServiceImpl.ts @@ -46,7 +46,7 @@ function canSyncModel(modelService: IModelService, resource: URI): boolean { export class EditorWorkerServiceImpl extends Disposable implements IEditorWorkerService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _modelService: IModelService; private readonly _workerManager: WorkerManager; diff --git a/src/vs/editor/common/services/markerDecorationsServiceImpl.ts b/src/vs/editor/common/services/markerDecorationsServiceImpl.ts index 2e591f861c9..b7fe9ba044f 100644 --- a/src/vs/editor/common/services/markerDecorationsServiceImpl.ts +++ b/src/vs/editor/common/services/markerDecorationsServiceImpl.ts @@ -70,7 +70,7 @@ class MarkerDecorations extends Disposable { export class MarkerDecorationsService extends Disposable implements IMarkerDecorationsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidChangeMarker = this._register(new Emitter()); readonly onDidChangeMarker: Event = this._onDidChangeMarker.event; diff --git a/src/vs/editor/common/services/markersDecorationService.ts b/src/vs/editor/common/services/markersDecorationService.ts index cd1c541cbc0..745260c8884 100644 --- a/src/vs/editor/common/services/markersDecorationService.ts +++ b/src/vs/editor/common/services/markersDecorationService.ts @@ -12,7 +12,7 @@ import { Range } from 'vs/editor/common/core/range'; export const IMarkerDecorationsService = createDecorator('markerDecorationsService'); export interface IMarkerDecorationsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; onDidChangeMarker: Event; diff --git a/src/vs/editor/common/services/modeService.ts b/src/vs/editor/common/services/modeService.ts index 678b15836af..2739d652551 100644 --- a/src/vs/editor/common/services/modeService.ts +++ b/src/vs/editor/common/services/modeService.ts @@ -28,7 +28,7 @@ export interface ILanguageSelection extends IDisposable { } export interface IModeService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; onDidCreateMode: Event; onLanguagesMaybeChanged: Event; diff --git a/src/vs/editor/common/services/modelService.ts b/src/vs/editor/common/services/modelService.ts index 60ce39358dc..ab583a7390c 100644 --- a/src/vs/editor/common/services/modelService.ts +++ b/src/vs/editor/common/services/modelService.ts @@ -16,7 +16,7 @@ export const IModelService = createDecorator('modelService'); export type DocumentTokensProvider = DocumentSemanticTokensProvider | DocumentRangeSemanticTokensProvider; export interface IModelService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; createModel(value: string | ITextBufferFactory, languageSelection: ILanguageSelection | null, resource?: URI, isForSimpleWidget?: boolean): ITextModel; diff --git a/src/vs/editor/common/services/resolverService.ts b/src/vs/editor/common/services/resolverService.ts index 47e546b6025..74470a81017 100644 --- a/src/vs/editor/common/services/resolverService.ts +++ b/src/vs/editor/common/services/resolverService.ts @@ -12,7 +12,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' export const ITextModelService = createDecorator('textModelService'); export interface ITextModelService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Provided a resource URI, it will return a model reference diff --git a/src/vs/editor/common/services/textResourceConfigurationService.ts b/src/vs/editor/common/services/textResourceConfigurationService.ts index 792cacda5b3..23a2335b6df 100644 --- a/src/vs/editor/common/services/textResourceConfigurationService.ts +++ b/src/vs/editor/common/services/textResourceConfigurationService.ts @@ -31,7 +31,7 @@ export interface ITextResourceConfigurationChangeEvent { export interface ITextResourceConfigurationService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Event that fires when the configuration changes. @@ -70,7 +70,7 @@ export const ITextResourcePropertiesService = createDecorator('ICodeLensCache'); export interface ICodeLensCache { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; put(model: ITextModel, data: CodeLensModel): void; get(model: ITextModel): CodeLensModel | undefined; delete(model: ITextModel): void; @@ -38,7 +38,7 @@ class CacheItem { export class CodeLensCache implements ICodeLensCache { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _fakeProvider = new class implements CodeLensProvider { provideCodeLenses(): CodeLensList { diff --git a/src/vs/editor/contrib/gotoSymbol/symbolNavigation.ts b/src/vs/editor/contrib/gotoSymbol/symbolNavigation.ts index d082bb98f43..86b96093112 100644 --- a/src/vs/editor/contrib/gotoSymbol/symbolNavigation.ts +++ b/src/vs/editor/contrib/gotoSymbol/symbolNavigation.ts @@ -26,7 +26,7 @@ export const ctxHasSymbols = new RawContextKey('hasSymbols', false); export const ISymbolNavigationService = createDecorator('ISymbolNavigationService'); export interface ISymbolNavigationService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; reset(): void; put(anchor: OneReference): void; revealNext(source: ICodeEditor): Promise; @@ -34,7 +34,7 @@ export interface ISymbolNavigationService { class SymbolNavigationService implements ISymbolNavigationService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _ctxHasSymbols: IContextKey; diff --git a/src/vs/editor/contrib/peekView/peekView.ts b/src/vs/editor/contrib/peekView/peekView.ts index 47fac3224d0..2c4fdbc21c5 100644 --- a/src/vs/editor/contrib/peekView/peekView.ts +++ b/src/vs/editor/contrib/peekView/peekView.ts @@ -30,12 +30,12 @@ import { Codicon } from 'vs/base/common/codicons'; export const IPeekViewService = createDecorator('IPeekViewService'); export interface IPeekViewService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; addExclusiveWidget(editor: ICodeEditor, widget: PeekViewWidget): void; } registerSingleton(IPeekViewService, class implements IPeekViewService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _widgets = new Map(); @@ -103,7 +103,7 @@ const defaultOptions: IPeekViewOptions = { export abstract class PeekViewWidget extends ZoneWidget { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidClose = new Emitter(); readonly onDidClose = this._onDidClose.event; diff --git a/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts b/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts index b7012bec477..bb95bdfcadf 100644 --- a/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts +++ b/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts @@ -302,7 +302,7 @@ suite('Snippet Variables Resolver', function () { let workspace: IWorkspace; let resolver: VariableResolver; const workspaceService = new class implements IWorkspaceContextService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; _throw = () => { throw new Error(); }; onDidChangeWorkbenchState = this._throw; onDidChangeWorkspaceName = this._throw; diff --git a/src/vs/editor/contrib/suggest/suggestMemory.ts b/src/vs/editor/contrib/suggest/suggestMemory.ts index a33e6e3191f..afd1507a1af 100644 --- a/src/vs/editor/contrib/suggest/suggestMemory.ts +++ b/src/vs/editor/contrib/suggest/suggestMemory.ts @@ -308,7 +308,7 @@ export class SuggestMemoryService implements ISuggestMemoryService { export const ISuggestMemoryService = createDecorator('ISuggestMemories'); export interface ISuggestMemoryService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; memorize(model: ITextModel, pos: IPosition, item: CompletionItem): void; select(model: ITextModel, pos: IPosition, items: CompletionItem[]): number; } diff --git a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts index 2b4b06edd41..f4ebe75cc0c 100644 --- a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts +++ b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts @@ -51,7 +51,7 @@ function createMockEditor(model: TextModel): ITestCodeEditor { [IStorageService, new InMemoryStorageService()], [IKeybindingService, new MockKeybindingService()], [ISuggestMemoryService, new class implements ISuggestMemoryService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; memorize(): void { } select(): number { diff --git a/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputServiceImpl.ts b/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputServiceImpl.ts index 4a7c020fae7..099b1196362 100644 --- a/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputServiceImpl.ts +++ b/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputServiceImpl.ts @@ -52,7 +52,7 @@ export class EditorScopedQuickInputServiceImpl extends QuickInputService { export class StandaloneQuickInputServiceImpl implements IQuickInputService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private mapEditorToService = new Map(); private get activeService(): IQuickInputService { diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts index c5a48fbeff3..df5c7eb96b5 100644 --- a/src/vs/editor/standalone/browser/simpleServices.ts +++ b/src/vs/editor/standalone/browser/simpleServices.ts @@ -155,7 +155,7 @@ export class SimpleEditorModelResolverService implements ITextModelService { } export class SimpleEditorProgressService implements IEditorProgressService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static NULL_PROGRESS_RUNNER: IProgressRunner = { done: () => { }, @@ -251,7 +251,7 @@ export class SimpleNotificationService implements INotificationService { } export class StandaloneCommandService implements ICommandService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _instantiationService: IInstantiationService; @@ -420,7 +420,7 @@ function isConfigurationOverrides(thing: any): thing is IConfigurationOverrides export class SimpleConfigurationService implements IConfigurationService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidChangeConfiguration = new Emitter(); public readonly onDidChangeConfiguration: Event = this._onDidChangeConfiguration.event; @@ -498,7 +498,7 @@ export class SimpleConfigurationService implements IConfigurationService { export class SimpleResourceConfigurationService implements ITextResourceConfigurationService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidChangeConfiguration = new Emitter(); public readonly onDidChangeConfiguration = this._onDidChangeConfiguration.event; @@ -527,7 +527,7 @@ export class SimpleResourceConfigurationService implements ITextResourceConfigur export class SimpleResourcePropertiesService implements ITextResourcePropertiesService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IConfigurationService private readonly configurationService: IConfigurationService, @@ -544,7 +544,7 @@ export class SimpleResourcePropertiesService implements ITextResourcePropertiesS } export class StandaloneTelemetryService implements ITelemetryService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; public isOptedIn = false; public sendErrorTelemetry = false; @@ -648,7 +648,7 @@ export function applyConfigurationValues(configurationService: IConfigurationSer } export class SimpleBulkEditService implements IBulkEditService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private readonly _modelService: IModelService) { // @@ -703,7 +703,7 @@ export class SimpleBulkEditService implements IBulkEditService { export class SimpleUriLabelService implements ILabelService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; public readonly onDidChangeFormatters: Event = Event.None; @@ -736,7 +736,7 @@ export class SimpleUriLabelService implements ILabelService { } export class SimpleLayoutService implements ILayoutService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; public onLayout = Event.None; diff --git a/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts b/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts index db77616779f..9e3f3ac0c9c 100644 --- a/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts +++ b/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts @@ -172,7 +172,7 @@ function newBuiltInTheme(builtinTheme: BuiltinTheme): StandaloneTheme { export class StandaloneThemeServiceImpl extends Disposable implements IStandaloneThemeService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onColorThemeChange = this._register(new Emitter()); public readonly onDidColorThemeChange = this._onColorThemeChange.event; diff --git a/src/vs/editor/standalone/common/standaloneThemeService.ts b/src/vs/editor/standalone/common/standaloneThemeService.ts index 6cef079a639..c70a713dd08 100644 --- a/src/vs/editor/standalone/common/standaloneThemeService.ts +++ b/src/vs/editor/standalone/common/standaloneThemeService.ts @@ -26,7 +26,7 @@ export interface IStandaloneTheme extends IColorTheme { } export interface IStandaloneThemeService extends IThemeService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; setTheme(themeName: string): string; diff --git a/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts b/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts index ac779135546..282422dcbd2 100644 --- a/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts +++ b/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts @@ -33,7 +33,7 @@ suite('TokenizationSupport2Adapter', () => { } class MockThemeService implements IStandaloneThemeService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; public setTheme(themeName: string): string { throw new Error('Not implemented'); } diff --git a/src/vs/editor/test/browser/editorTestServices.ts b/src/vs/editor/test/browser/editorTestServices.ts index 747895a7a60..e9fba5fbb91 100644 --- a/src/vs/editor/test/browser/editorTestServices.ts +++ b/src/vs/editor/test/browser/editorTestServices.ts @@ -25,7 +25,7 @@ export class TestCodeEditorService extends AbstractCodeEditorService { } export class TestCommandService implements ICommandService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _instantiationService: IInstantiationService; diff --git a/src/vs/editor/test/browser/services/openerService.test.ts b/src/vs/editor/test/browser/services/openerService.test.ts index 697dc99402d..e0ab2ba61f1 100644 --- a/src/vs/editor/test/browser/services/openerService.test.ts +++ b/src/vs/editor/test/browser/services/openerService.test.ts @@ -16,7 +16,7 @@ suite('OpenerService', function () { let lastCommand: { id: string; args: any[] } | undefined; const commandService = new (class implements ICommandService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; onWillExecuteCommand = () => Disposable.None; onDidExecuteCommand = () => Disposable.None; executeCommand(id: string, ...args: any[]): Promise { diff --git a/src/vs/editor/test/common/services/modelService.test.ts b/src/vs/editor/test/common/services/modelService.test.ts index 6aef4d186a5..52672ffe3a1 100644 --- a/src/vs/editor/test/common/services/modelService.test.ts +++ b/src/vs/editor/test/common/services/modelService.test.ts @@ -442,7 +442,7 @@ assertComputeEdits(file1, file2); export class TestTextResourcePropertiesService implements ITextResourcePropertiesService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IConfigurationService private readonly configurationService: IConfigurationService, diff --git a/src/vs/platform/accessibility/common/accessibility.ts b/src/vs/platform/accessibility/common/accessibility.ts index 65fcf4abaf6..fa420edc7d3 100644 --- a/src/vs/platform/accessibility/common/accessibility.ts +++ b/src/vs/platform/accessibility/common/accessibility.ts @@ -10,7 +10,7 @@ import { RawContextKey } from 'vs/platform/contextkey/common/contextkey'; export const IAccessibilityService = createDecorator('accessibilityService'); export interface IAccessibilityService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly onDidChangeScreenReaderOptimized: Event; diff --git a/src/vs/platform/accessibility/common/accessibilityService.ts b/src/vs/platform/accessibility/common/accessibilityService.ts index 25a277f53ea..029a5914d31 100644 --- a/src/vs/platform/accessibility/common/accessibilityService.ts +++ b/src/vs/platform/accessibility/common/accessibilityService.ts @@ -10,7 +10,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; export class AccessibilityService extends Disposable implements IAccessibilityService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _accessibilityModeEnabledContext: IContextKey; protected _accessibilitySupport = AccessibilitySupport.Unknown; diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts index 7a229a28343..05a0655113d 100644 --- a/src/vs/platform/actions/common/actions.ts +++ b/src/vs/platform/actions/common/actions.ts @@ -149,7 +149,7 @@ export const IMenuService = createDecorator('menuService'); export interface IMenuService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; createMenu(id: MenuId, scopedKeybindingService: IContextKeyService): IMenu; } diff --git a/src/vs/platform/actions/common/menuService.ts b/src/vs/platform/actions/common/menuService.ts index 90a71cae4fb..107ea38d7fa 100644 --- a/src/vs/platform/actions/common/menuService.ts +++ b/src/vs/platform/actions/common/menuService.ts @@ -11,7 +11,7 @@ import { IContextKeyService, IContextKeyChangeEvent, ContextKeyExpression } from export class MenuService implements IMenuService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @ICommandService private readonly _commandService: ICommandService diff --git a/src/vs/platform/authentication/common/authentication.ts b/src/vs/platform/authentication/common/authentication.ts index 399f7d271b0..e773c67d98d 100644 --- a/src/vs/platform/authentication/common/authentication.ts +++ b/src/vs/platform/authentication/common/authentication.ts @@ -15,7 +15,7 @@ export interface IUserDataSyncAuthToken { } export interface IAuthenticationTokenService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly token: IUserDataSyncAuthToken | undefined; readonly onDidChangeToken: Event; diff --git a/src/vs/platform/backup/electron-main/backup.ts b/src/vs/platform/backup/electron-main/backup.ts index 3c314a3b61c..7c002809de9 100644 --- a/src/vs/platform/backup/electron-main/backup.ts +++ b/src/vs/platform/backup/electron-main/backup.ts @@ -22,7 +22,7 @@ export function isWorkspaceBackupInfo(obj: unknown): obj is IWorkspaceBackupInfo } export interface IBackupMainService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; isHotExitEnabled(): boolean; diff --git a/src/vs/platform/backup/electron-main/backupMainService.ts b/src/vs/platform/backup/electron-main/backupMainService.ts index ae5b39f1f08..aacaf4d9804 100644 --- a/src/vs/platform/backup/electron-main/backupMainService.ts +++ b/src/vs/platform/backup/electron-main/backupMainService.ts @@ -23,7 +23,7 @@ import { Schemas } from 'vs/base/common/network'; export class BackupMainService implements IBackupMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; protected backupHome: string; protected workspacesJsonPath: string; diff --git a/src/vs/platform/clipboard/browser/clipboardService.ts b/src/vs/platform/clipboard/browser/clipboardService.ts index 85855d06dd8..97c85b9af58 100644 --- a/src/vs/platform/clipboard/browser/clipboardService.ts +++ b/src/vs/platform/clipboard/browser/clipboardService.ts @@ -9,7 +9,7 @@ import { $ } from 'vs/base/browser/dom'; export class BrowserClipboardService implements IClipboardService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly mapTextToType = new Map(); // unsupported in web (only in-memory) diff --git a/src/vs/platform/clipboard/common/clipboardService.ts b/src/vs/platform/clipboard/common/clipboardService.ts index 73cc53f0ae2..b40e7bd4f34 100644 --- a/src/vs/platform/clipboard/common/clipboardService.ts +++ b/src/vs/platform/clipboard/common/clipboardService.ts @@ -10,7 +10,7 @@ export const IClipboardService = createDecorator('clipboardSe export interface IClipboardService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Writes text to the system clipboard. diff --git a/src/vs/platform/commands/common/commands.ts b/src/vs/platform/commands/common/commands.ts index ae8451eb84f..5a4032727c6 100644 --- a/src/vs/platform/commands/common/commands.ts +++ b/src/vs/platform/commands/common/commands.ts @@ -19,7 +19,7 @@ export interface ICommandEvent { } export interface ICommandService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; onWillExecuteCommand: Event; onDidExecuteCommand: Event; executeCommand(commandId: string, ...args: any[]): Promise; diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts index 16bf8c384f9..697a2f21808 100644 --- a/src/vs/platform/configuration/common/configuration.ts +++ b/src/vs/platform/configuration/common/configuration.ts @@ -88,7 +88,7 @@ export interface IConfigurationValue { } export interface IConfigurationService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; onDidChangeConfiguration: Event; diff --git a/src/vs/platform/configuration/common/configurationService.ts b/src/vs/platform/configuration/common/configurationService.ts index 21a12826ee4..2e8b85b1f09 100644 --- a/src/vs/platform/configuration/common/configurationService.ts +++ b/src/vs/platform/configuration/common/configurationService.ts @@ -15,7 +15,7 @@ import { RunOnceScheduler } from 'vs/base/common/async'; export class ConfigurationService extends Disposable implements IConfigurationService, IDisposable { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private configuration: Configuration; private userConfiguration: UserSettings; diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts index 414b6a3d3c0..4d42f0b9777 100644 --- a/src/vs/platform/contextkey/common/contextkey.ts +++ b/src/vs/platform/contextkey/common/contextkey.ts @@ -974,7 +974,7 @@ export interface IContextKeyChangeEvent { } export interface IContextKeyService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; dispose(): void; onDidChangeContext: Event; diff --git a/src/vs/platform/contextview/browser/contextMenuService.ts b/src/vs/platform/contextview/browser/contextMenuService.ts index 539b819e643..3ef087c575b 100644 --- a/src/vs/platform/contextview/browser/contextMenuService.ts +++ b/src/vs/platform/contextview/browser/contextMenuService.ts @@ -14,7 +14,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { Disposable } from 'vs/base/common/lifecycle'; export class ContextMenuService extends Disposable implements IContextMenuService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _onDidContextMenu = this._register(new Emitter()); readonly onDidContextMenu: Event = this._onDidContextMenu.event; diff --git a/src/vs/platform/contextview/browser/contextView.ts b/src/vs/platform/contextview/browser/contextView.ts index a4b225a173d..de9cb985c95 100644 --- a/src/vs/platform/contextview/browser/contextView.ts +++ b/src/vs/platform/contextview/browser/contextView.ts @@ -13,7 +13,7 @@ export const IContextViewService = createDecorator('context export interface IContextViewService extends IContextViewProvider { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; showContextView(delegate: IContextViewDelegate, container?: HTMLElement): void; hideContextView(data?: any): void; @@ -37,7 +37,7 @@ export const IContextMenuService = createDecorator('context export interface IContextMenuService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; showContextMenu(delegate: IContextMenuDelegate): void; onDidContextMenu: Event; // TODO@isidor these event should be removed once we get async context menus diff --git a/src/vs/platform/contextview/browser/contextViewService.ts b/src/vs/platform/contextview/browser/contextViewService.ts index 9e06e73db61..8ca6dfbdc4b 100644 --- a/src/vs/platform/contextview/browser/contextViewService.ts +++ b/src/vs/platform/contextview/browser/contextViewService.ts @@ -9,7 +9,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { ILayoutService } from 'vs/platform/layout/browser/layoutService'; export class ContextViewService extends Disposable implements IContextViewService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private contextView: ContextView; private container: HTMLElement; diff --git a/src/vs/platform/credentials/common/credentials.ts b/src/vs/platform/credentials/common/credentials.ts index 6fcb7dffaa0..2799abeed19 100644 --- a/src/vs/platform/credentials/common/credentials.ts +++ b/src/vs/platform/credentials/common/credentials.ts @@ -9,7 +9,7 @@ export const ICredentialsService = createDecorator('ICreden export interface ICredentialsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getPassword(service: string, account: string): Promise; setPassword(service: string, account: string, password: string): Promise; diff --git a/src/vs/platform/credentials/node/credentialsService.ts b/src/vs/platform/credentials/node/credentialsService.ts index 3641cf65d33..cce2f77f6b3 100644 --- a/src/vs/platform/credentials/node/credentialsService.ts +++ b/src/vs/platform/credentials/node/credentialsService.ts @@ -9,7 +9,7 @@ import { IdleValue } from 'vs/base/common/async'; type KeytarModule = typeof import('keytar'); export class KeytarCredentialsService implements ICredentialsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _keytar = new IdleValue>(() => import('keytar')); diff --git a/src/vs/platform/debug/common/extensionHostDebug.ts b/src/vs/platform/debug/common/extensionHostDebug.ts index 57a604c2350..8dc4e4b2ada 100644 --- a/src/vs/platform/debug/common/extensionHostDebug.ts +++ b/src/vs/platform/debug/common/extensionHostDebug.ts @@ -35,7 +35,7 @@ export interface ICloseSessionEvent { } export interface IExtensionHostDebugService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; reload(sessionId: string): void; readonly onReload: Event; diff --git a/src/vs/platform/debug/common/extensionHostDebugIpc.ts b/src/vs/platform/debug/common/extensionHostDebugIpc.ts index 72aa7fcc2ea..84c034b8391 100644 --- a/src/vs/platform/debug/common/extensionHostDebugIpc.ts +++ b/src/vs/platform/debug/common/extensionHostDebugIpc.ts @@ -55,7 +55,7 @@ export class ExtensionHostDebugBroadcastChannel implements IServerChan export class ExtensionHostDebugChannelClient extends Disposable implements IExtensionHostDebugService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private channel: IChannel) { super(); diff --git a/src/vs/platform/diagnostics/node/diagnosticsIpc.ts b/src/vs/platform/diagnostics/node/diagnosticsIpc.ts index 4315b7f8b6a..f43ae1f4ca3 100644 --- a/src/vs/platform/diagnostics/node/diagnosticsIpc.ts +++ b/src/vs/platform/diagnostics/node/diagnosticsIpc.ts @@ -36,7 +36,7 @@ export class DiagnosticsChannel implements IServerChannel { export class DiagnosticsService implements IDiagnosticsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private channel: IChannel) { } diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts index 8ee870e3297..a858b96f5b7 100644 --- a/src/vs/platform/diagnostics/node/diagnosticsService.ts +++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts @@ -23,7 +23,7 @@ export const ID = 'diagnosticsService'; export const IDiagnosticsService = createDecorator(ID); export interface IDiagnosticsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getPerformanceInfo(mainProcessInfo: IMainProcessInfo, remoteInfo: (IRemoteDiagnosticInfo | IRemoteDiagnosticError)[]): Promise; getSystemInfo(mainProcessInfo: IMainProcessInfo, remoteInfo: (IRemoteDiagnosticInfo | IRemoteDiagnosticError)[]): Promise; @@ -223,7 +223,7 @@ export function collectLaunchConfigs(folder: string): Promise('fileDialo */ export interface IFileDialogService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * The default path for a new file based on previously used files. diff --git a/src/vs/platform/dialogs/electron-main/dialogs.ts b/src/vs/platform/dialogs/electron-main/dialogs.ts index 8f1b34aead4..809e2558724 100644 --- a/src/vs/platform/dialogs/electron-main/dialogs.ts +++ b/src/vs/platform/dialogs/electron-main/dialogs.ts @@ -21,7 +21,7 @@ export const IDialogMainService = createDecorator('dialogMai export interface IDialogMainService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; pickFileFolder(options: INativeOpenDialogOptions, window?: BrowserWindow): Promise; pickFolder(options: INativeOpenDialogOptions, window?: BrowserWindow): Promise; @@ -44,7 +44,7 @@ interface IInternalNativeOpenDialogOptions extends INativeOpenDialogOptions { export class DialogMainService implements IDialogMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly workingDirPickerStorageKey = 'pickerWorkingDir'; diff --git a/src/vs/platform/dialogs/test/common/testDialogService.ts b/src/vs/platform/dialogs/test/common/testDialogService.ts index 0f1cbc0f992..c25590cb6e0 100644 --- a/src/vs/platform/dialogs/test/common/testDialogService.ts +++ b/src/vs/platform/dialogs/test/common/testDialogService.ts @@ -8,7 +8,7 @@ import { IConfirmation, IConfirmationResult, IDialogService, IDialogOptions, ISh export class TestDialogService implements IDialogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; confirm(_confirmation: IConfirmation): Promise { return Promise.resolve({ confirmed: false }); } show(_severity: Severity, _message: string, _buttons: string[], _options?: IDialogOptions): Promise { return Promise.resolve({ choice: 0 }); } diff --git a/src/vs/platform/download/common/download.ts b/src/vs/platform/download/common/download.ts index 95f1d0ad66e..6eccb9da75b 100644 --- a/src/vs/platform/download/common/download.ts +++ b/src/vs/platform/download/common/download.ts @@ -11,7 +11,7 @@ export const IDownloadService = createDecorator('downloadServi export interface IDownloadService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; download(uri: URI, to: URI, cancellationToken?: CancellationToken): Promise; diff --git a/src/vs/platform/download/common/downloadIpc.ts b/src/vs/platform/download/common/downloadIpc.ts index 0876dfbc3d7..6cb88c42cee 100644 --- a/src/vs/platform/download/common/downloadIpc.ts +++ b/src/vs/platform/download/common/downloadIpc.ts @@ -27,7 +27,7 @@ export class DownloadServiceChannel implements IServerChannel { export class DownloadServiceChannelClient implements IDownloadService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private channel: IChannel, private getUriTransformer: () => IURITransformer | null) { } @@ -39,4 +39,4 @@ export class DownloadServiceChannelClient implements IDownloadService { } await this.channel.call('download', [from, to]); } -} \ No newline at end of file +} diff --git a/src/vs/platform/download/common/downloadService.ts b/src/vs/platform/download/common/downloadService.ts index 7de9b02fc3d..6442bbd301c 100644 --- a/src/vs/platform/download/common/downloadService.ts +++ b/src/vs/platform/download/common/downloadService.ts @@ -12,7 +12,7 @@ import { Schemas } from 'vs/base/common/network'; export class DownloadService implements IDownloadService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IRequestService private readonly requestService: IRequestService, diff --git a/src/vs/platform/driver/common/driver.ts b/src/vs/platform/driver/common/driver.ts index c93106ce99f..bae76735466 100644 --- a/src/vs/platform/driver/common/driver.ts +++ b/src/vs/platform/driver/common/driver.ts @@ -19,7 +19,7 @@ export interface IElement { } export interface IDriver { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getWindowIds(): Promise; capturePage(windowId: number): Promise; diff --git a/src/vs/platform/driver/electron-main/driver.ts b/src/vs/platform/driver/electron-main/driver.ts index b5a041bf44c..b8b703f05ff 100644 --- a/src/vs/platform/driver/electron-main/driver.ts +++ b/src/vs/platform/driver/electron-main/driver.ts @@ -27,7 +27,7 @@ function isSilentKeyCode(keyCode: KeyCode) { export class Driver implements IDriver, IWindowDriverRegistry { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private registeredWindowIds = new Set(); private reloadingWindowIds = new Set(); diff --git a/src/vs/platform/driver/node/driver.ts b/src/vs/platform/driver/node/driver.ts index f0713a37181..185100ef2b9 100644 --- a/src/vs/platform/driver/node/driver.ts +++ b/src/vs/platform/driver/node/driver.ts @@ -42,7 +42,7 @@ export class DriverChannel implements IServerChannel { export class DriverChannelClient implements IDriver { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private channel: IChannel) { } @@ -136,7 +136,7 @@ export class WindowDriverRegistryChannel implements IServerChannel { export class WindowDriverRegistryChannelClient implements IWindowDriverRegistry { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private channel: IChannel) { } @@ -177,7 +177,7 @@ export class WindowDriverChannel implements IServerChannel { export class WindowDriverChannelClient implements IWindowDriver { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private channel: IChannel) { } diff --git a/src/vs/platform/electron/common/electron.ts b/src/vs/platform/electron/common/electron.ts index 7dda5eb0f94..ae31c708216 100644 --- a/src/vs/platform/electron/common/electron.ts +++ b/src/vs/platform/electron/common/electron.ts @@ -11,7 +11,7 @@ import { ISerializableCommandAction } from 'vs/platform/actions/common/actions'; export interface ICommonElectronService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; // Properties readonly windowId: number; diff --git a/src/vs/platform/electron/electron-main/electronMainService.ts b/src/vs/platform/electron/electron-main/electronMainService.ts index 01087f97b01..bcd1f9d9752 100644 --- a/src/vs/platform/electron/electron-main/electronMainService.ts +++ b/src/vs/platform/electron/electron-main/electronMainService.ts @@ -29,7 +29,7 @@ export const IElectronMainService = createDecorator('elect export class ElectronMainService implements IElectronMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IWindowsMainService private readonly windowsMainService: IWindowsMainService, diff --git a/src/vs/platform/electron/electron-sandbox/electron.ts b/src/vs/platform/electron/electron-sandbox/electron.ts index aa17d948100..25f193f372d 100644 --- a/src/vs/platform/electron/electron-sandbox/electron.ts +++ b/src/vs/platform/electron/electron-sandbox/electron.ts @@ -14,7 +14,7 @@ export interface IElectronService extends ICommonElectronService { } export class ElectronService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( readonly windowId: number, diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts index 3627ab28552..c63cc171cc5 100644 --- a/src/vs/platform/environment/common/environment.ts +++ b/src/vs/platform/environment/common/environment.ts @@ -26,7 +26,7 @@ export interface IEnvironmentService { // UNLESS THIS PROPERTY IS SUPPORTED BOTH IN WEB AND DESKTOP!!!! // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - _serviceBrand: undefined; + readonly _serviceBrand: undefined; // --- user roaming data userRoamingDataHome: URI; diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts index 283b4b325b9..f8f7bce47c8 100644 --- a/src/vs/platform/environment/node/environmentService.ts +++ b/src/vs/platform/environment/node/environmentService.ts @@ -50,7 +50,7 @@ export interface INativeEnvironmentService extends IEnvironmentService { export class EnvironmentService implements INativeEnvironmentService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; get args(): ParsedArgs { return this._args; } diff --git a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts index b3e6041730c..afb3cf6e68e 100644 --- a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts +++ b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts @@ -12,7 +12,7 @@ import { isUndefinedOrNull } from 'vs/base/common/types'; export class GlobalExtensionEnablementService extends Disposable implements IGlobalExtensionEnablementService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _onDidChangeEnablement = new Emitter<{ readonly extensions: IExtensionIdentifier[], readonly source?: string }>(); readonly onDidChangeEnablement: Event<{ readonly extensions: IExtensionIdentifier[], readonly source?: string }> = this._onDidChangeEnablement.event; diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts index 2df5bfb9329..7ca5aec90c9 100644 --- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts +++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts @@ -325,7 +325,7 @@ interface IRawExtensionsReport { export class ExtensionGalleryService implements IExtensionGalleryService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private extensionsGalleryUrl: string | undefined; private extensionsControlUrl: string | undefined; diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts index d5bbcec2963..32c50744116 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagement.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts @@ -149,7 +149,7 @@ export interface ITranslation { } export interface IExtensionGalleryService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; isEnabled(): boolean; query(token: CancellationToken): Promise>; query(options: IQueryOptions, token: CancellationToken): Promise>; @@ -196,7 +196,7 @@ export class ExtensionManagementError extends Error { } export interface IExtensionManagementService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; onInstallExtension: Event; onDidInstallExtension: Event; @@ -221,7 +221,7 @@ export const ENABLED_EXTENSIONS_STORAGE_PATH = 'extensionsIdentifiers/enabled'; export const IGlobalExtensionEnablementService = createDecorator('IGlobalExtensionEnablementService'); export interface IGlobalExtensionEnablementService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly onDidChangeEnablement: Event<{ readonly extensions: IExtensionIdentifier[], readonly source?: string }>; getDisabledExtensions(): IExtensionIdentifier[]; @@ -242,7 +242,7 @@ export type IWorkspaceTips = { readonly remoteSet: string[]; readonly recommenda export const IExtensionTipsService = createDecorator('IExtensionTipsService'); export interface IExtensionTipsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getConfigBasedTips(folder: URI): Promise; getImportantExecutableBasedTips(): Promise; diff --git a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts index 48abfb96d37..d497780449a 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts @@ -77,7 +77,7 @@ export class ExtensionManagementChannel implements IServerChannel { export class ExtensionManagementChannelClient implements IExtensionManagementService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( private readonly channel: IChannel, diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index 28da448838d..2da866fc1d8 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -62,7 +62,7 @@ interface InstallableExtension { export class ExtensionManagementService extends Disposable implements IExtensionManagementService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly extensionsScanner: ExtensionsScanner; private reportedExtensions: Promise | undefined; diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts index 8a6c86f690c..76ca9918e3e 100644 --- a/src/vs/platform/files/common/fileService.ts +++ b/src/vs/platform/files/common/fileService.ts @@ -22,7 +22,7 @@ import { createReadStream } from 'vs/platform/files/common/io'; export class FileService extends Disposable implements IFileService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly BUFFER_SIZE = 64 * 1024; diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts index 45cb79ba716..da896bca24f 100644 --- a/src/vs/platform/files/common/files.ts +++ b/src/vs/platform/files/common/files.ts @@ -21,7 +21,7 @@ export const IFileService = createDecorator('fileService'); export interface IFileService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * An event that is fired when a file system provider is added or removed diff --git a/src/vs/platform/instantiation/common/instantiation.ts b/src/vs/platform/instantiation/common/instantiation.ts index 6d72a93db53..dbde5f6332c 100644 --- a/src/vs/platform/instantiation/common/instantiation.ts +++ b/src/vs/platform/instantiation/common/instantiation.ts @@ -85,7 +85,7 @@ type GetLeadingNonServiceArgs = export interface IInstantiationService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Synchronously creates an instance that is denoted by diff --git a/src/vs/platform/instantiation/common/instantiationService.ts b/src/vs/platform/instantiation/common/instantiationService.ts index c16ed7b4e9d..76ea96249b9 100644 --- a/src/vs/platform/instantiation/common/instantiationService.ts +++ b/src/vs/platform/instantiation/common/instantiationService.ts @@ -22,7 +22,7 @@ class CyclicDependencyError extends Error { export class InstantiationService implements IInstantiationService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _services: ServiceCollection; private readonly _strict: boolean; diff --git a/src/vs/platform/instantiation/test/common/instantiationService.test.ts b/src/vs/platform/instantiation/test/common/instantiationService.test.ts index 2b30f7d3ee1..353b66615b9 100644 --- a/src/vs/platform/instantiation/test/common/instantiationService.test.ts +++ b/src/vs/platform/instantiation/test/common/instantiationService.test.ts @@ -12,48 +12,48 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; let IService1 = createDecorator('service1'); interface IService1 { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; c: number; } class Service1 implements IService1 { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; c = 1; } let IService2 = createDecorator('service2'); interface IService2 { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; d: boolean; } class Service2 implements IService2 { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; d = true; } let IService3 = createDecorator('service3'); interface IService3 { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; s: string; } class Service3 implements IService3 { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; s = 'farboo'; } let IDependentService = createDecorator('dependentService'); interface IDependentService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; name: string; } class DependentService implements IDependentService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(@IService1 service: IService1) { assert.equal(service.c, 1); } @@ -116,7 +116,7 @@ class DependentServiceTarget2 { class ServiceLoop1 implements IService1 { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; c = 1; constructor(@IService2 s: IService2) { @@ -125,7 +125,7 @@ class ServiceLoop1 implements IService1 { } class ServiceLoop2 implements IService2 { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; d = true; constructor(@IService1 s: IService1) { @@ -364,7 +364,7 @@ suite('Instantiation Service', () => { let serviceInstanceCount = 0; const CtorCounter = class implements Service1 { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; c = 1; constructor() { serviceInstanceCount += 1; diff --git a/src/vs/platform/ipc/electron-browser/sharedProcessService.ts b/src/vs/platform/ipc/electron-browser/sharedProcessService.ts index d02e7d8e005..59fb5a6bd43 100644 --- a/src/vs/platform/ipc/electron-browser/sharedProcessService.ts +++ b/src/vs/platform/ipc/electron-browser/sharedProcessService.ts @@ -10,7 +10,7 @@ export const ISharedProcessService = createDecorator('sha export interface ISharedProcessService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getChannel(channelName: string): IChannel; registerChannel(channelName: string, channel: IServerChannel): void; diff --git a/src/vs/platform/ipc/electron-main/sharedProcessMainService.ts b/src/vs/platform/ipc/electron-main/sharedProcessMainService.ts index 4fb5318cc2b..97decd56a1a 100644 --- a/src/vs/platform/ipc/electron-main/sharedProcessMainService.ts +++ b/src/vs/platform/ipc/electron-main/sharedProcessMainService.ts @@ -9,7 +9,7 @@ export const ISharedProcessMainService = createDecorator; toggleSharedProcessWindow(): Promise; @@ -22,7 +22,7 @@ export interface ISharedProcess { export class SharedProcessMainService implements ISharedProcessMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private sharedProcess: ISharedProcess) { } diff --git a/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts b/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts index b8ffa053a08..b2c78a33279 100644 --- a/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts +++ b/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts @@ -12,7 +12,7 @@ export const IMainProcessService = createDecorator('mainPro export interface IMainProcessService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getChannel(channelName: string): IChannel; @@ -21,7 +21,7 @@ export interface IMainProcessService { export class MainProcessService extends Disposable implements IMainProcessService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private mainProcessConnection: Client; diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts index 17d3fe40830..d95587fce0a 100644 --- a/src/vs/platform/issue/common/issue.ts +++ b/src/vs/platform/issue/common/issue.ts @@ -88,7 +88,7 @@ export interface ProcessExplorerData extends WindowData { } export interface ICommonIssueService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; openReporter(data: IssueReporterData): Promise; openProcessExplorer(data: ProcessExplorerData): Promise; getSystemStatus(): Promise; diff --git a/src/vs/platform/issue/electron-main/issueMainService.ts b/src/vs/platform/issue/electron-main/issueMainService.ts index fcd734b4305..561fb1ad169 100644 --- a/src/vs/platform/issue/electron-main/issueMainService.ts +++ b/src/vs/platform/issue/electron-main/issueMainService.ts @@ -28,7 +28,7 @@ export const IIssueMainService = createDecorator('issueMainSe export interface IIssueMainService extends ICommonIssueService { } export class IssueMainService implements ICommonIssueService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; _issueWindow: BrowserWindow | null = null; _issueParentWindow: BrowserWindow | null = null; _processExplorerWindow: BrowserWindow | null = null; diff --git a/src/vs/platform/keybinding/common/keybinding.ts b/src/vs/platform/keybinding/common/keybinding.ts index 17ab82b8184..a24bfa45410 100644 --- a/src/vs/platform/keybinding/common/keybinding.ts +++ b/src/vs/platform/keybinding/common/keybinding.ts @@ -48,7 +48,7 @@ export interface KeybindingsSchemaContribution { export const IKeybindingService = createDecorator('keybindingService'); export interface IKeybindingService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly inChordMode: boolean; diff --git a/src/vs/platform/label/common/label.ts b/src/vs/platform/label/common/label.ts index e23c8f001da..aaf7e555f84 100644 --- a/src/vs/platform/label/common/label.ts +++ b/src/vs/platform/label/common/label.ts @@ -16,7 +16,7 @@ export const ILabelService = createDecorator('labelService'); export interface ILabelService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Gets the human readable label for a uri. diff --git a/src/vs/platform/launch/electron-main/launchMainService.ts b/src/vs/platform/launch/electron-main/launchMainService.ts index 8775dd82ad2..233f1690c98 100644 --- a/src/vs/platform/launch/electron-main/launchMainService.ts +++ b/src/vs/platform/launch/electron-main/launchMainService.ts @@ -51,7 +51,7 @@ function parseOpenUrl(args: ParsedArgs): URI[] { } export interface ILaunchMainService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; start(args: ParsedArgs, userEnv: IProcessEnvironment): Promise; getMainProcessId(): Promise; getMainProcessInfo(): Promise; @@ -60,7 +60,7 @@ export interface ILaunchMainService { export class LaunchMainService implements ILaunchMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @ILogService private readonly logService: ILogService, diff --git a/src/vs/platform/layout/browser/layoutService.ts b/src/vs/platform/layout/browser/layoutService.ts index 39f3f1da8eb..44a00b53a4b 100644 --- a/src/vs/platform/layout/browser/layoutService.ts +++ b/src/vs/platform/layout/browser/layoutService.ts @@ -11,7 +11,7 @@ export const ILayoutService = createDecorator('layoutService'); export interface ILayoutService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * The dimensions of the container. diff --git a/src/vs/platform/lifecycle/common/lifecycle.ts b/src/vs/platform/lifecycle/common/lifecycle.ts index cae9c857fb3..5d047b97813 100644 --- a/src/vs/platform/lifecycle/common/lifecycle.ts +++ b/src/vs/platform/lifecycle/common/lifecycle.ts @@ -123,7 +123,7 @@ export function LifecyclePhaseToString(phase: LifecyclePhase) { */ export interface ILifecycleService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Value indicates how this window got loaded. diff --git a/src/vs/platform/lifecycle/common/lifecycleService.ts b/src/vs/platform/lifecycle/common/lifecycleService.ts index d0fad7f28f4..fed0b6580e5 100644 --- a/src/vs/platform/lifecycle/common/lifecycleService.ts +++ b/src/vs/platform/lifecycle/common/lifecycleService.ts @@ -12,7 +12,7 @@ import { mark } from 'vs/base/common/performance'; export abstract class AbstractLifecycleService extends Disposable implements ILifecycleService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; protected readonly _onBeforeShutdown = this._register(new Emitter()); readonly onBeforeShutdown = this._onBeforeShutdown.event; diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts index a2ae8cd766b..1b8e3852c50 100644 --- a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts +++ b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts @@ -41,7 +41,7 @@ export interface ShutdownEvent { export interface ILifecycleMainService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Will be true if the program was restarted (e.g. due to explicit request or update). @@ -137,7 +137,7 @@ export const enum LifecycleMainPhase { export class LifecycleMainService extends Disposable implements ILifecycleMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly QUIT_FROM_RESTART_MARKER = 'quit.from.restart'; // use a marker to find out if the session was restarted diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts index 235c3a7e78c..ec9a2d0dd3b 100644 --- a/src/vs/platform/list/browser/listService.ts +++ b/src/vs/platform/list/browser/listService.ts @@ -33,7 +33,7 @@ export const IListService = createDecorator('listService'); export interface IListService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Returns the currently focused list widget if any. @@ -48,7 +48,7 @@ interface IRegisteredList { export class ListService implements IListService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private disposables = new DisposableStore(); private lists: IRegisteredList[] = []; diff --git a/src/vs/platform/localizations/common/localizations.ts b/src/vs/platform/localizations/common/localizations.ts index 4323324d681..82f58a381d3 100644 --- a/src/vs/platform/localizations/common/localizations.ts +++ b/src/vs/platform/localizations/common/localizations.ts @@ -26,7 +26,7 @@ export const enum LanguageType { export const ILocalizationsService = createDecorator('localizationsService'); export interface ILocalizationsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly onDidLanguagesChange: Event; getLanguageIds(type?: LanguageType): Promise; @@ -54,4 +54,4 @@ export function isValidLocalization(localization: ILocalization): boolean { return false; } return true; -} \ No newline at end of file +} diff --git a/src/vs/platform/localizations/node/localizations.ts b/src/vs/platform/localizations/node/localizations.ts index 6a3b96f8214..39391315e42 100644 --- a/src/vs/platform/localizations/node/localizations.ts +++ b/src/vs/platform/localizations/node/localizations.ts @@ -35,7 +35,7 @@ if (product.quality !== 'stable') { export class LocalizationsService extends Disposable implements ILocalizationsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly cache: LanguagePacksCache; diff --git a/src/vs/platform/log/browser/log.ts b/src/vs/platform/log/browser/log.ts index 466ba9dbaba..918f37c25d4 100644 --- a/src/vs/platform/log/browser/log.ts +++ b/src/vs/platform/log/browser/log.ts @@ -18,7 +18,7 @@ export class ConsoleLogInAutomationService extends LogServiceAdapter implements declare codeAutomationLog: any; - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(logLevel: LogLevel = DEFAULT_LOG_LEVEL) { super({ consoleLog: (type, args) => this.consoleLog(type, args) }, logLevel); diff --git a/src/vs/platform/log/common/bufferLog.ts b/src/vs/platform/log/common/bufferLog.ts index aa34008245a..2b1e69edd37 100644 --- a/src/vs/platform/log/common/bufferLog.ts +++ b/src/vs/platform/log/common/bufferLog.ts @@ -24,7 +24,7 @@ function getLogFunction(logger: ILogService, level: LogLevel): Function { export class BufferLogService extends AbstractLogService implements ILogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private buffer: ILog[] = []; private _logger: ILogService | undefined = undefined; diff --git a/src/vs/platform/log/common/fileLogService.ts b/src/vs/platform/log/common/fileLogService.ts index 20716554d04..b182280dcdf 100644 --- a/src/vs/platform/log/common/fileLogService.ts +++ b/src/vs/platform/log/common/fileLogService.ts @@ -17,7 +17,7 @@ const MAX_FILE_SIZE = 1024 * 1024 * 5; export class FileLogService extends AbstractLogService implements ILogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly initializePromise: Promise; private readonly queue: Queue; @@ -157,7 +157,7 @@ export class FileLogService extends AbstractLogService implements ILogService { export class FileLoggerService extends Disposable implements ILoggerService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly loggers = new Map(); diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts index 59ffc8e9ccd..add6b7666af 100644 --- a/src/vs/platform/log/common/log.ts +++ b/src/vs/platform/log/common/log.ts @@ -50,11 +50,11 @@ export interface ILogger extends IDisposable { } export interface ILogService extends ILogger { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; } export interface ILoggerService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getLogger(file: URI): ILogger; } @@ -80,7 +80,7 @@ export abstract class AbstractLogService extends Disposable { export class ConsoleLogMainService extends AbstractLogService implements ILogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private useColors: boolean; constructor(logLevel: LogLevel = DEFAULT_LOG_LEVEL) { @@ -161,7 +161,7 @@ export class ConsoleLogMainService extends AbstractLogService implements ILogSer export class ConsoleLogService extends AbstractLogService implements ILogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(logLevel: LogLevel = DEFAULT_LOG_LEVEL) { super(); @@ -215,7 +215,7 @@ export class ConsoleLogService extends AbstractLogService implements ILogService export class LogServiceAdapter extends AbstractLogService implements ILogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private readonly adapter: { consoleLog: (type: string, args: any[]) => void }, logLevel: LogLevel = DEFAULT_LOG_LEVEL) { super(); @@ -277,7 +277,7 @@ export class LogServiceAdapter extends AbstractLogService implements ILogService export class ConsoleLogInMainService extends LogServiceAdapter implements ILogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(client: LoggerChannelClient, logLevel: LogLevel = DEFAULT_LOG_LEVEL) { super({ consoleLog: (type, args) => client.consoleLog(type, args) }, logLevel); @@ -285,7 +285,7 @@ export class ConsoleLogInMainService extends LogServiceAdapter implements ILogSe } export class MultiplexLogService extends AbstractLogService implements ILogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private readonly logServices: ReadonlyArray) { super(); @@ -351,7 +351,7 @@ export class MultiplexLogService extends AbstractLogService implements ILogServi } export class DelegatedLogService extends Disposable implements ILogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private logService: ILogService) { super(); @@ -400,7 +400,7 @@ export class DelegatedLogService extends Disposable implements ILogService { } export class NullLogService implements ILogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; readonly onDidChangeLogLevel: Event = new Emitter().event; setLevel(level: LogLevel): void { } getLevel(): LogLevel { return LogLevel.Info; } diff --git a/src/vs/platform/log/common/logIpc.ts b/src/vs/platform/log/common/logIpc.ts index 80cb6fcd883..c8f7dd559a6 100644 --- a/src/vs/platform/log/common/logIpc.ts +++ b/src/vs/platform/log/common/logIpc.ts @@ -73,7 +73,7 @@ export class LoggerChannelClient { } export class FollowerLogService extends DelegatedLogService implements ILogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private master: LoggerChannelClient, logService: ILogService) { super(logService); diff --git a/src/vs/platform/log/node/loggerService.ts b/src/vs/platform/log/node/loggerService.ts index fa5c621c264..7120d99d213 100644 --- a/src/vs/platform/log/node/loggerService.ts +++ b/src/vs/platform/log/node/loggerService.ts @@ -14,7 +14,7 @@ import { SpdLogService } from 'vs/platform/log/node/spdlogService'; export class LoggerService extends Disposable implements ILoggerService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly loggers = new Map(); diff --git a/src/vs/platform/log/node/spdlogService.ts b/src/vs/platform/log/node/spdlogService.ts index ac8c8dc0a6f..c32ab07af39 100644 --- a/src/vs/platform/log/node/spdlogService.ts +++ b/src/vs/platform/log/node/spdlogService.ts @@ -44,7 +44,7 @@ function log(logger: spdlog.RotatingLogger, level: LogLevel, message: string): v export class SpdLogService extends AbstractLogService implements ILogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private buffer: ILog[] = []; private _loggerCreationPromise: Promise | undefined = undefined; diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts index 1ee846eb8fd..537ade06001 100644 --- a/src/vs/platform/markers/common/markerService.ts +++ b/src/vs/platform/markers/common/markerService.ts @@ -139,7 +139,7 @@ class MarkerStats implements MarkerStatistics { export class MarkerService implements IMarkerService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onMarkerChanged = new Emitter(); readonly onMarkerChanged: Event = Event.debounce(this._onMarkerChanged.event, MarkerService._debouncer, 0); diff --git a/src/vs/platform/markers/common/markers.ts b/src/vs/platform/markers/common/markers.ts index e89a52153d2..244d9ce7786 100644 --- a/src/vs/platform/markers/common/markers.ts +++ b/src/vs/platform/markers/common/markers.ts @@ -10,7 +10,7 @@ import { localize } from 'vs/nls'; import Severity from 'vs/base/common/severity'; export interface IMarkerService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getStatistics(): MarkerStatistics; diff --git a/src/vs/platform/menubar/electron-main/menubarMainService.ts b/src/vs/platform/menubar/electron-main/menubarMainService.ts index 243bc205d7b..836db31e73f 100644 --- a/src/vs/platform/menubar/electron-main/menubarMainService.ts +++ b/src/vs/platform/menubar/electron-main/menubarMainService.ts @@ -12,12 +12,12 @@ import { ILifecycleMainService, LifecycleMainPhase } from 'vs/platform/lifecycle export const IMenubarMainService = createDecorator('menubarMainService'); export interface IMenubarMainService extends ICommonMenubarService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; } export class MenubarMainService implements IMenubarMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private menubar: Promise; diff --git a/src/vs/platform/menubar/electron-sandbox/menubar.ts b/src/vs/platform/menubar/electron-sandbox/menubar.ts index 51ef554c932..77f60e85e9a 100644 --- a/src/vs/platform/menubar/electron-sandbox/menubar.ts +++ b/src/vs/platform/menubar/electron-sandbox/menubar.ts @@ -9,5 +9,5 @@ import { ICommonMenubarService } from 'vs/platform/menubar/common/menubar'; export const IMenubarService = createDecorator('menubarService'); export interface IMenubarService extends ICommonMenubarService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; } diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts index 34e33e31894..cc3cb107774 100644 --- a/src/vs/platform/notification/common/notification.ts +++ b/src/vs/platform/notification/common/notification.ts @@ -284,7 +284,7 @@ export enum NotificationsFilter { */ export interface INotificationService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Show the provided notification to the user. The returned `INotificationHandle` diff --git a/src/vs/platform/notification/test/common/testNotificationService.ts b/src/vs/platform/notification/test/common/testNotificationService.ts index 671339e55e9..82d9960eaeb 100644 --- a/src/vs/platform/notification/test/common/testNotificationService.ts +++ b/src/vs/platform/notification/test/common/testNotificationService.ts @@ -8,7 +8,7 @@ import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; export class TestNotificationService implements INotificationService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly NO_OP: INotificationHandle = new NoOpNotification(); diff --git a/src/vs/platform/opener/common/opener.ts b/src/vs/platform/opener/common/opener.ts index 8f7921d1581..977cb79b80d 100644 --- a/src/vs/platform/opener/common/opener.ts +++ b/src/vs/platform/opener/common/opener.ts @@ -53,7 +53,7 @@ export interface IExternalUriResolver { export interface IOpenerService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Register a participant that can handle the open() call. diff --git a/src/vs/platform/product/common/productService.ts b/src/vs/platform/product/common/productService.ts index 266aa69fc65..52eb6ec2d9e 100644 --- a/src/vs/platform/product/common/productService.ts +++ b/src/vs/platform/product/common/productService.ts @@ -11,7 +11,7 @@ export const IProductService = createDecorator('productService' export interface IProductService extends Readonly { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; } diff --git a/src/vs/platform/progress/common/progress.ts b/src/vs/platform/progress/common/progress.ts index 2a5cfda1b32..34214b8a324 100644 --- a/src/vs/platform/progress/common/progress.ts +++ b/src/vs/platform/progress/common/progress.ts @@ -15,7 +15,7 @@ export const IProgressService = createDecorator('progressServi */ export interface IProgressService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; withProgress( options: IProgressOptions | IProgressNotificationOptions | IProgressWindowOptions | IProgressCompositeOptions, @@ -179,5 +179,5 @@ export const IEditorProgressService = createDecorator('e */ export interface IEditorProgressService extends IProgressIndicator { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; } diff --git a/src/vs/platform/quickinput/browser/quickInput.ts b/src/vs/platform/quickinput/browser/quickInput.ts index 1ea7ca600a1..86f5ddaf348 100644 --- a/src/vs/platform/quickinput/browser/quickInput.ts +++ b/src/vs/platform/quickinput/browser/quickInput.ts @@ -23,7 +23,7 @@ export interface IQuickInputControllerHost extends ILayoutService { } export class QuickInputService extends Themable implements IQuickInputService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; get backButton(): IQuickInputButton { return this.controller.backButton; } diff --git a/src/vs/platform/quickinput/common/quickInput.ts b/src/vs/platform/quickinput/common/quickInput.ts index 6b6009967b5..8f2a9f8ae28 100644 --- a/src/vs/platform/quickinput/common/quickInput.ts +++ b/src/vs/platform/quickinput/common/quickInput.ts @@ -17,7 +17,7 @@ export type Omit = Pick>; export interface IQuickInputService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Provides access to the back button in quick input. diff --git a/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts b/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts index ed6281a5dde..4daa3d9b654 100644 --- a/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts +++ b/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts @@ -9,7 +9,7 @@ import { URI } from 'vs/base/common/uri'; export class RemoteAuthorityResolverService implements IRemoteAuthorityResolverService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( resourceUriProvider: ((uri: URI) => URI) | undefined diff --git a/src/vs/platform/remote/common/remoteAuthorityResolver.ts b/src/vs/platform/remote/common/remoteAuthorityResolver.ts index 10d818bd949..d26da8595a6 100644 --- a/src/vs/platform/remote/common/remoteAuthorityResolver.ts +++ b/src/vs/platform/remote/common/remoteAuthorityResolver.ts @@ -77,7 +77,7 @@ export class RemoteAuthorityResolverError extends Error { export interface IRemoteAuthorityResolverService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; resolveAuthority(authority: string): Promise; diff --git a/src/vs/platform/remote/common/tunnel.ts b/src/vs/platform/remote/common/tunnel.ts index 0cdceb96358..3f6356d41de 100644 --- a/src/vs/platform/remote/common/tunnel.ts +++ b/src/vs/platform/remote/common/tunnel.ts @@ -29,7 +29,7 @@ export interface ITunnelProvider { } export interface ITunnelService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly tunnels: Promise; readonly onTunnelOpened: Event; diff --git a/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts b/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts index 006ce16ca33..639711ba2a2 100644 --- a/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts +++ b/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts @@ -18,7 +18,7 @@ class PendingResolveAuthorityRequest { export class RemoteAuthorityResolverService implements IRemoteAuthorityResolverService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _resolveAuthorityRequests: { [authority: string]: PendingResolveAuthorityRequest; }; diff --git a/src/vs/platform/request/browser/requestService.ts b/src/vs/platform/request/browser/requestService.ts index 76c608ad819..133e8347434 100644 --- a/src/vs/platform/request/browser/requestService.ts +++ b/src/vs/platform/request/browser/requestService.ts @@ -16,7 +16,7 @@ import { IRequestService } from 'vs/platform/request/common/request'; */ export class RequestService implements IRequestService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IConfigurationService private readonly configurationService: IConfigurationService, diff --git a/src/vs/platform/request/common/request.ts b/src/vs/platform/request/common/request.ts index 5ddf08de7bf..d14d210e430 100644 --- a/src/vs/platform/request/common/request.ts +++ b/src/vs/platform/request/common/request.ts @@ -14,7 +14,7 @@ import { IRequestOptions, IRequestContext } from 'vs/base/parts/request/common/r export const IRequestService = createDecorator('requestService'); export interface IRequestService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; request(options: IRequestOptions, token: CancellationToken): Promise; diff --git a/src/vs/platform/request/common/requestIpc.ts b/src/vs/platform/request/common/requestIpc.ts index 4fbcdec40da..5c96f0b4890 100644 --- a/src/vs/platform/request/common/requestIpc.ts +++ b/src/vs/platform/request/common/requestIpc.ts @@ -40,7 +40,7 @@ export class RequestChannel implements IServerChannel { export class RequestChannelClient { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private readonly channel: IChannel) { } diff --git a/src/vs/platform/request/node/requestService.ts b/src/vs/platform/request/node/requestService.ts index ad44dcbc336..959d254858d 100644 --- a/src/vs/platform/request/node/requestService.ts +++ b/src/vs/platform/request/node/requestService.ts @@ -36,7 +36,7 @@ export interface NodeRequestOptions extends IRequestOptions { */ export class RequestService extends Disposable implements IRequestService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private proxyUrl?: string; private strictSSL: boolean | undefined; diff --git a/src/vs/platform/resource/common/resourceIdentityService.ts b/src/vs/platform/resource/common/resourceIdentityService.ts index d81e3dc8e2f..6c9d00a4f3a 100644 --- a/src/vs/platform/resource/common/resourceIdentityService.ts +++ b/src/vs/platform/resource/common/resourceIdentityService.ts @@ -10,12 +10,12 @@ import { Disposable } from 'vs/base/common/lifecycle'; export const IResourceIdentityService = createDecorator('IResourceIdentityService'); export interface IResourceIdentityService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; resolveResourceIdentity(resource: URI): Promise; } export class WebResourceIdentityService extends Disposable implements IResourceIdentityService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; async resolveResourceIdentity(resource: URI): Promise { return hash(resource.toString()).toString(16); } diff --git a/src/vs/platform/resource/node/resourceIdentityServiceImpl.ts b/src/vs/platform/resource/node/resourceIdentityServiceImpl.ts index 71cb292b6ec..fe7cd857a5f 100644 --- a/src/vs/platform/resource/node/resourceIdentityServiceImpl.ts +++ b/src/vs/platform/resource/node/resourceIdentityServiceImpl.ts @@ -14,7 +14,7 @@ import { ResourceMap } from 'vs/base/common/map'; export class NativeResourceIdentityService extends Disposable implements IResourceIdentityService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly cache: ResourceMap> = new ResourceMap>(); diff --git a/src/vs/platform/sign/browser/signService.ts b/src/vs/platform/sign/browser/signService.ts index 7de2c3d6a11..a8605ecbd82 100644 --- a/src/vs/platform/sign/browser/signService.ts +++ b/src/vs/platform/sign/browser/signService.ts @@ -7,7 +7,7 @@ import { ISignService } from 'vs/platform/sign/common/sign'; export class SignService implements ISignService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _tkn: string | null; diff --git a/src/vs/platform/sign/common/sign.ts b/src/vs/platform/sign/common/sign.ts index f3a766e760b..57d3b1e4d6f 100644 --- a/src/vs/platform/sign/common/sign.ts +++ b/src/vs/platform/sign/common/sign.ts @@ -9,7 +9,7 @@ export const SIGN_SERVICE_ID = 'signService'; export const ISignService = createDecorator(SIGN_SERVICE_ID); export interface ISignService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; sign(value: string): Promise; } diff --git a/src/vs/platform/sign/node/signService.ts b/src/vs/platform/sign/node/signService.ts index b6d0afd467c..d80447e7307 100644 --- a/src/vs/platform/sign/node/signService.ts +++ b/src/vs/platform/sign/node/signService.ts @@ -13,7 +13,7 @@ declare module vsda { } export class SignService implements ISignService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private vsda(): Promise { return new Promise((resolve, reject) => require(['vsda'], resolve, reject)); diff --git a/src/vs/platform/state/node/state.ts b/src/vs/platform/state/node/state.ts index 356ffffdf58..b07335f956f 100644 --- a/src/vs/platform/state/node/state.ts +++ b/src/vs/platform/state/node/state.ts @@ -8,10 +8,10 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' export const IStateService = createDecorator('stateService'); export interface IStateService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getItem(key: string, defaultValue: T): T; getItem(key: string, defaultValue?: T): T | undefined; setItem(key: string, data?: object | string | number | boolean | undefined | null): void; removeItem(key: string): void; -} \ No newline at end of file +} diff --git a/src/vs/platform/state/node/stateService.ts b/src/vs/platform/state/node/stateService.ts index 4932ef70231..a30d0c6d8e6 100644 --- a/src/vs/platform/state/node/stateService.ts +++ b/src/vs/platform/state/node/stateService.ts @@ -126,7 +126,7 @@ export class FileStorage { export class StateService implements IStateService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly STATE_FILE = 'storage.json'; diff --git a/src/vs/platform/storage/browser/storageService.ts b/src/vs/platform/storage/browser/storageService.ts index cbf002a0605..cc782acc5b9 100644 --- a/src/vs/platform/storage/browser/storageService.ts +++ b/src/vs/platform/storage/browser/storageService.ts @@ -18,7 +18,7 @@ import { assertIsDefined, assertAllDefined } from 'vs/base/common/types'; export class BrowserStorageService extends Disposable implements IStorageService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidChangeStorage = this._register(new Emitter()); readonly onDidChangeStorage = this._onDidChangeStorage.event; diff --git a/src/vs/platform/storage/common/storage.ts b/src/vs/platform/storage/common/storage.ts index a2ee988de63..867113ed1e1 100644 --- a/src/vs/platform/storage/common/storage.ts +++ b/src/vs/platform/storage/common/storage.ts @@ -22,7 +22,7 @@ export interface IWillSaveStateEvent { export interface IStorageService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Emitted whenever data is updated or deleted. @@ -131,7 +131,7 @@ export interface IWorkspaceStorageChangeEvent { export class InMemoryStorageService extends Disposable implements IStorageService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidChangeStorage = this._register(new Emitter()); readonly onDidChangeStorage = this._onDidChangeStorage.event; diff --git a/src/vs/platform/storage/node/storageIpc.ts b/src/vs/platform/storage/node/storageIpc.ts index 5b1d824e58b..9db4e9afcda 100644 --- a/src/vs/platform/storage/node/storageIpc.ts +++ b/src/vs/platform/storage/node/storageIpc.ts @@ -164,7 +164,7 @@ export class GlobalStorageDatabaseChannel extends Disposable implements IServerC export class GlobalStorageDatabaseChannelClient extends Disposable implements IStorageDatabase { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidChangeItemsExternal = this._register(new Emitter()); readonly onDidChangeItemsExternal = this._onDidChangeItemsExternal.event; diff --git a/src/vs/platform/storage/node/storageMainService.ts b/src/vs/platform/storage/node/storageMainService.ts index e90d77b5cb1..cc565f615a0 100644 --- a/src/vs/platform/storage/node/storageMainService.ts +++ b/src/vs/platform/storage/node/storageMainService.ts @@ -17,7 +17,7 @@ export const IStorageMainService = createDecorator('storage export interface IStorageMainService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Emitted whenever data is updated or deleted. @@ -86,7 +86,7 @@ export interface IStorageChangeEvent { export class StorageMainService extends Disposable implements IStorageMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly STORAGE_NAME = 'state.vscdb'; diff --git a/src/vs/platform/storage/node/storageService.ts b/src/vs/platform/storage/node/storageService.ts index 1c111c4d8cd..b62e9152c76 100644 --- a/src/vs/platform/storage/node/storageService.ts +++ b/src/vs/platform/storage/node/storageService.ts @@ -20,7 +20,7 @@ import { RunOnceScheduler, runWhenIdle } from 'vs/base/common/async'; export class NativeStorageService extends Disposable implements IStorageService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly WORKSPACE_STORAGE_NAME = 'state.vscdb'; private static readonly WORKSPACE_META_NAME = 'workspace.json'; diff --git a/src/vs/platform/telemetry/common/telemetry.ts b/src/vs/platform/telemetry/common/telemetry.ts index 551c00a727d..60a957fafca 100644 --- a/src/vs/platform/telemetry/common/telemetry.ts +++ b/src/vs/platform/telemetry/common/telemetry.ts @@ -28,7 +28,7 @@ export interface ITelemetryService { */ readonly sendErrorTelemetry: boolean; - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Sends a telemetry event that has been privacy approved. diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts index c04a1a19297..438abc1092b 100644 --- a/src/vs/platform/telemetry/common/telemetryService.ts +++ b/src/vs/platform/telemetry/common/telemetryService.ts @@ -28,7 +28,7 @@ export class TelemetryService implements ITelemetryService { static readonly IDLE_START_EVENT_NAME = 'UserIdleStart'; static readonly IDLE_STOP_EVENT_NAME = 'UserIdleStop'; - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _appender: ITelemetryAppender; private _commonProperties: Promise<{ [name: string]: any; }>; diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts index 4353e7a8176..e20de6a3e1e 100644 --- a/src/vs/platform/telemetry/common/telemetryUtils.ts +++ b/src/vs/platform/telemetry/common/telemetryUtils.ts @@ -12,7 +12,7 @@ import { safeStringify } from 'vs/base/common/objects'; import { isObject } from 'vs/base/common/types'; export const NullTelemetryService = new class implements ITelemetryService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; readonly sendErrorTelemetry = false; publicLog(eventName: string, data?: ITelemetryData) { diff --git a/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts b/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts index fba7d60af8b..fc12d532073 100644 --- a/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts +++ b/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts @@ -28,7 +28,7 @@ class AppInsightsMock extends TelemetryClient { } class TestableLogService extends AbstractLogService implements ILogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; public logs: string[] = []; diff --git a/src/vs/platform/theme/common/themeService.ts b/src/vs/platform/theme/common/themeService.ts index 6ece94f8379..e33a3e9cbd4 100644 --- a/src/vs/platform/theme/common/themeService.ts +++ b/src/vs/platform/theme/common/themeService.ts @@ -137,7 +137,7 @@ export interface IThemingParticipant { } export interface IThemeService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getColorTheme(): IColorTheme; diff --git a/src/vs/platform/theme/electron-main/themeMainService.ts b/src/vs/platform/theme/electron-main/themeMainService.ts index 6787d57bc27..0d16ddb9002 100644 --- a/src/vs/platform/theme/electron-main/themeMainService.ts +++ b/src/vs/platform/theme/electron-main/themeMainService.ts @@ -18,14 +18,14 @@ const THEME_BG_STORAGE_KEY = 'themeBackground'; export const IThemeMainService = createDecorator('themeMainService'); export interface IThemeMainService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getBackgroundColor(): string; } export class ThemeMainService implements IThemeMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(@IStateService private stateService: IStateService) { ipc.on('vscode:changeColorTheme', (e: Event, windowId: number, broadcast: string) => { diff --git a/src/vs/platform/theme/test/common/testThemeService.ts b/src/vs/platform/theme/test/common/testThemeService.ts index 8f7ab1d68bf..bc5fc2403f1 100644 --- a/src/vs/platform/theme/test/common/testThemeService.ts +++ b/src/vs/platform/theme/test/common/testThemeService.ts @@ -45,7 +45,7 @@ export class TestFileIconTheme implements IFileIconTheme { export class TestThemeService implements IThemeService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; _colorTheme: IColorTheme; _fileIconTheme: IFileIconTheme; _onThemeChange = new Emitter(); diff --git a/src/vs/platform/undoRedo/common/undoRedo.ts b/src/vs/platform/undoRedo/common/undoRedo.ts index 92f147d8efd..7b60b057be3 100644 --- a/src/vs/platform/undoRedo/common/undoRedo.ts +++ b/src/vs/platform/undoRedo/common/undoRedo.ts @@ -53,7 +53,7 @@ export interface UriComparisonKeyComputer { } export interface IUndoRedoService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; registerUriComparisonKeyComputer(uriComparisonKeyComputer: UriComparisonKeyComputer): IDisposable; diff --git a/src/vs/platform/undoRedo/common/undoRedoService.ts b/src/vs/platform/undoRedo/common/undoRedoService.ts index 5b901c3bc77..99ef33bf606 100644 --- a/src/vs/platform/undoRedo/common/undoRedoService.ts +++ b/src/vs/platform/undoRedo/common/undoRedoService.ts @@ -368,7 +368,7 @@ class EditStackSnapshot { } export class UndoRedoService implements IUndoRedoService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _editStacks: Map; private readonly _uriComparisonKeyComputers: UriComparisonKeyComputer[]; diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts index d05b111a89f..13e322a9115 100644 --- a/src/vs/platform/update/common/update.ts +++ b/src/vs/platform/update/common/update.ts @@ -81,7 +81,7 @@ export interface IAutoUpdater extends Event.NodeEventEmitter { export const IUpdateService = createDecorator('updateService'); export interface IUpdateService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly onStateChange: Event; readonly state: State; diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts index 65d1f28c961..dd67aaf2070 100644 --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts @@ -25,7 +25,7 @@ export type UpdateNotAvailableClassification = { export abstract class AbstractUpdateService implements IUpdateService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; protected url: string | undefined; diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts index f8fae801ca9..ff83e9c23a1 100644 --- a/src/vs/platform/update/electron-main/updateService.darwin.ts +++ b/src/vs/platform/update/electron-main/updateService.darwin.ts @@ -19,7 +19,7 @@ import { IRequestService } from 'vs/platform/request/common/request'; export class DarwinUpdateService extends AbstractUpdateService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly disposables = new DisposableStore(); diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts index 4b34dafeab8..243b64b686c 100644 --- a/src/vs/platform/update/electron-main/updateService.linux.ts +++ b/src/vs/platform/update/electron-main/updateService.linux.ts @@ -18,7 +18,7 @@ import { CancellationToken } from 'vs/base/common/cancellation'; export class LinuxUpdateService extends AbstractUpdateService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @ILifecycleMainService lifecycleMainService: ILifecycleMainService, diff --git a/src/vs/platform/update/electron-main/updateService.snap.ts b/src/vs/platform/update/electron-main/updateService.snap.ts index a5720f4f045..9e36e24aefa 100644 --- a/src/vs/platform/update/electron-main/updateService.snap.ts +++ b/src/vs/platform/update/electron-main/updateService.snap.ts @@ -18,7 +18,7 @@ import { UpdateNotAvailableClassification } from 'vs/platform/update/electron-ma abstract class AbstractUpdateService2 implements IUpdateService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _state: State = State.Uninitialized; @@ -135,7 +135,7 @@ abstract class AbstractUpdateService2 implements IUpdateService { export class SnapUpdateService extends AbstractUpdateService2 { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( private snap: string, diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts index 8d78ddddd01..5ff2be09f91 100644 --- a/src/vs/platform/update/electron-main/updateService.win32.ts +++ b/src/vs/platform/update/electron-main/updateService.win32.ts @@ -50,7 +50,7 @@ function getUpdateType(): UpdateType { export class Win32UpdateService extends AbstractUpdateService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private availableUpdate: IAvailableUpdate | undefined; diff --git a/src/vs/platform/url/common/url.ts b/src/vs/platform/url/common/url.ts index 097a2398e9b..2069fc48e51 100644 --- a/src/vs/platform/url/common/url.ts +++ b/src/vs/platform/url/common/url.ts @@ -26,7 +26,7 @@ export interface IURLHandler { export interface IURLService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Create a URL that can be called to trigger IURLhandlers. diff --git a/src/vs/platform/url/common/urlService.ts b/src/vs/platform/url/common/urlService.ts index dbcac93deff..b8bd6e2c0a9 100644 --- a/src/vs/platform/url/common/urlService.ts +++ b/src/vs/platform/url/common/urlService.ts @@ -12,7 +12,7 @@ import product from 'vs/platform/product/common/product'; export abstract class AbstractURLService extends Disposable implements IURLService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private handlers = new Set(); diff --git a/src/vs/platform/userDataSync/common/userDataSync.ts b/src/vs/platform/userDataSync/common/userDataSync.ts index 1c269cae5d2..192b58dc438 100644 --- a/src/vs/platform/userDataSync/common/userDataSync.ts +++ b/src/vs/platform/userDataSync/common/userDataSync.ts @@ -160,7 +160,7 @@ export interface IResourceRefHandle { export const IUserDataSyncStoreService = createDecorator('IUserDataSyncStoreService'); export type ServerResource = SyncResource | 'machines'; export interface IUserDataSyncStoreService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly userDataSyncStore: IUserDataSyncStore | undefined; read(resource: ServerResource, oldValue: IUserData | null): Promise; write(resource: ServerResource, content: string, ref: string | null): Promise; @@ -173,7 +173,7 @@ export interface IUserDataSyncStoreService { export const IUserDataSyncBackupStoreService = createDecorator('IUserDataSyncBackupStoreService'); export interface IUserDataSyncBackupStoreService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; backup(resource: SyncResource, content: string): Promise; getAllRefs(resource: SyncResource): Promise; resolveContent(resource: SyncResource, ref?: string): Promise; @@ -367,7 +367,7 @@ export interface IUserDataAutoSyncService { export const IUserDataSyncUtilService = createDecorator('IUserDataSyncUtilService'); export interface IUserDataSyncUtilService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; resolveUserBindings(userbindings: string[]): Promise>; resolveFormattingOptions(resource: URI): Promise; resolveDefaultIgnoredSettings(): Promise; diff --git a/src/vs/platform/userDataSync/common/userDataSyncIpc.ts b/src/vs/platform/userDataSync/common/userDataSyncIpc.ts index 7b6a2401fca..2145b5047a9 100644 --- a/src/vs/platform/userDataSync/common/userDataSyncIpc.ts +++ b/src/vs/platform/userDataSync/common/userDataSyncIpc.ts @@ -101,7 +101,7 @@ export class UserDataSycnUtilServiceChannel implements IServerChannel { export class UserDataSyncUtilServiceClient implements IUserDataSyncUtilService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private readonly channel: IChannel) { } @@ -142,7 +142,7 @@ export class StorageKeysSyncRegistryChannel implements IServerChannel { export class StorageKeysSyncRegistryChannelClient extends Disposable implements IStorageKeysSyncRegistryService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _storageKeys: ReadonlyArray = []; get storageKeys(): ReadonlyArray { return this._storageKeys; } diff --git a/src/vs/platform/userDataSync/common/userDataSyncLog.ts b/src/vs/platform/userDataSync/common/userDataSyncLog.ts index df1251ca3af..095ccda8462 100644 --- a/src/vs/platform/userDataSync/common/userDataSyncLog.ts +++ b/src/vs/platform/userDataSync/common/userDataSyncLog.ts @@ -9,7 +9,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment' export class UserDataSyncLogService extends AbstractLogService implements IUserDataSyncLogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly logger: ILogger; constructor( diff --git a/src/vs/platform/webview/electron-main/webviewMainService.ts b/src/vs/platform/webview/electron-main/webviewMainService.ts index 93990e16fbd..0dd68feeb77 100644 --- a/src/vs/platform/webview/electron-main/webviewMainService.ts +++ b/src/vs/platform/webview/electron-main/webviewMainService.ts @@ -11,7 +11,7 @@ import { UriComponents, URI } from 'vs/base/common/uri'; export class WebviewMainService implements IWebviewManagerService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private protocolProvider: WebviewProtocolProvider; diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts index 5c6facab0a9..d0bc4f841bb 100644 --- a/src/vs/platform/windows/electron-main/windows.ts +++ b/src/vs/platform/windows/electron-main/windows.ts @@ -99,7 +99,7 @@ export interface IWindowsCountChangedEvent { export interface IWindowsMainService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly onWindowReady: Event; readonly onWindowsCountChanged: Event; diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts index abe0631e996..3c7886968c5 100644 --- a/src/vs/platform/windows/electron-main/windowsMainService.ts +++ b/src/vs/platform/windows/electron-main/windowsMainService.ts @@ -152,7 +152,7 @@ interface IWorkspacePathToOpen { export class WindowsMainService extends Disposable implements IWindowsMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly windowsStateStorageKey = 'windowsState'; diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts index 911d5a77fc4..0f2e82d0e85 100644 --- a/src/vs/platform/workspace/common/workspace.ts +++ b/src/vs/platform/workspace/common/workspace.ts @@ -14,7 +14,7 @@ import { IWorkspaceFolderProvider } from 'vs/base/common/labels'; export const IWorkspaceContextService = createDecorator('contextService'); export interface IWorkspaceContextService extends IWorkspaceFolderProvider { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * An event which fires on workbench state changes. diff --git a/src/vs/platform/workspaces/common/workspaces.ts b/src/vs/platform/workspaces/common/workspaces.ts index dc4ef3687f1..ab4f15dacfb 100644 --- a/src/vs/platform/workspaces/common/workspaces.ts +++ b/src/vs/platform/workspaces/common/workspaces.ts @@ -29,7 +29,7 @@ export const IWorkspacesService = createDecorator('workspace export interface IWorkspacesService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; // Workspaces Management enterWorkspace(path: URI): Promise; diff --git a/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts index 25dcc3d140a..b83649ef493 100644 --- a/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts +++ b/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts @@ -30,7 +30,7 @@ export const IWorkspacesHistoryMainService = createDecorator; @@ -57,7 +57,7 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa private static readonly recentlyOpenedStorageKey = 'openedPathsList'; - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onRecentlyOpenedChange = new Emitter(); readonly onRecentlyOpenedChange: CommonEvent = this._onRecentlyOpenedChange.event; diff --git a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts index cb8451feb2d..e3191b1d04c 100644 --- a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts +++ b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts @@ -38,7 +38,7 @@ export interface IWorkspaceEnteredEvent { export interface IWorkspacesMainService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly onUntitledWorkspaceDeleted: Event; readonly onWorkspaceEntered: Event; @@ -65,7 +65,7 @@ export interface IStoredWorkspace { export class WorkspacesMainService extends Disposable implements IWorkspacesMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly untitledWorkspacesHome: URI; // local URI that contains all untitled workspaces diff --git a/src/vs/platform/workspaces/electron-main/workspacesService.ts b/src/vs/platform/workspaces/electron-main/workspacesService.ts index c5a12d23e58..8d1d22d9e02 100644 --- a/src/vs/platform/workspaces/electron-main/workspacesService.ts +++ b/src/vs/platform/workspaces/electron-main/workspacesService.ts @@ -13,7 +13,7 @@ import { IBackupMainService } from 'vs/platform/backup/electron-main/backup'; export class WorkspacesService implements AddFirstParameterToFunctions /* only methods, not events */, number /* window ID */> { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IWorkspacesMainService private readonly workspacesMainService: IWorkspacesMainService, diff --git a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts b/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts index 96f8c6c93ad..ba4ea5b5268 100644 --- a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts +++ b/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts @@ -24,7 +24,7 @@ import { IBackupMainService, IWorkspaceBackupInfo } from 'vs/platform/backup/ele import { IEmptyWindowBackupInfo } from 'vs/platform/backup/node/backup'; export class TestDialogMainService implements IDialogMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; pickFileFolder(options: INativeOpenDialogOptions, window?: Electron.BrowserWindow | undefined): Promise { throw new Error('Method not implemented.'); @@ -57,7 +57,7 @@ export class TestDialogMainService implements IDialogMainService { export class TestBackupMainService implements IBackupMainService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; isHotExitEnabled(): boolean { throw new Error('Method not implemented.'); diff --git a/src/vs/workbench/api/common/extHostApiDeprecationService.ts b/src/vs/workbench/api/common/extHostApiDeprecationService.ts index 010458267f0..44cce5ba2ef 100644 --- a/src/vs/workbench/api/common/extHostApiDeprecationService.ts +++ b/src/vs/workbench/api/common/extHostApiDeprecationService.ts @@ -10,7 +10,7 @@ import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol'; import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService'; export interface IExtHostApiDeprecationService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; report(apiId: string, extension: IExtensionDescription, migrationSuggestion: string): void; } @@ -19,7 +19,7 @@ export const IExtHostApiDeprecationService = createDecorator(); private readonly _telemetryShape: extHostProtocol.MainThreadTelemetryShape; @@ -63,7 +63,7 @@ export class ExtHostApiDeprecationService implements IExtHostApiDeprecationServi export const NullApiDeprecationService = Object.freeze(new class implements IExtHostApiDeprecationService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; public report(_apiId: string, _extension: IExtensionDescription, _warningMessage: string): void { // noop diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts index aef67f0ec99..eb378e53b92 100644 --- a/src/vs/workbench/api/common/extHostExtensionService.ts +++ b/src/vs/workbench/api/common/extHostExtensionService.ts @@ -48,7 +48,7 @@ interface INewTestRunner { export const IHostUtils = createDecorator('IHostUtils'); export interface IHostUtils { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; exit(code?: number): void; exists(path: string): Promise; realpath(path: string): Promise; @@ -827,7 +827,7 @@ function getTelemetryActivationEvent(extensionDescription: IExtensionDescription export const IExtHostExtensionService = createDecorator('IExtHostExtensionService'); export interface IExtHostExtensionService extends AbstractExtHostExtensionService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; initialize(): Promise; isActivated(extensionId: ExtensionIdentifier): boolean; activateByIdWithErrors(extensionId: ExtensionIdentifier, reason: ExtensionActivationReason): Promise; diff --git a/src/vs/workbench/api/common/extHostInitDataService.ts b/src/vs/workbench/api/common/extHostInitDataService.ts index 2f0acd57a3c..c318d2694d0 100644 --- a/src/vs/workbench/api/common/extHostInitDataService.ts +++ b/src/vs/workbench/api/common/extHostInitDataService.ts @@ -9,6 +9,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' export const IExtHostInitDataService = createDecorator('IExtHostInitDataService'); export interface IExtHostInitDataService extends Readonly { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; } diff --git a/src/vs/workbench/api/common/extHostRpcService.ts b/src/vs/workbench/api/common/extHostRpcService.ts index 3cbdcf31165..58237cf24bc 100644 --- a/src/vs/workbench/api/common/extHostRpcService.ts +++ b/src/vs/workbench/api/common/extHostRpcService.ts @@ -9,7 +9,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' export const IExtHostRpcService = createDecorator('IExtHostRpcService'); export interface IExtHostRpcService extends IRPCProtocol { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; } export class ExtHostRpcService implements IExtHostRpcService { diff --git a/src/vs/workbench/api/common/extHostStoragePaths.ts b/src/vs/workbench/api/common/extHostStoragePaths.ts index cd73bf5563b..ea1bdcb8190 100644 --- a/src/vs/workbench/api/common/extHostStoragePaths.ts +++ b/src/vs/workbench/api/common/extHostStoragePaths.ts @@ -9,7 +9,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' export const IExtensionStoragePaths = createDecorator('IExtensionStoragePaths'); export interface IExtensionStoragePaths { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; whenReady: Promise; workspaceValue(extension: IExtensionDescription): string | undefined; globalValue(extension: IExtensionDescription): string; diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts index 834116c615f..c385606345f 100644 --- a/src/vs/workbench/api/common/extHostTerminalService.ts +++ b/src/vs/workbench/api/common/extHostTerminalService.ts @@ -20,7 +20,7 @@ import { ISerializableEnvironmentVariableCollection } from 'vs/workbench/contrib export interface IExtHostTerminalService extends ExtHostTerminalServiceShape { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; activeTerminal: vscode.Terminal | undefined; terminals: vscode.Terminal[]; diff --git a/src/vs/workbench/api/common/extHostTimeline.ts b/src/vs/workbench/api/common/extHostTimeline.ts index 24a5092542e..327cfe4d485 100644 --- a/src/vs/workbench/api/common/extHostTimeline.ts +++ b/src/vs/workbench/api/common/extHostTimeline.ts @@ -22,7 +22,7 @@ export interface IExtHostTimeline extends ExtHostTimelineShape { export const IExtHostTimeline = createDecorator('IExtHostTimeline'); export class ExtHostTimeline implements IExtHostTimeline { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _proxy: MainThreadTimelineShape; diff --git a/src/vs/workbench/api/common/extHostTunnelService.ts b/src/vs/workbench/api/common/extHostTunnelService.ts index 60aec092a05..ca249267d38 100644 --- a/src/vs/workbench/api/common/extHostTunnelService.ts +++ b/src/vs/workbench/api/common/extHostTunnelService.ts @@ -41,7 +41,7 @@ export interface IExtHostTunnelService extends ExtHostTunnelServiceShape { export const IExtHostTunnelService = createDecorator('IExtHostTunnelService'); export class ExtHostTunnelService implements IExtHostTunnelService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; onDidChangeTunnels: vscode.Event = (new Emitter()).event; private readonly _proxy: MainThreadTunnelServiceShape; diff --git a/src/vs/workbench/api/common/extHostUriTransformerService.ts b/src/vs/workbench/api/common/extHostUriTransformerService.ts index 97b00f23806..4d86037b020 100644 --- a/src/vs/workbench/api/common/extHostUriTransformerService.ts +++ b/src/vs/workbench/api/common/extHostUriTransformerService.ts @@ -8,13 +8,13 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' import { URI, UriComponents } from 'vs/base/common/uri'; export interface IURITransformerService extends IURITransformer { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; } export const IURITransformerService = createDecorator('IURITransformerService'); export class URITransformerService implements IURITransformerService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; transformIncoming: (uri: UriComponents) => UriComponents; transformOutgoing: (uri: UriComponents) => UriComponents; diff --git a/src/vs/workbench/api/worker/extHostLogService.ts b/src/vs/workbench/api/worker/extHostLogService.ts index 2c0cb0592a4..51c671d6b88 100644 --- a/src/vs/workbench/api/worker/extHostLogService.ts +++ b/src/vs/workbench/api/worker/extHostLogService.ts @@ -11,7 +11,7 @@ import { UriComponents } from 'vs/base/common/uri'; export class ExtHostLogService extends AbstractLogService implements ILogService, ExtHostLogServiceShape { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _proxy: MainThreadLogShape; private readonly _logFile: UriComponents; diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts index 7f42b81d1ae..bd6dc149840 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -104,7 +104,7 @@ interface SideBarActivityState { export abstract class Layout extends Disposable implements IWorkbenchLayoutService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; //#region Events diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts index a5ad30ee637..9f43ecdfd33 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts @@ -67,7 +67,7 @@ interface ICachedViewContainer { export class ActivitybarPart extends Part implements IActivityBarService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly ACTION_HEIGHT = 48; static readonly PINNED_VIEW_CONTAINERS = 'workbench.activity.pinnedViewlets2'; diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbs.ts b/src/vs/workbench/browser/parts/editor/breadcrumbs.ts index dc71187fd56..30e3c09e948 100644 --- a/src/vs/workbench/browser/parts/editor/breadcrumbs.ts +++ b/src/vs/workbench/browser/parts/editor/breadcrumbs.ts @@ -19,7 +19,7 @@ export const IBreadcrumbsService = createDecorator('IEditor export interface IBreadcrumbsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; register(group: GroupIdentifier, widget: BreadcrumbsWidget): IDisposable; @@ -29,7 +29,7 @@ export interface IBreadcrumbsService { export class BreadcrumbsService implements IBreadcrumbsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _map = new Map(); diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index aafec632a47..12401397e72 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -82,7 +82,7 @@ class GridWidgetView implements IView { export class EditorPart extends Part implements IEditorGroupsService, IEditorGroupsAccessor { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly EDITOR_PART_UI_STATE_STORAGE_KEY = 'editorpart.state'; private static readonly EDITOR_PART_CENTERED_VIEW_STORAGE_KEY = 'editorpart.centeredview'; diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts index d44fcc689e3..8a894c28fba 100644 --- a/src/vs/workbench/browser/parts/panel/panelPart.ts +++ b/src/vs/workbench/browser/parts/panel/panelPart.ts @@ -63,7 +63,7 @@ export class PanelPart extends CompositePart implements IPanelService { static readonly PLACEHOLDER_VIEW_CONTAINERS = 'workbench.panel.placeholderPanels'; private static readonly MIN_COMPOSITE_BAR_WIDTH = 50; - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; //#region IView diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts index 5bac199ce4f..ed6d1ae1db3 100644 --- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts +++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts @@ -38,7 +38,7 @@ import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/comm export class SidebarPart extends CompositePart implements IViewletService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; static readonly activeViewletSettingsKey = 'workbench.sidebar.activeviewletid'; diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts index 7138fbf5159..046d2d13f44 100644 --- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts +++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts @@ -373,7 +373,7 @@ class HideStatusbarEntryAction extends Action { export class StatusbarPart extends Part implements IStatusbarService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; //#region IView diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts index dfe56ef6508..22eb36afbc7 100644 --- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts +++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts @@ -60,7 +60,7 @@ export class TitlebarPart extends Part implements ITitleService { private _onMenubarVisibilityChange = this._register(new Emitter()); readonly onMenubarVisibilityChange = this._onMenubarVisibilityChange.event; - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; protected title!: HTMLElement; protected customMenubar: CustomMenubarControl | undefined; diff --git a/src/vs/workbench/browser/parts/views/viewsService.ts b/src/vs/workbench/browser/parts/views/viewsService.ts index fbce01f7e0a..393a579d874 100644 --- a/src/vs/workbench/browser/parts/views/viewsService.ts +++ b/src/vs/workbench/browser/parts/views/viewsService.ts @@ -34,7 +34,7 @@ import { IProgressIndicator } from 'vs/platform/progress/common/progress'; export class ViewsService extends Disposable implements IViewsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly viewDisposable: Map; private readonly viewPaneContainers: Map; diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts index 6a8dd33202f..b37aa0e530e 100644 --- a/src/vs/workbench/common/views.ts +++ b/src/vs/workbench/common/views.ts @@ -473,7 +473,7 @@ export interface IView { export const IViewsService = createDecorator('viewsService'); export interface IViewsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; // View Container APIs readonly onDidChangeViewContainerVisibility: Event<{ id: string, visible: boolean, location: ViewContainerLocation }>; @@ -501,7 +501,7 @@ export const IViewDescriptorService = createDecorator('v export interface IViewDescriptorService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; // ViewContainers readonly viewContainers: ReadonlyArray; diff --git a/src/vs/workbench/contrib/comments/browser/commentService.ts b/src/vs/workbench/contrib/comments/browser/commentService.ts index 56bae5b2001..0312fdba5df 100644 --- a/src/vs/workbench/contrib/comments/browser/commentService.ts +++ b/src/vs/workbench/contrib/comments/browser/commentService.ts @@ -33,7 +33,7 @@ export interface IWorkspaceCommentThreadsEvent { } export interface ICommentService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly onDidSetResourceCommentInfos: Event; readonly onDidSetAllCommentThreads: Event; readonly onDidUpdateCommentThreads: Event; @@ -60,7 +60,7 @@ export interface ICommentService { } export class CommentService extends Disposable implements ICommentService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidSetDataProvider: Emitter = this._register(new Emitter()); readonly onDidSetDataProvider: Event = this._onDidSetDataProvider.event; diff --git a/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts b/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts index 745457c418f..2f19bd82b10 100644 --- a/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts +++ b/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts @@ -41,7 +41,7 @@ import { IEditorOptions, EditorOption } from 'vs/editor/common/config/editorOpti const $ = dom.$; const IPrivateBreakpointWidgetService = createDecorator('privateBreakpointWidgetService'); export interface IPrivateBreakpointWidgetService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; close(success: boolean): void; } const DECORATION_KEY = 'breakpointwidgetdecoration'; @@ -75,7 +75,7 @@ function createDecorations(theme: IColorTheme, placeHolder: string): IDecoration } export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWidgetService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private selectContainer!: HTMLElement; private inputContainer!: HTMLElement; diff --git a/src/vs/workbench/contrib/debug/browser/debugService.ts b/src/vs/workbench/contrib/debug/browser/debugService.ts index c415a50eb94..c47f259d6b7 100644 --- a/src/vs/workbench/contrib/debug/browser/debugService.ts +++ b/src/vs/workbench/contrib/debug/browser/debugService.ts @@ -48,7 +48,7 @@ import { DebugTelemetry } from 'vs/workbench/contrib/debug/common/debugTelemetry import { DebugCompoundRoot } from 'vs/workbench/contrib/debug/common/debugCompoundRoot'; export class DebugService implements IDebugService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidChangeState: Emitter; private readonly _onDidNewSession: Emitter; diff --git a/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts b/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts index ebcf4f80b2c..3d297be710d 100644 --- a/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts +++ b/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts @@ -132,7 +132,7 @@ registerSingleton(IExtensionHostDebugService, BrowserExtensionHostDebugService); class BrowserDebugHelperService implements IDebugHelperService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; createTelemetryService(configurationService: IConfigurationService, args: string[]): TelemetryService | undefined { return undefined; diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts index abc3e70d141..fc829036362 100644 --- a/src/vs/workbench/contrib/debug/browser/repl.ts +++ b/src/vs/workbench/contrib/debug/browser/repl.ts @@ -74,7 +74,7 @@ function revealLastElement(tree: WorkbenchAsyncDataTree) { const sessionsToIgnore = new Set(); export class Repl extends ViewPane implements IHistoryNavigationWidget { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly REFRESH_DELAY = 100; // delay in ms to refresh the repl for new elements to show private static readonly URI = uri.parse(`${DEBUG_SCHEME}:replinput`); diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts index 997e8f4df84..d00fe35a640 100644 --- a/src/vs/workbench/contrib/debug/common/debug.ts +++ b/src/vs/workbench/contrib/debug/common/debug.ts @@ -731,7 +731,7 @@ export interface ILaunch { export const IDebugService = createDecorator(DEBUG_SERVICE_ID); export interface IDebugService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Gets the current debug state. @@ -909,7 +909,7 @@ export const DEBUG_HELPER_SERVICE_ID = 'debugHelperService'; export const IDebugHelperService = createDecorator(DEBUG_HELPER_SERVICE_ID); export interface IDebugHelperService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; createTelemetryService(configurationService: IConfigurationService, args: string[]): TelemetryService | undefined; } diff --git a/src/vs/workbench/contrib/debug/node/debugHelperService.ts b/src/vs/workbench/contrib/debug/node/debugHelperService.ts index 64c2b5b5421..572aa40489c 100644 --- a/src/vs/workbench/contrib/debug/node/debugHelperService.ts +++ b/src/vs/workbench/contrib/debug/node/debugHelperService.ts @@ -14,7 +14,7 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/ import { cleanRemoteAuthority } from 'vs/platform/telemetry/common/telemetryUtils'; export class NodeDebugHelperService implements IDebugHelperService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService, diff --git a/src/vs/workbench/contrib/experiments/common/experimentService.ts b/src/vs/workbench/contrib/experiments/common/experimentService.ts index ece41041668..fa09f280e86 100644 --- a/src/vs/workbench/contrib/experiments/common/experimentService.ts +++ b/src/vs/workbench/contrib/experiments/common/experimentService.ts @@ -70,7 +70,7 @@ export interface IExperiment { } export interface IExperimentService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getExperimentById(id: string): Promise; getExperimentsByType(type: ExperimentActionType): Promise; getCuratedExtensionsList(curatedExtensionsKey: string): Promise; @@ -163,7 +163,7 @@ export const getCurrentActivationRecord = (previous?: IActivationEventRecord, da }; export class ExperimentService extends Disposable implements IExperimentService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _experiments: IExperiment[] = []; private _loadExperimentsPromise: Promise; private _curatedMapping = Object.create(null); diff --git a/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts b/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts index 3c244101c51..20116eb72c7 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts @@ -35,7 +35,7 @@ const ignoredRecommendationsStorageKey = 'extensionsAssistant/ignored_recommenda export class ExtensionRecommendationsService extends Disposable implements IExtensionRecommendationsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; // Recommendations private readonly fileBasedRecommendations: FileBasedRecommendations; diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts index 0b6d0a5f6c8..80d050048af 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts @@ -476,7 +476,7 @@ class Extensions extends Disposable { export class ExtensionsWorkbenchService extends Disposable implements IExtensionsWorkbenchService, IURLHandler { private static readonly SyncPeriod = 1000 * 60 * 60 * 12; // 12 hours - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly localExtensions: Extensions | null = null; private readonly remoteExtensions: Extensions | null = null; diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts index 6119b8de80c..43b3cb97ead 100644 --- a/src/vs/workbench/contrib/extensions/common/extensions.ts +++ b/src/vs/workbench/contrib/extensions/common/extensions.ts @@ -71,7 +71,7 @@ export const SERVICE_ID = 'extensionsWorkbenchService'; export const IExtensionsWorkbenchService = createDecorator(SERVICE_ID); export interface IExtensionsWorkbenchService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; onChange: Event; local: IExtension[]; installed: IExtension[]; diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts index f95e31cd436..40813ff9bc5 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts @@ -23,7 +23,7 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands'; export class ExtensionHostProfileService extends Disposable implements IExtensionHostProfileService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidChangeState: Emitter = this._register(new Emitter()); public readonly onDidChangeState: Event = this._onDidChangeState.event; diff --git a/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts index 8a34e72ad0b..65bdaa6bf97 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts @@ -62,7 +62,7 @@ export enum ProfileSessionState { } export interface IExtensionHostProfileService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly onDidChangeState: Event; readonly onDidChangeLastProfile: Event; diff --git a/src/vs/workbench/contrib/externalTerminal/common/externalTerminal.ts b/src/vs/workbench/contrib/externalTerminal/common/externalTerminal.ts index 6bbcd810c1e..4e46df2b22b 100644 --- a/src/vs/workbench/contrib/externalTerminal/common/externalTerminal.ts +++ b/src/vs/workbench/contrib/externalTerminal/common/externalTerminal.ts @@ -14,7 +14,7 @@ export interface IExternalTerminalSettings { } export interface IExternalTerminalService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; openTerminal(path: string): void; runInTerminal(title: string, cwd: string, args: string[], env: { [key: string]: string | null; }, settings: IExternalTerminalSettings): Promise; } @@ -24,4 +24,4 @@ export interface IExternalTerminalConfiguration { explorerKind: 'integrated' | 'external', external: IExternalTerminalSettings; }; -} \ No newline at end of file +} diff --git a/src/vs/workbench/contrib/files/common/explorerService.ts b/src/vs/workbench/contrib/files/common/explorerService.ts index b028ae30524..4ad1fc336d7 100644 --- a/src/vs/workbench/contrib/files/common/explorerService.ts +++ b/src/vs/workbench/contrib/files/common/explorerService.ts @@ -28,7 +28,7 @@ function getFileEventsExcludes(configurationService: IConfigurationService, root } export class ExplorerService implements IExplorerService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly EXPLORER_FILE_CHANGES_REACT_DELAY = 500; // delay in ms to react to file changes to give our internal events a chance to react first diff --git a/src/vs/workbench/contrib/files/common/files.ts b/src/vs/workbench/contrib/files/common/files.ts index c970d8a04b7..9f1c4d9d1bc 100644 --- a/src/vs/workbench/contrib/files/common/files.ts +++ b/src/vs/workbench/contrib/files/common/files.ts @@ -39,7 +39,7 @@ export const VIEW_ID = 'workbench.explorer.fileView'; export const DEFAULT_EDITOR_ID = 'default'; export interface IExplorerService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly roots: ExplorerItem[]; readonly sortOrder: SortOrder; diff --git a/src/vs/workbench/contrib/issue/browser/issueService.ts b/src/vs/workbench/contrib/issue/browser/issueService.ts index 5fcf51485aa..fea2b9e7ce8 100644 --- a/src/vs/workbench/contrib/issue/browser/issueService.ts +++ b/src/vs/workbench/contrib/issue/browser/issueService.ts @@ -18,12 +18,12 @@ export interface IIssueReporterOptions { } export interface IWebIssueService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; openReporter(options?: IIssueReporterOptions): Promise; } export class WebIssueService implements IWebIssueService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService, diff --git a/src/vs/workbench/contrib/issue/electron-browser/issue.ts b/src/vs/workbench/contrib/issue/electron-browser/issue.ts index fc6d4b70552..f5cb676c561 100644 --- a/src/vs/workbench/contrib/issue/electron-browser/issue.ts +++ b/src/vs/workbench/contrib/issue/electron-browser/issue.ts @@ -9,7 +9,7 @@ import { IssueReporterData } from 'vs/platform/issue/common/issue'; export const IWorkbenchIssueService = createDecorator('workbenchIssueService'); export interface IWorkbenchIssueService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; openReporter(dataOverrides?: Partial): Promise; openProcessExplorer(): Promise; } diff --git a/src/vs/workbench/contrib/issue/electron-browser/issueService.ts b/src/vs/workbench/contrib/issue/electron-browser/issueService.ts index 2aa3029feef..9aa45f0a2bd 100644 --- a/src/vs/workbench/contrib/issue/electron-browser/issueService.ts +++ b/src/vs/workbench/contrib/issue/electron-browser/issueService.ts @@ -18,7 +18,7 @@ import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/enviro import { ExtensionType } from 'vs/platform/extensions/common/extensions'; export class WorkbenchIssueService implements IWorkbenchIssueService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IIssueService private readonly issueService: IIssueService, diff --git a/src/vs/workbench/contrib/markers/browser/markers.ts b/src/vs/workbench/contrib/markers/browser/markers.ts index a6e8ee54060..99d4a1c290a 100644 --- a/src/vs/workbench/contrib/markers/browser/markers.ts +++ b/src/vs/workbench/contrib/markers/browser/markers.ts @@ -19,12 +19,12 @@ import { ResourceMap } from 'vs/base/common/map'; export const IMarkersWorkbenchService = createDecorator('markersWorkbenchService'); export interface IMarkersWorkbenchService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly markersModel: MarkersModel; } export class MarkersWorkbenchService extends Disposable implements IMarkersWorkbenchService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; readonly markersModel: MarkersModel; diff --git a/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts index 1424cf9536e..16ebba88cec 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts @@ -136,7 +136,7 @@ class ModelData implements IDisposable { } } export class NotebookService extends Disposable implements INotebookService, ICustomEditorViewTypesHandler { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _notebookProviders = new Map(); private readonly _notebookRenderers = new Map(); private readonly _notebookKernels = new Map(); diff --git a/src/vs/workbench/contrib/notebook/common/notebookService.ts b/src/vs/workbench/contrib/notebook/common/notebookService.ts index e420d650f85..aa45b9009f5 100644 --- a/src/vs/workbench/contrib/notebook/common/notebookService.ts +++ b/src/vs/workbench/contrib/notebook/common/notebookService.ts @@ -28,7 +28,7 @@ export interface IMainNotebookController { } export interface INotebookService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; modelManager: INotebookEditorModelManager; canResolve(viewType: string): Promise; onDidChangeActiveEditor: Event; diff --git a/src/vs/workbench/contrib/output/browser/outputServices.ts b/src/vs/workbench/contrib/output/browser/outputServices.ts index ea753245ff4..7af6a57b013 100644 --- a/src/vs/workbench/contrib/output/browser/outputServices.ts +++ b/src/vs/workbench/contrib/output/browser/outputServices.ts @@ -56,7 +56,7 @@ class OutputChannel extends Disposable implements IOutputChannel { export class OutputService extends Disposable implements IOutputService, ITextModelContentProvider { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private channels: Map = new Map(); private activeChannelIdInStorage: string; diff --git a/src/vs/workbench/contrib/output/common/output.ts b/src/vs/workbench/contrib/output/common/output.ts index 483be2132b5..ded98a2afbd 100644 --- a/src/vs/workbench/contrib/output/common/output.ts +++ b/src/vs/workbench/contrib/output/common/output.ts @@ -60,7 +60,7 @@ export const IOutputService = createDecorator(OUTPUT_SERVICE_ID) * The output service to manage output from the various processes running. */ export interface IOutputService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Given the channel id returns the output channel instance. diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts index bcb5216f675..61441434c8f 100644 --- a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts +++ b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts @@ -33,7 +33,7 @@ export interface IEndpointDetails { } export class PreferencesSearchService extends Disposable implements IPreferencesSearchService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _installedExtensions: Promise; diff --git a/src/vs/workbench/contrib/preferences/common/preferences.ts b/src/vs/workbench/contrib/preferences/common/preferences.ts index 5c0071a76c7..b318d190d27 100644 --- a/src/vs/workbench/contrib/preferences/common/preferences.ts +++ b/src/vs/workbench/contrib/preferences/common/preferences.ts @@ -33,7 +33,7 @@ export interface IEndpointDetails { export const IPreferencesSearchService = createDecorator('preferencesSearchService'); export interface IPreferencesSearchService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getLocalSearchProvider(filter: string): ISearchProvider; getRemoteSearchProvider(filter: string, newExtensionsOnly?: boolean): ISearchProvider | undefined; diff --git a/src/vs/workbench/contrib/scm/common/scmService.ts b/src/vs/workbench/contrib/scm/common/scmService.ts index 62c5d4f023e..d73a4639494 100644 --- a/src/vs/workbench/contrib/scm/common/scmService.ts +++ b/src/vs/workbench/contrib/scm/common/scmService.ts @@ -113,7 +113,7 @@ class SCMRepository implements ISCMRepository { export class SCMService implements ISCMService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _providerIds = new Set(); private _repositories: ISCMRepository[] = []; diff --git a/src/vs/workbench/contrib/search/browser/replaceService.ts b/src/vs/workbench/contrib/search/browser/replaceService.ts index 533e530790c..90023f40b24 100644 --- a/src/vs/workbench/contrib/search/browser/replaceService.ts +++ b/src/vs/workbench/contrib/search/browser/replaceService.ts @@ -88,7 +88,7 @@ class ReplacePreviewModel extends Disposable { export class ReplaceService implements IReplaceService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @ITextFileService private readonly textFileService: ITextFileService, diff --git a/src/vs/workbench/contrib/search/common/replace.ts b/src/vs/workbench/contrib/search/common/replace.ts index d3d94df9371..8c1320c1f9c 100644 --- a/src/vs/workbench/contrib/search/common/replace.ts +++ b/src/vs/workbench/contrib/search/common/replace.ts @@ -11,7 +11,7 @@ export const IReplaceService = createDecorator('replaceService' export interface IReplaceService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Replaces the given match in the file that match belongs to diff --git a/src/vs/workbench/contrib/search/common/searchHistoryService.ts b/src/vs/workbench/contrib/search/common/searchHistoryService.ts index 5f5496fb9d2..bb5a9209e51 100644 --- a/src/vs/workbench/contrib/search/common/searchHistoryService.ts +++ b/src/vs/workbench/contrib/search/common/searchHistoryService.ts @@ -9,7 +9,7 @@ import { isEmptyObject } from 'vs/base/common/types'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; export interface ISearchHistoryService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; onDidClearHistory: Event; clearHistory(): void; load(): ISearchHistoryValues; @@ -26,7 +26,7 @@ export interface ISearchHistoryValues { } export class SearchHistoryService implements ISearchHistoryService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly SEARCH_HISTORY_KEY = 'workbench.search.history'; @@ -64,4 +64,4 @@ export class SearchHistoryService implements ISearchHistoryService { this.storageService.store(SearchHistoryService.SEARCH_HISTORY_KEY, JSON.stringify(history), StorageScope.WORKSPACE); } } -} \ No newline at end of file +} diff --git a/src/vs/workbench/contrib/search/common/searchModel.ts b/src/vs/workbench/contrib/search/common/searchModel.ts index 9f90d468cf9..3d406eeaed7 100644 --- a/src/vs/workbench/contrib/search/common/searchModel.ts +++ b/src/vs/workbench/contrib/search/common/searchModel.ts @@ -1181,7 +1181,7 @@ export type RenderableMatch = FolderMatch | FolderMatchWithResource | FileMatch export class SearchWorkbenchService implements ISearchWorkbenchService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _searchModel: SearchModel | null = null; constructor(@IInstantiationService private readonly instantiationService: IInstantiationService) { @@ -1198,7 +1198,7 @@ export class SearchWorkbenchService implements ISearchWorkbenchService { export const ISearchWorkbenchService = createDecorator('searchWorkbenchService'); export interface ISearchWorkbenchService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly searchModel: SearchModel; } diff --git a/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts b/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts index 836225138b1..c7adf5c4fcc 100644 --- a/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts +++ b/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts @@ -15,7 +15,7 @@ export const ISnippetsService = createDecorator('snippetServic export interface ISnippetsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getSnippetFiles(): Promise>; diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts index 70d7065de59..91ad6206651 100644 --- a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts +++ b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts @@ -15,7 +15,7 @@ import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageCo import { CompletionContext, CompletionTriggerKind } from 'vs/editor/common/modes'; class SimpleSnippetService implements ISnippetsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(readonly snippets: Snippet[]) { } getSnippets() { diff --git a/src/vs/workbench/contrib/tags/browser/workspaceTagsService.ts b/src/vs/workbench/contrib/tags/browser/workspaceTagsService.ts index d21d6688d7a..2aecc6350ce 100644 --- a/src/vs/workbench/contrib/tags/browser/workspaceTagsService.ts +++ b/src/vs/workbench/contrib/tags/browser/workspaceTagsService.ts @@ -10,7 +10,7 @@ import { IWorkspaceTagsService, Tags } from 'vs/workbench/contrib/tags/common/wo export class NoOpWorkspaceTagsService implements IWorkspaceTagsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; getTags(): Promise { return Promise.resolve({}); diff --git a/src/vs/workbench/contrib/tags/common/workspaceTags.ts b/src/vs/workbench/contrib/tags/common/workspaceTags.ts index 6814b5cdf3f..d1683b97726 100644 --- a/src/vs/workbench/contrib/tags/common/workspaceTags.ts +++ b/src/vs/workbench/contrib/tags/common/workspaceTags.ts @@ -12,7 +12,7 @@ export type Tags = { [index: string]: boolean | number | string | undefined }; export const IWorkspaceTagsService = createDecorator('workspaceTagsService'); export interface IWorkspaceTagsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getTags(): Promise; diff --git a/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts b/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts index c921a5daa3c..2bf416bf119 100644 --- a/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts +++ b/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts @@ -98,7 +98,7 @@ const PyModulesToLookFor = [ ]; export class WorkspaceTagsService implements IWorkspaceTagsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _tags: Tags | undefined; constructor( diff --git a/src/vs/workbench/contrib/tasks/common/taskService.ts b/src/vs/workbench/contrib/tasks/common/taskService.ts index 7fd806c12f4..18758775d50 100644 --- a/src/vs/workbench/contrib/tasks/common/taskService.ts +++ b/src/vs/workbench/contrib/tasks/common/taskService.ts @@ -53,7 +53,7 @@ export interface WorkspaceFolderTaskResult extends WorkspaceTaskResult { export const USER_TASKS_GROUP_KEY = 'settings'; export interface ITaskService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; onDidStateChange: Event; supportsMultipleTaskExecutions: boolean; diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts index f24715c58d0..e953370e103 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts @@ -24,7 +24,7 @@ export const ITerminalInstanceService = createDecorator; @@ -70,7 +70,7 @@ export interface ITerminalTab { } export interface ITerminalService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; activeTabIndex: number; configHelper: ITerminalConfigHelper; diff --git a/src/vs/workbench/contrib/terminal/common/environmentVariable.ts b/src/vs/workbench/contrib/terminal/common/environmentVariable.ts index 655cdf158b5..bb32eafc81d 100644 --- a/src/vs/workbench/contrib/terminal/common/environmentVariable.ts +++ b/src/vs/workbench/contrib/terminal/common/environmentVariable.ts @@ -61,7 +61,7 @@ export interface IMergedEnvironmentVariableCollection { * Tracks and persists environment variable collections as defined by extensions. */ export interface IEnvironmentVariableService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Gets a single collection constructed by merging all environment variable collections into diff --git a/src/vs/workbench/contrib/terminal/common/environmentVariableService.ts b/src/vs/workbench/contrib/terminal/common/environmentVariableService.ts index f4cda20ee28..8373296bf55 100644 --- a/src/vs/workbench/contrib/terminal/common/environmentVariableService.ts +++ b/src/vs/workbench/contrib/terminal/common/environmentVariableService.ts @@ -22,7 +22,7 @@ interface ISerializableExtensionEnvironmentVariableCollection { * Tracks and persists environment variable collections as defined by extensions. */ export class EnvironmentVariableService implements IEnvironmentVariableService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; collections: Map = new Map(); mergedCollection: IMergedEnvironmentVariableCollection; diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts index b498ad74639..dcb635fca96 100644 --- a/src/vs/workbench/contrib/terminal/common/terminal.ts +++ b/src/vs/workbench/contrib/terminal/common/terminal.ts @@ -237,7 +237,7 @@ export interface IShellLaunchConfig { * Provides access to native or electron APIs to other terminal services. */ export interface ITerminalNativeService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly linuxDistro: LinuxDistro; diff --git a/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkManager.test.ts b/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkManager.test.ts index c1a77fc1ed5..2223e0d082a 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkManager.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkManager.test.ts @@ -37,7 +37,7 @@ class MockTerminalInstanceService implements ITerminalInstanceService { getDefaultShellAndArgs(): Promise<{ shell: string; args: string | string[] | undefined; }> { throw new Error('Method not implemented.'); } - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; getXtermConstructor(): Promise { throw new Error('Method not implemented.'); } diff --git a/src/vs/workbench/contrib/timeline/common/timelineService.ts b/src/vs/workbench/contrib/timeline/common/timelineService.ts index 4fd45ce01ac..363d7f27f32 100644 --- a/src/vs/workbench/contrib/timeline/common/timelineService.ts +++ b/src/vs/workbench/contrib/timeline/common/timelineService.ts @@ -13,7 +13,7 @@ import { ITimelineService, TimelineChangeEvent, TimelineOptions, TimelineProvide import { IViewsService } from 'vs/workbench/common/views'; export class TimelineService implements ITimelineService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidChangeProviders = new Emitter(); readonly onDidChangeProviders: Event = this._onDidChangeProviders.event; diff --git a/src/vs/workbench/contrib/userDataSync/electron-browser/userDataAutoSyncService.ts b/src/vs/workbench/contrib/userDataSync/electron-browser/userDataAutoSyncService.ts index 1f001705e8a..bb6b3b63107 100644 --- a/src/vs/workbench/contrib/userDataSync/electron-browser/userDataAutoSyncService.ts +++ b/src/vs/workbench/contrib/userDataSync/electron-browser/userDataAutoSyncService.ts @@ -13,7 +13,7 @@ import { UserDataSyncTrigger } from 'vs/workbench/contrib/userDataSync/browser/u export class UserDataAutoSyncService extends Disposable implements IUserDataAutoSyncService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly channel: IChannel; get onError(): Event { return Event.map(this.channel.listen('onError'), e => UserDataSyncError.toUserDataSyncError(e)); } diff --git a/src/vs/workbench/contrib/webview/browser/webview.ts b/src/vs/workbench/contrib/webview/browser/webview.ts index 529a93d1071..b3e87e7fa83 100644 --- a/src/vs/workbench/contrib/webview/browser/webview.ts +++ b/src/vs/workbench/contrib/webview/browser/webview.ts @@ -34,7 +34,7 @@ export interface WebviewIcons { * Handles the creation of webview elements. */ export interface IWebviewService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; createWebviewElement( id: string, diff --git a/src/vs/workbench/contrib/webview/browser/webviewService.ts b/src/vs/workbench/contrib/webview/browser/webviewService.ts index 963a3a94091..688b513948d 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewService.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewService.ts @@ -12,7 +12,7 @@ import { DynamicWebviewEditorOverlay } from './dynamicWebviewEditorOverlay'; import { WebviewIconManager } from './webviewIconManager'; export class WebviewService implements IWebviewService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _webviewThemeDataProvider: WebviewThemeDataProvider; private readonly _iconManager: WebviewIconManager; diff --git a/src/vs/workbench/contrib/webview/browser/webviewWorkbenchService.ts b/src/vs/workbench/contrib/webview/browser/webviewWorkbenchService.ts index 0799044a049..dbad235b0fc 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewWorkbenchService.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewWorkbenchService.ts @@ -46,7 +46,7 @@ export function areWebviewInputOptionsEqual(a: WebviewInputOptions, b: WebviewIn } export interface IWebviewWorkbenchService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; createWebview( id: string, @@ -173,7 +173,7 @@ class RevivalPool { export class WebviewEditorService implements IWebviewWorkbenchService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _revivers = new Set(); private readonly _revivalPool = new RevivalPool(); diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewService.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewService.ts index 29c3781fc99..037ba636611 100644 --- a/src/vs/workbench/contrib/webview/electron-browser/webviewService.ts +++ b/src/vs/workbench/contrib/webview/electron-browser/webviewService.ts @@ -13,7 +13,7 @@ import { WebviewThemeDataProvider } from 'vs/workbench/contrib/webview/browser/t import { ElectronWebviewBasedWebview } from 'vs/workbench/contrib/webview/electron-browser/webviewElement'; export class ElectronWebviewService implements IWebviewService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _webviewThemeDataProvider: WebviewThemeDataProvider; private readonly _iconManager: WebviewIconManager; diff --git a/src/vs/workbench/services/accessibility/electron-browser/accessibilityService.ts b/src/vs/workbench/services/accessibility/electron-browser/accessibilityService.ts index 19d44947f6b..450c8c4abe7 100644 --- a/src/vs/workbench/services/accessibility/electron-browser/accessibilityService.ts +++ b/src/vs/workbench/services/accessibility/electron-browser/accessibilityService.ts @@ -27,7 +27,7 @@ type AccessibilityMetricsClassification = { export class NativeAccessibilityService extends AccessibilityService implements IAccessibilityService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private didSendTelemetry = false; diff --git a/src/vs/workbench/services/activity/common/activity.ts b/src/vs/workbench/services/activity/common/activity.ts index 88194501321..655f9949039 100644 --- a/src/vs/workbench/services/activity/common/activity.ts +++ b/src/vs/workbench/services/activity/common/activity.ts @@ -18,7 +18,7 @@ export const IActivityService = createDecorator('activityServi export interface IActivityService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Show activity for the given view container diff --git a/src/vs/workbench/services/activityBar/browser/activityBarService.ts b/src/vs/workbench/services/activityBar/browser/activityBarService.ts index dc76b07f76b..38fcc120b1a 100644 --- a/src/vs/workbench/services/activityBar/browser/activityBarService.ts +++ b/src/vs/workbench/services/activityBar/browser/activityBarService.ts @@ -10,7 +10,7 @@ import { IDisposable } from 'vs/base/common/lifecycle'; export const IActivityBarService = createDecorator('activityBarService'); export interface IActivityBarService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Show an activity in a viewlet. diff --git a/src/vs/workbench/services/authentication/browser/authenticationService.ts b/src/vs/workbench/services/authentication/browser/authenticationService.ts index 2f0995a9ed0..c43a7e7078e 100644 --- a/src/vs/workbench/services/authentication/browser/authenticationService.ts +++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts @@ -19,7 +19,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag export const IAuthenticationService = createDecorator('IAuthenticationService'); export interface IAuthenticationService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; isAuthenticationProviderRegistered(id: string): boolean; getProviderIds(): string[]; @@ -66,7 +66,7 @@ export interface SessionRequestInfo { } export class AuthenticationService extends Disposable implements IAuthenticationService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _placeholderMenuItem: IDisposable | undefined; private _noAccountsMenuItem: IDisposable | undefined; private _signInRequestItems = new Map(); diff --git a/src/vs/workbench/services/authentication/electron-browser/authenticationTokenService.ts b/src/vs/workbench/services/authentication/electron-browser/authenticationTokenService.ts index 0a90ba9ca43..d89fa3f6761 100644 --- a/src/vs/workbench/services/authentication/electron-browser/authenticationTokenService.ts +++ b/src/vs/workbench/services/authentication/electron-browser/authenticationTokenService.ts @@ -12,7 +12,7 @@ import { IAuthenticationTokenService, IUserDataSyncAuthToken } from 'vs/platform export class AuthenticationTokenService extends Disposable implements IAuthenticationTokenService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly channel: IChannel; diff --git a/src/vs/workbench/services/backup/common/backup.ts b/src/vs/workbench/services/backup/common/backup.ts index 087ccd70e7f..3637e0d4467 100644 --- a/src/vs/workbench/services/backup/common/backup.ts +++ b/src/vs/workbench/services/backup/common/backup.ts @@ -19,7 +19,7 @@ export interface IResolvedBackup { */ export interface IBackupFileService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Finds out if there are any backups stored. diff --git a/src/vs/workbench/services/backup/common/backupFileService.ts b/src/vs/workbench/services/backup/common/backupFileService.ts index 290ee51ff6e..71fcefaae3a 100644 --- a/src/vs/workbench/services/backup/common/backupFileService.ts +++ b/src/vs/workbench/services/backup/common/backupFileService.ts @@ -109,7 +109,7 @@ export class BackupFilesModel implements IBackupFilesModel { export class BackupFileService implements IBackupFileService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private impl: BackupFileServiceImpl | InMemoryBackupFileService; @@ -188,7 +188,7 @@ class BackupFileServiceImpl extends Disposable implements IBackupFileService { private static readonly PREAMBLE_META_SEPARATOR = ' '; // using a character that is know to be escaped in a URI as separator private static readonly PREAMBLE_MAX_LENGTH = 10000; - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private backupWorkspacePath!: URI; @@ -403,7 +403,7 @@ class BackupFileServiceImpl extends Disposable implements IBackupFileService { export class InMemoryBackupFileService implements IBackupFileService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private backups: Map = new Map(); diff --git a/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts b/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts index 4ce1058005b..658e728938a 100644 --- a/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts +++ b/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts @@ -377,7 +377,7 @@ class BulkEdit { export class BulkEditService implements IBulkEditService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _previewHandler?: IBulkEditPreviewHandler; diff --git a/src/vs/workbench/services/clipboard/electron-browser/clipboardService.ts b/src/vs/workbench/services/clipboard/electron-browser/clipboardService.ts index 8e19430639c..0a287339544 100644 --- a/src/vs/workbench/services/clipboard/electron-browser/clipboardService.ts +++ b/src/vs/workbench/services/clipboard/electron-browser/clipboardService.ts @@ -14,7 +14,7 @@ export class NativeClipboardService implements IClipboardService { private static readonly FILE_FORMAT = 'code/file-list'; // Clipboard format for files - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IElectronService private readonly electronService: IElectronService diff --git a/src/vs/workbench/services/commands/common/commandService.ts b/src/vs/workbench/services/commands/common/commandService.ts index 0b8653ad474..08efa010dbc 100644 --- a/src/vs/workbench/services/commands/common/commandService.ts +++ b/src/vs/workbench/services/commands/common/commandService.ts @@ -14,7 +14,7 @@ import { timeout } from 'vs/base/common/async'; export class CommandService extends Disposable implements ICommandService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _extensionHostIsReady: boolean = false; private _starActivation: Promise | null; diff --git a/src/vs/workbench/services/configuration/common/jsonEditing.ts b/src/vs/workbench/services/configuration/common/jsonEditing.ts index a5068c98c3a..8fbbbdcea1b 100644 --- a/src/vs/workbench/services/configuration/common/jsonEditing.ts +++ b/src/vs/workbench/services/configuration/common/jsonEditing.ts @@ -34,7 +34,7 @@ export interface IJSONValue { export interface IJSONEditingService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; write(resource: URI, values: IJSONValue[], save: boolean): Promise; } diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts index 33a6c5d05da..0bd4c9e6f2b 100644 --- a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts +++ b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts @@ -11,7 +11,7 @@ import { ConfigurationTarget } from 'vs/platform/configuration/common/configurat export const IConfigurationResolverService = createDecorator('configurationResolverService'); export interface IConfigurationResolverService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; resolve(folder: IWorkspaceFolder | undefined, value: string): string; resolve(folder: IWorkspaceFolder | undefined, value: string[]): string[]; diff --git a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts index c29a083e759..182a1dd85e8 100644 --- a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts +++ b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts @@ -30,7 +30,7 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe static readonly VARIABLE_REGEXP = /\$\{(.*?)\}/g; static readonly VARIABLE_REGEXP_SINGLE = /\$\{(.*?)\}/; - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _context: IVariableResolveContext; private _envVariables?: IProcessEnvironment; diff --git a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts index 9d1f709f55c..eeea87956ad 100644 --- a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts +++ b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts @@ -591,7 +591,7 @@ class MockCommandService implements ICommandService { } class MockQuickInputService implements IQuickInputService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; readonly onShow = Event.None; readonly onHide = Event.None; diff --git a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts b/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts index 7fbdad95cfd..18bd53217cd 100644 --- a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts +++ b/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts @@ -29,7 +29,7 @@ import { stripCodicons } from 'vs/base/common/codicons'; export class ContextMenuService extends Disposable implements IContextMenuService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; get onDidContextMenu(): Event { return this.impl.onDidContextMenu; } @@ -64,7 +64,7 @@ export class ContextMenuService extends Disposable implements IContextMenuServic class NativeContextMenuService extends Disposable implements IContextMenuService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _onDidContextMenu = this._register(new Emitter()); readonly onDidContextMenu: Event = this._onDidContextMenu.event; diff --git a/src/vs/workbench/services/credentials/browser/credentialsService.ts b/src/vs/workbench/services/credentials/browser/credentialsService.ts index d50c058d3aa..5d64ecf1d2f 100644 --- a/src/vs/workbench/services/credentials/browser/credentialsService.ts +++ b/src/vs/workbench/services/credentials/browser/credentialsService.ts @@ -20,7 +20,7 @@ export interface ICredentialsProvider { export class BrowserCredentialsService implements ICredentialsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private credentialsProvider: ICredentialsProvider; diff --git a/src/vs/workbench/services/credentials/common/credentials.ts b/src/vs/workbench/services/credentials/common/credentials.ts index 6fcb7dffaa0..2799abeed19 100644 --- a/src/vs/workbench/services/credentials/common/credentials.ts +++ b/src/vs/workbench/services/credentials/common/credentials.ts @@ -9,7 +9,7 @@ export const ICredentialsService = createDecorator('ICreden export interface ICredentialsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getPassword(service: string, account: string): Promise; setPassword(service: string, account: string, password: string): Promise; diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts index 325f4fd609f..301187f332b 100644 --- a/src/vs/workbench/services/decorations/browser/decorationsService.ts +++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts @@ -309,7 +309,7 @@ class DecorationProviderWrapper { export class DecorationsService implements IDecorationsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _data = new LinkedList(); private readonly _onDidChangeDecorationsDelayed = new Emitter(); diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts index a796069a8d7..4cf2dddfdfb 100644 --- a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts +++ b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts @@ -28,7 +28,7 @@ import { ILabelService } from 'vs/platform/label/common/label'; export abstract class AbstractFileDialogService implements IFileDialogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IHostService protected readonly hostService: IHostService, diff --git a/src/vs/workbench/services/dialogs/browser/dialogService.ts b/src/vs/workbench/services/dialogs/browser/dialogService.ts index 6b42535bff5..bf9a892d41e 100644 --- a/src/vs/workbench/services/dialogs/browser/dialogService.ts +++ b/src/vs/workbench/services/dialogs/browser/dialogService.ts @@ -22,7 +22,7 @@ import { fromNow } from 'vs/base/common/date'; export class DialogService implements IDialogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private allowableCommands = ['copy', 'cut']; diff --git a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts index 8229d42214b..e61b6019e1b 100644 --- a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts +++ b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts @@ -42,7 +42,7 @@ interface IMassagedMessageBoxOptions { export class DialogService implements IDialogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private nativeImpl: IDialogService; private customImpl: IDialogService; @@ -89,7 +89,7 @@ export class DialogService implements IDialogService { class NativeDialogService implements IDialogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @ILogService private readonly logService: ILogService, diff --git a/src/vs/workbench/services/dialogs/electron-browser/fileDialogService.ts b/src/vs/workbench/services/dialogs/electron-browser/fileDialogService.ts index 071dcc85732..0bd77555b7b 100644 --- a/src/vs/workbench/services/dialogs/electron-browser/fileDialogService.ts +++ b/src/vs/workbench/services/dialogs/electron-browser/fileDialogService.ts @@ -26,7 +26,7 @@ import { NativeSimpleFileDialog } from 'vs/workbench/services/dialogs/electron-b export class FileDialogService extends AbstractFileDialogService implements IFileDialogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IHostService hostService: IHostService, diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts index de8f55b9296..8c248dc860b 100644 --- a/src/vs/workbench/services/editor/browser/editorService.ts +++ b/src/vs/workbench/services/editor/browser/editorService.ts @@ -45,7 +45,7 @@ type OpenInEditorGroup = IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTI export class EditorService extends Disposable implements EditorServiceImpl { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; //#region events @@ -1275,7 +1275,7 @@ export interface IEditorOpenHandler { */ export class DelegatingEditorService implements IEditorService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( private editorOpenHandler: IEditorOpenHandler, diff --git a/src/vs/workbench/services/editor/common/editorGroupsService.ts b/src/vs/workbench/services/editor/common/editorGroupsService.ts index 3fa7ba24399..cb0b3746acb 100644 --- a/src/vs/workbench/services/editor/common/editorGroupsService.ts +++ b/src/vs/workbench/services/editor/common/editorGroupsService.ts @@ -140,7 +140,7 @@ export const enum GroupsOrder { export interface IEditorGroupsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * An event for when the active editor group changes. The active editor diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts index d0343f3b137..806c17fa943 100644 --- a/src/vs/workbench/services/editor/common/editorService.ts +++ b/src/vs/workbench/services/editor/common/editorService.ts @@ -87,7 +87,7 @@ export interface ICustomEditorViewTypesHandler { export interface IEditorService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Emitted when the currently active editor changes. diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts index 10603880404..b94b266326e 100644 --- a/src/vs/workbench/services/environment/browser/environmentService.ts +++ b/src/vs/workbench/services/environment/browser/environmentService.ts @@ -99,7 +99,7 @@ interface IExtensionHostDebugEnvironment { export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironmentService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _configuration: IEnvironmentConfiguration | undefined = undefined; get configuration(): IEnvironmentConfiguration { diff --git a/src/vs/workbench/services/environment/common/environmentService.ts b/src/vs/workbench/services/environment/common/environmentService.ts index bc19c3722ac..7d9a374ff8a 100644 --- a/src/vs/workbench/services/environment/common/environmentService.ts +++ b/src/vs/workbench/services/environment/common/environmentService.ts @@ -17,7 +17,7 @@ export interface IEnvironmentConfiguration extends IWindowConfiguration { export interface IWorkbenchEnvironmentService extends IEnvironmentService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly configuration: IEnvironmentConfiguration; diff --git a/src/vs/workbench/services/environment/electron-browser/environmentService.ts b/src/vs/workbench/services/environment/electron-browser/environmentService.ts index 4ec42129047..2d2e6f5294c 100644 --- a/src/vs/workbench/services/environment/electron-browser/environmentService.ts +++ b/src/vs/workbench/services/environment/electron-browser/environmentService.ts @@ -32,7 +32,7 @@ export interface INativeEnvironmentConfiguration extends IEnvironmentConfigurati export class NativeWorkbenchEnvironmentService extends EnvironmentService implements INativeWorkbenchEnvironmentService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; @memoize get webviewExternalEndpoint(): string { diff --git a/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts index cfac383e8af..3c7e6367fbf 100644 --- a/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts +++ b/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts @@ -23,7 +23,7 @@ const SOURCE = 'IWorkbenchExtensionEnablementService'; export class ExtensionEnablementService extends Disposable implements IWorkbenchExtensionEnablementService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onEnablementChanged = new Emitter(); public readonly onEnablementChanged: Event = this._onEnablementChanged.event; diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts index 48f5782881a..dd777bbb837 100644 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts @@ -20,7 +20,7 @@ export interface IExtensionManagementServer { } export interface IExtensionManagementServerService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly localExtensionManagementServer: IExtensionManagementServer | null; readonly remoteExtensionManagementServer: IExtensionManagementServer | null; getExtensionManagementServer(location: URI): IExtensionManagementServer | null; @@ -38,7 +38,7 @@ export const enum EnablementState { export const IWorkbenchExtensionEnablementService = createDecorator('extensionEnablementService'); export interface IWorkbenchExtensionEnablementService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly allUserExtensionsDisabled: boolean; @@ -115,7 +115,7 @@ export interface IExtensionRecommendationReson { export const IExtensionRecommendationsService = createDecorator('extensionRecommendationsService'); export interface IExtensionRecommendationsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getAllRecommendationsWithReason(): IStringDictionary; getFileBasedRecommendations(): IExtensionRecommendation[]; diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementServerService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementServerService.ts index 5507e35d911..33d26d231c6 100644 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagementServerService.ts +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementServerService.ts @@ -15,7 +15,7 @@ import { ILabelService } from 'vs/platform/label/common/label'; export class ExtensionManagementServerService implements IExtensionManagementServerService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; readonly localExtensionManagementServer: IExtensionManagementServer | null = null; readonly remoteExtensionManagementServer: IExtensionManagementServer | null = null; diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts index 87e4b959067..547e3985ae3 100644 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts @@ -22,7 +22,7 @@ import { IDownloadService } from 'vs/platform/download/common/download'; export class ExtensionManagementService extends Disposable implements IExtensionManagementService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; readonly onInstallExtension: Event; readonly onDidInstallExtension: Event; diff --git a/src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementServerService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementServerService.ts index 3401e3bde01..35d7b09b576 100644 --- a/src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementServerService.ts +++ b/src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementServerService.ts @@ -24,7 +24,7 @@ const localExtensionManagementServerAuthority: string = 'vscode-local'; export class ExtensionManagementServerService implements IExtensionManagementServerService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; readonly localExtensionManagementServer: IExtensionManagementServer; readonly remoteExtensionManagementServer: IExtensionManagementServer | null = null; diff --git a/src/vs/workbench/services/extensionResourceLoader/browser/extensionResourceLoaderService.ts b/src/vs/workbench/services/extensionResourceLoader/browser/extensionResourceLoaderService.ts index f2d816cca9e..be77f2563c6 100644 --- a/src/vs/workbench/services/extensionResourceLoader/browser/extensionResourceLoaderService.ts +++ b/src/vs/workbench/services/extensionResourceLoader/browser/extensionResourceLoaderService.ts @@ -12,7 +12,7 @@ import { Schemas } from 'vs/base/common/network'; class ExtensionResourceLoaderService implements IExtensionResourceLoaderService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IFileService private readonly _fileService: IFileService diff --git a/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts b/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts index 300a54b0842..0820d426cca 100644 --- a/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts +++ b/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts @@ -12,7 +12,7 @@ export const IExtensionResourceLoaderService = createDecorator = Event.None; onDidChangeExtensionsStatus: Event = Event.None; onDidChangeExtensions: Event = Event.None; diff --git a/src/vs/workbench/services/extensions/common/staticExtensions.ts b/src/vs/workbench/services/extensions/common/staticExtensions.ts index 2bce503265d..6de07f59264 100644 --- a/src/vs/workbench/services/extensions/common/staticExtensions.ts +++ b/src/vs/workbench/services/extensions/common/staticExtensions.ts @@ -11,13 +11,13 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/ export const IStaticExtensionsService = createDecorator('IStaticExtensionsService'); export interface IStaticExtensionsService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; getExtensions(): Promise; } export class StaticExtensionsService implements IStaticExtensionsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _descriptions: IExtensionDescription[] = []; diff --git a/src/vs/workbench/services/extensions/electron-browser/remoteExtensionManagementIpc.ts b/src/vs/workbench/services/extensions/electron-browser/remoteExtensionManagementIpc.ts index a4e21809eba..bd259935010 100644 --- a/src/vs/workbench/services/extensions/electron-browser/remoteExtensionManagementIpc.ts +++ b/src/vs/workbench/services/extensions/electron-browser/remoteExtensionManagementIpc.ts @@ -24,7 +24,7 @@ import { joinPath } from 'vs/base/common/resources'; export class RemoteExtensionManagementChannelClient extends ExtensionManagementChannelClient { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( channel: IChannel, diff --git a/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts b/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts index 79dd77aeb26..ae4b2d31222 100644 --- a/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts +++ b/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts @@ -299,7 +299,7 @@ export async function startExtensionHostProcess(): Promise { // host abstraction const hostUtils = new class NodeHost implements IHostUtils { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; exit(code: number) { nativeExit(code); } exists(path: string) { return exists(path); } realpath(path: string) { return realpath(path); } diff --git a/src/vs/workbench/services/extensions/worker/extensionHostWorker.ts b/src/vs/workbench/services/extensions/worker/extensionHostWorker.ts index 4afc0cdea9e..16ac7456118 100644 --- a/src/vs/workbench/services/extensions/worker/extensionHostWorker.ts +++ b/src/vs/workbench/services/extensions/worker/extensionHostWorker.ts @@ -36,7 +36,7 @@ self.addEventLister = () => console.trace(`'addEventListener' has been blocked`) //#endregion --- const hostUtil = new class implements IHostUtils { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; exit(_code?: number | undefined): void { nativeClose(); } diff --git a/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts b/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts index b40e932de44..1cc2b478326 100644 --- a/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts +++ b/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts @@ -35,7 +35,7 @@ export const IFilesConfigurationService = createDecorator('historyService' export interface IHistoryService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Re-opens the last closed editor if any. diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts index 5c79773a65b..28dfed02084 100644 --- a/src/vs/workbench/services/host/browser/browserHostService.ts +++ b/src/vs/workbench/services/host/browser/browserHostService.ts @@ -59,7 +59,7 @@ export interface IWorkspaceProvider { export class BrowserHostService extends Disposable implements IHostService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private workspaceProvider: IWorkspaceProvider; diff --git a/src/vs/workbench/services/host/browser/host.ts b/src/vs/workbench/services/host/browser/host.ts index ad10de5ba65..590778fa56e 100644 --- a/src/vs/workbench/services/host/browser/host.ts +++ b/src/vs/workbench/services/host/browser/host.ts @@ -11,7 +11,7 @@ export const IHostService = createDecorator('hostService'); export interface IHostService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; //#region Focus diff --git a/src/vs/workbench/services/host/electron-sandbox/desktopHostService.ts b/src/vs/workbench/services/host/electron-sandbox/desktopHostService.ts index c49a1d38043..ac98ee8f1fa 100644 --- a/src/vs/workbench/services/host/electron-sandbox/desktopHostService.ts +++ b/src/vs/workbench/services/host/electron-sandbox/desktopHostService.ts @@ -14,7 +14,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; export class DesktopHostService extends Disposable implements IHostService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IElectronService private readonly electronService: IElectronService, diff --git a/src/vs/workbench/services/integrity/browser/integrityService.ts b/src/vs/workbench/services/integrity/browser/integrityService.ts index 0d0e5681cef..a530266ecd6 100644 --- a/src/vs/workbench/services/integrity/browser/integrityService.ts +++ b/src/vs/workbench/services/integrity/browser/integrityService.ts @@ -8,7 +8,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; export class BrowserIntegrityServiceImpl implements IIntegrityService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; async isPure(): Promise { return { isPure: true, proof: [] }; diff --git a/src/vs/workbench/services/integrity/common/integrity.ts b/src/vs/workbench/services/integrity/common/integrity.ts index 07d34aef076..afbfde91166 100644 --- a/src/vs/workbench/services/integrity/common/integrity.ts +++ b/src/vs/workbench/services/integrity/common/integrity.ts @@ -21,7 +21,7 @@ export interface IntegrityTestResult { } export interface IIntegrityService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; isPure(): Promise; } diff --git a/src/vs/workbench/services/integrity/node/integrityService.ts b/src/vs/workbench/services/integrity/node/integrityService.ts index 8264febf337..fe0650b030f 100644 --- a/src/vs/workbench/services/integrity/node/integrityService.ts +++ b/src/vs/workbench/services/integrity/node/integrityService.ts @@ -56,7 +56,7 @@ class IntegrityStorage { export class IntegrityServiceImpl implements IIntegrityService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _storage: IntegrityStorage; private _isPurePromise: Promise; diff --git a/src/vs/workbench/services/issue/electron-sandbox/issueService.ts b/src/vs/workbench/services/issue/electron-sandbox/issueService.ts index 615f2704d51..a2e5a256559 100644 --- a/src/vs/workbench/services/issue/electron-sandbox/issueService.ts +++ b/src/vs/workbench/services/issue/electron-sandbox/issueService.ts @@ -10,7 +10,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; export class IssueService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(@IMainProcessService mainProcessService: IMainProcessService) { return createChannelSender(mainProcessService.getChannel('issue')); diff --git a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts index 57e202a9b12..3b789cbce4e 100644 --- a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts +++ b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts @@ -30,7 +30,7 @@ export const IKeybindingEditingService = createDecorator; diff --git a/src/vs/workbench/services/keybinding/common/keymapInfo.ts b/src/vs/workbench/services/keybinding/common/keymapInfo.ts index b521f80faa6..9eec852a2e9 100644 --- a/src/vs/workbench/services/keybinding/common/keymapInfo.ts +++ b/src/vs/workbench/services/keybinding/common/keymapInfo.ts @@ -94,7 +94,7 @@ export type IKeyboardLayoutInfo = (IWindowsKeyboardLayoutInfo | ILinuxKeyboardLa export const IKeymapService = createDecorator('keymapService'); export interface IKeymapService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; onDidChangeKeyboardMapper: Event; getKeyboardMapper(dispatchConfig: DispatchConfig): IKeyboardMapper; getCurrentKeyboardLayout(): IKeyboardLayoutInfo | null; diff --git a/src/vs/workbench/services/label/common/labelService.ts b/src/vs/workbench/services/label/common/labelService.ts index fc519874210..c7bc7cde475 100644 --- a/src/vs/workbench/services/label/common/labelService.ts +++ b/src/vs/workbench/services/label/common/labelService.ts @@ -92,7 +92,7 @@ Registry.as(WorkbenchExtensions.Workbench).regi export class LabelService extends Disposable implements ILabelService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private formatters: ResourceLabelFormatter[] = []; diff --git a/src/vs/workbench/services/layout/browser/layoutService.ts b/src/vs/workbench/services/layout/browser/layoutService.ts index 102bbd6225e..b1213ff2ce7 100644 --- a/src/vs/workbench/services/layout/browser/layoutService.ts +++ b/src/vs/workbench/services/layout/browser/layoutService.ts @@ -50,7 +50,7 @@ export function positionFromString(str: string): Position { export interface IWorkbenchLayoutService extends ILayoutService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Emits when the zen mode is enabled or disabled. diff --git a/src/vs/workbench/services/lifecycle/browser/lifecycleService.ts b/src/vs/workbench/services/lifecycle/browser/lifecycleService.ts index 0af8ebd5dd8..af642f25aee 100644 --- a/src/vs/workbench/services/lifecycle/browser/lifecycleService.ts +++ b/src/vs/workbench/services/lifecycle/browser/lifecycleService.ts @@ -11,7 +11,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; export class BrowserLifecycleService extends AbstractLifecycleService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @ILogService readonly logService: ILogService diff --git a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts b/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts index fd388e1a2e7..7071d3d1de0 100644 --- a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts +++ b/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts @@ -20,7 +20,7 @@ export class NativeLifecycleService extends AbstractLifecycleService { private static readonly LAST_SHUTDOWN_REASON_KEY = 'lifecyle.lastShutdownReason'; - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private shutdownReason: ShutdownReason | undefined; diff --git a/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts b/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts index d8cae2cf01b..44999bd842e 100644 --- a/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts +++ b/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts @@ -10,7 +10,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; export class LocalizationsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @ISharedProcessService sharedProcessService: ISharedProcessService, diff --git a/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts b/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts index 443e6b97e95..0b321336879 100644 --- a/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts +++ b/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts @@ -10,7 +10,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; export class MenubarService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(@IMainProcessService mainProcessService: IMainProcessService) { return createChannelSender(mainProcessService.getChannel('menubar')); diff --git a/src/vs/workbench/services/notification/common/notificationService.ts b/src/vs/workbench/services/notification/common/notificationService.ts index 9d86d1af265..b49ea4a665e 100644 --- a/src/vs/workbench/services/notification/common/notificationService.ts +++ b/src/vs/workbench/services/notification/common/notificationService.ts @@ -14,7 +14,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag export class NotificationService extends Disposable implements INotificationService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _model: INotificationsModel = this._register(new NotificationsModel()); get model(): INotificationsModel { return this._model; } diff --git a/src/vs/workbench/services/output/common/outputChannelModel.ts b/src/vs/workbench/services/output/common/outputChannelModel.ts index 2eade61f069..841f2d1e155 100644 --- a/src/vs/workbench/services/output/common/outputChannelModel.ts +++ b/src/vs/workbench/services/output/common/outputChannelModel.ts @@ -31,7 +31,7 @@ export interface IOutputChannelModel extends IDisposable { export const IOutputChannelModelService = createDecorator('outputChannelModelService'); export interface IOutputChannelModelService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; createOutputChannelModel(id: string, modelUri: URI, mimeType: string, file?: URI): IOutputChannelModel; diff --git a/src/vs/workbench/services/output/common/outputChannelModelService.ts b/src/vs/workbench/services/output/common/outputChannelModelService.ts index c7a9060afb3..4d9c36ad0fe 100644 --- a/src/vs/workbench/services/output/common/outputChannelModelService.ts +++ b/src/vs/workbench/services/output/common/outputChannelModelService.ts @@ -7,7 +7,7 @@ import { IOutputChannelModelService, AsbtractOutputChannelModelService } from 'v import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; export class OutputChannelModelService extends AsbtractOutputChannelModelService implements IOutputChannelModelService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; } registerSingleton(IOutputChannelModelService, OutputChannelModelService); diff --git a/src/vs/workbench/services/output/electron-browser/outputChannelModelService.ts b/src/vs/workbench/services/output/electron-browser/outputChannelModelService.ts index e94f6c963bd..17cb19f487c 100644 --- a/src/vs/workbench/services/output/electron-browser/outputChannelModelService.ts +++ b/src/vs/workbench/services/output/electron-browser/outputChannelModelService.ts @@ -200,7 +200,7 @@ class DelegatedOutputChannelModel extends Disposable implements IOutputChannelMo export class OutputChannelModelService extends AsbtractOutputChannelModelService implements IOutputChannelModelService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IInstantiationService instantiationService: IInstantiationService, diff --git a/src/vs/workbench/services/panel/common/panelService.ts b/src/vs/workbench/services/panel/common/panelService.ts index 3045900a7c0..b05bd7ba402 100644 --- a/src/vs/workbench/services/panel/common/panelService.ts +++ b/src/vs/workbench/services/panel/common/panelService.ts @@ -20,7 +20,7 @@ export interface IPanelIdentifier { export interface IPanelService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly onDidPanelOpen: Event<{ readonly panel: IPanel, readonly focus: boolean }>; readonly onDidPanelClose: Event; diff --git a/src/vs/workbench/services/path/common/pathService.ts b/src/vs/workbench/services/path/common/pathService.ts index d98f86fcc47..43a1262868e 100644 --- a/src/vs/workbench/services/path/common/pathService.ts +++ b/src/vs/workbench/services/path/common/pathService.ts @@ -18,7 +18,7 @@ export const IPathService = createDecorator('path'); */ export interface IPathService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * The correct path library to use for the target environment. If @@ -53,7 +53,7 @@ export interface IPathService { export abstract class AbstractPathService implements IPathService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private remoteOS: Promise; diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts index 6334bcafbf6..2242ba76b11 100644 --- a/src/vs/workbench/services/preferences/browser/preferencesService.ts +++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts @@ -46,7 +46,7 @@ const emptyEditableSettingsContent = '{\n}'; export class PreferencesService extends Disposable implements IPreferencesService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private lastOpenedSettingsInput: PreferencesEditorInput | null = null; diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts index f7795c59a86..23e50eef9f9 100644 --- a/src/vs/workbench/services/preferences/common/preferences.ts +++ b/src/vs/workbench/services/preferences/common/preferences.ts @@ -188,7 +188,7 @@ export interface IKeybindingsEditorModel extends IPreferencesEditorModel { export const IPreferencesService = createDecorator('preferencesService'); export interface IPreferencesService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; userSettingsResource: URI; workspaceSettingsResource: URI | null; diff --git a/src/vs/workbench/services/progress/browser/progressIndicator.ts b/src/vs/workbench/services/progress/browser/progressIndicator.ts index ebbfd5bc0e4..79ad961bd5a 100644 --- a/src/vs/workbench/services/progress/browser/progressIndicator.ts +++ b/src/vs/workbench/services/progress/browser/progressIndicator.ts @@ -61,7 +61,7 @@ export class ProgressBarIndicator extends Disposable implements IProgressIndicat export class EditorProgressIndicator extends ProgressBarIndicator { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(progressBar: ProgressBar, private readonly group: IEditorGroupView) { super(progressBar); diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts index d497332e2ff..1f2408b5ca1 100644 --- a/src/vs/workbench/services/progress/browser/progressService.ts +++ b/src/vs/workbench/services/progress/browser/progressService.ts @@ -29,7 +29,7 @@ import { IViewsService, IViewDescriptorService, ViewContainerLocation } from 'vs export class ProgressService extends Disposable implements IProgressService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IActivityService private readonly activityService: IActivityService, diff --git a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts index bf8e93ea187..75ec3d38b48 100644 --- a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts +++ b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts @@ -25,7 +25,7 @@ import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry'; export abstract class AbstractRemoteAgentService extends Disposable { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _environment: Promise | null; diff --git a/src/vs/workbench/services/remote/common/remoteAgentService.ts b/src/vs/workbench/services/remote/common/remoteAgentService.ts index 00bb6001ad2..eeb1cc69c67 100644 --- a/src/vs/workbench/services/remote/common/remoteAgentService.ts +++ b/src/vs/workbench/services/remote/common/remoteAgentService.ts @@ -16,7 +16,7 @@ export const RemoteExtensionLogFileName = 'remoteagent'; export const IRemoteAgentService = createDecorator('remoteAgentService'); export interface IRemoteAgentService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly socketFactory: ISocketFactory; diff --git a/src/vs/workbench/services/remote/common/remoteExplorerService.ts b/src/vs/workbench/services/remote/common/remoteExplorerService.ts index 893c7ad1cc6..3227a9aff67 100644 --- a/src/vs/workbench/services/remote/common/remoteExplorerService.ts +++ b/src/vs/workbench/services/remote/common/remoteExplorerService.ts @@ -224,7 +224,7 @@ export class TunnelModel extends Disposable { } export interface IRemoteExplorerService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; onDidChangeTargetType: Event; targetType: string[]; readonly tunnelModel: TunnelModel; diff --git a/src/vs/workbench/services/remote/common/tunnelService.ts b/src/vs/workbench/services/remote/common/tunnelService.ts index a7f8a98cc41..1e725fed9d3 100644 --- a/src/vs/workbench/services/remote/common/tunnelService.ts +++ b/src/vs/workbench/services/remote/common/tunnelService.ts @@ -10,7 +10,7 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/ import { ILogService } from 'vs/platform/log/common/log'; export abstract class AbstractTunnelService implements ITunnelService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _onTunnelOpened: Emitter = new Emitter(); public onTunnelOpened: Event = this._onTunnelOpened.event; diff --git a/src/vs/workbench/services/search/common/search.ts b/src/vs/workbench/services/search/common/search.ts index a6cc75f0a6d..5a10286824d 100644 --- a/src/vs/workbench/services/search/common/search.ts +++ b/src/vs/workbench/services/search/common/search.ts @@ -31,7 +31,7 @@ export const ISearchService = createDecorator('searchService'); * A service that enables to search for files or with in files. */ export interface ISearchService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; textSearch(query: ITextQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): Promise; fileSearch(query: IFileQuery, token?: CancellationToken): Promise; clearCache(cacheKey: string): Promise; diff --git a/src/vs/workbench/services/search/common/searchService.ts b/src/vs/workbench/services/search/common/searchService.ts index cec7149d6fe..0f3d8e2094c 100644 --- a/src/vs/workbench/services/search/common/searchService.ts +++ b/src/vs/workbench/services/search/common/searchService.ts @@ -24,7 +24,7 @@ import { DeferredPromise } from 'vs/base/test/common/utils'; export class SearchService extends Disposable implements ISearchService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; protected diskSearch: ISearchResultProvider | null = null; private readonly fileSearchProviders = new Map(); diff --git a/src/vs/workbench/services/sharedProcess/electron-browser/sharedProcessService.ts b/src/vs/workbench/services/sharedProcess/electron-browser/sharedProcessService.ts index 5e60aa284ec..2fb053da89a 100644 --- a/src/vs/workbench/services/sharedProcess/electron-browser/sharedProcessService.ts +++ b/src/vs/workbench/services/sharedProcess/electron-browser/sharedProcessService.ts @@ -15,7 +15,7 @@ import { IElectronService } from 'vs/platform/electron/electron-sandbox/electron export class SharedProcessService implements ISharedProcessService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private withSharedProcessConnection: Promise>; private sharedProcessMainChannel: IChannel; diff --git a/src/vs/workbench/services/statusbar/common/statusbar.ts b/src/vs/workbench/services/statusbar/common/statusbar.ts index af13535d622..018a049fa47 100644 --- a/src/vs/workbench/services/statusbar/common/statusbar.ts +++ b/src/vs/workbench/services/statusbar/common/statusbar.ts @@ -61,7 +61,7 @@ export interface IStatusbarEntry { export interface IStatusbarService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Adds an entry to the statusbar with the given alignment and priority. Use the returned accessor diff --git a/src/vs/workbench/services/telemetry/browser/telemetryService.ts b/src/vs/workbench/services/telemetry/browser/telemetryService.ts index cc2ff39fd7e..dd6ed7685bf 100644 --- a/src/vs/workbench/services/telemetry/browser/telemetryService.ts +++ b/src/vs/workbench/services/telemetry/browser/telemetryService.ts @@ -33,7 +33,7 @@ export class WebTelemetryAppender implements ITelemetryAppender { export class TelemetryService extends Disposable implements ITelemetryService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private impl: ITelemetryService; public readonly sendErrorTelemetry = false; diff --git a/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts b/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts index 49723322e91..2b32c4425df 100644 --- a/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts +++ b/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts @@ -21,7 +21,7 @@ import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/enviro export class TelemetryService extends Disposable implements ITelemetryService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private impl: ITelemetryService; public readonly sendErrorTelemetry: boolean; diff --git a/src/vs/workbench/services/textMate/common/textMateService.ts b/src/vs/workbench/services/textMate/common/textMateService.ts index 2cdaac115d5..fdfc21e5b88 100644 --- a/src/vs/workbench/services/textMate/common/textMateService.ts +++ b/src/vs/workbench/services/textMate/common/textMateService.ts @@ -10,7 +10,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' export const ITextMateService = createDecorator('textMateService'); export interface ITextMateService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; onDidEncounterLanguage: Event; diff --git a/src/vs/workbench/services/textfile/browser/textFileService.ts b/src/vs/workbench/services/textfile/browser/textFileService.ts index 1c1ecf1c1b3..72b4cc8634e 100644 --- a/src/vs/workbench/services/textfile/browser/textFileService.ts +++ b/src/vs/workbench/services/textfile/browser/textFileService.ts @@ -41,7 +41,7 @@ import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/ur */ export abstract class AbstractTextFileService extends Disposable implements ITextFileService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; //#region events diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts index 99154e4353a..8b7fe715d51 100644 --- a/src/vs/workbench/services/textfile/common/textfiles.ts +++ b/src/vs/workbench/services/textfile/common/textfiles.ts @@ -27,7 +27,7 @@ export interface TextFileCreateEvent extends IWaitUntil { export interface ITextFileService extends IDisposable { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Access to the manager of text file editor models providing further diff --git a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts index 9181a03692f..5efc5868c47 100644 --- a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts +++ b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts @@ -163,7 +163,7 @@ class ResourceModelCollection extends ReferenceCollection; getColorTheme(): IWorkbenchColorTheme; getColorThemes(): Promise; diff --git a/src/vs/workbench/services/timer/electron-browser/timerService.ts b/src/vs/workbench/services/timer/electron-browser/timerService.ts index 18e9ad060dc..f9b460031ac 100644 --- a/src/vs/workbench/services/timer/electron-browser/timerService.ts +++ b/src/vs/workbench/services/timer/electron-browser/timerService.ts @@ -292,13 +292,13 @@ export interface IStartupMetrics { } export interface ITimerService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly startupMetrics: Promise; } class TimerService implements ITimerService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _startupMetrics?: Promise; diff --git a/src/vs/workbench/services/title/common/titleService.ts b/src/vs/workbench/services/title/common/titleService.ts index bb59fe05651..74ce02b4566 100644 --- a/src/vs/workbench/services/title/common/titleService.ts +++ b/src/vs/workbench/services/title/common/titleService.ts @@ -16,7 +16,7 @@ export interface ITitleProperties { export interface ITitleService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * An event when the menubar visibility changes. diff --git a/src/vs/workbench/services/untitled/common/untitledTextEditorService.ts b/src/vs/workbench/services/untitled/common/untitledTextEditorService.ts index 5c91d4512b6..8d8fa3ad013 100644 --- a/src/vs/workbench/services/untitled/common/untitledTextEditorService.ts +++ b/src/vs/workbench/services/untitled/common/untitledTextEditorService.ts @@ -110,12 +110,12 @@ export interface IUntitledTextEditorModelManager { export interface IUntitledTextEditorService extends IUntitledTextEditorModelManager { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; } export class UntitledTextEditorService extends Disposable implements IUntitledTextEditorService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidChangeDirty = this._register(new Emitter()); readonly onDidChangeDirty = this._onDidChangeDirty.event; diff --git a/src/vs/workbench/services/update/browser/updateService.ts b/src/vs/workbench/services/update/browser/updateService.ts index 155fb7fc720..83064efac07 100644 --- a/src/vs/workbench/services/update/browser/updateService.ts +++ b/src/vs/workbench/services/update/browser/updateService.ts @@ -26,7 +26,7 @@ export interface IUpdateProvider { export class BrowserUpdateService extends Disposable implements IUpdateService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _onStateChange = this._register(new Emitter()); readonly onStateChange: Event = this._onStateChange.event; diff --git a/src/vs/workbench/services/update/electron-sandbox/updateService.ts b/src/vs/workbench/services/update/electron-sandbox/updateService.ts index fd815a792f5..b3b4d686ad9 100644 --- a/src/vs/workbench/services/update/electron-sandbox/updateService.ts +++ b/src/vs/workbench/services/update/electron-sandbox/updateService.ts @@ -11,7 +11,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; export class NativeUpdateService implements IUpdateService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onStateChange = new Emitter(); readonly onStateChange: Event = this._onStateChange.event; diff --git a/src/vs/workbench/services/uriIdentity/common/uriIdentity.ts b/src/vs/workbench/services/uriIdentity/common/uriIdentity.ts index 15a2147dd3e..9c09b8184ba 100644 --- a/src/vs/workbench/services/uriIdentity/common/uriIdentity.ts +++ b/src/vs/workbench/services/uriIdentity/common/uriIdentity.ts @@ -16,7 +16,7 @@ export const IUriIdentityService = createDecorator('IUriIde export interface IUriIdentityService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; /** * Uri extensions that are aware of casing. diff --git a/src/vs/workbench/services/uriIdentity/common/uriIdentityService.ts b/src/vs/workbench/services/uriIdentity/common/uriIdentityService.ts index f5b658992c7..3e53e041cc5 100644 --- a/src/vs/workbench/services/uriIdentity/common/uriIdentityService.ts +++ b/src/vs/workbench/services/uriIdentity/common/uriIdentityService.ts @@ -22,7 +22,7 @@ class Entry { export class UriIdentityService implements IUriIdentityService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; readonly extUri: IExtUri; diff --git a/src/vs/workbench/services/url/browser/urlService.ts b/src/vs/workbench/services/url/browser/urlService.ts index eef5070c450..120ad6973ea 100644 --- a/src/vs/workbench/services/url/browser/urlService.ts +++ b/src/vs/workbench/services/url/browser/urlService.ts @@ -38,7 +38,7 @@ export interface IURLCallbackProvider { export class BrowserURLService extends AbstractURLService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private provider: IURLCallbackProvider | undefined; diff --git a/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts b/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts index 0fbeb2a56c8..76f7d254f05 100644 --- a/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts +++ b/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts @@ -14,7 +14,7 @@ import { ITextResourcePropertiesService, ITextResourceConfigurationService } fro class UserDataSyncUtilService implements IUserDataSyncUtilService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IKeybindingService private readonly keybindingsService: IKeybindingService, diff --git a/src/vs/workbench/services/userDataSync/electron-browser/userDataSyncMachinesService.ts b/src/vs/workbench/services/userDataSync/electron-browser/userDataSyncMachinesService.ts index 4b24c46929a..8b4a79d54ff 100644 --- a/src/vs/workbench/services/userDataSync/electron-browser/userDataSyncMachinesService.ts +++ b/src/vs/workbench/services/userDataSync/electron-browser/userDataSyncMachinesService.ts @@ -11,7 +11,7 @@ import { IUserDataSyncMachinesService, IUserDataSyncMachine } from 'vs/platform/ class UserDataSyncMachinesService extends Disposable implements IUserDataSyncMachinesService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly channel: IChannel; diff --git a/src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts b/src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts index 283000480f8..805fe71574d 100644 --- a/src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts +++ b/src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts @@ -14,7 +14,7 @@ import { URI } from 'vs/base/common/uri'; export class UserDataSyncService extends Disposable implements IUserDataSyncService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly channel: IChannel; diff --git a/src/vs/workbench/services/viewlet/browser/viewlet.ts b/src/vs/workbench/services/viewlet/browser/viewlet.ts index ab12dcde4cc..d227b1ae5a0 100644 --- a/src/vs/workbench/services/viewlet/browser/viewlet.ts +++ b/src/vs/workbench/services/viewlet/browser/viewlet.ts @@ -13,7 +13,7 @@ export const IViewletService = createDecorator('viewletService' export interface IViewletService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; readonly onDidViewletRegister: Event; readonly onDidViewletDeregister: Event; diff --git a/src/vs/workbench/services/views/browser/viewDescriptorService.ts b/src/vs/workbench/services/views/browser/viewDescriptorService.ts index 2ad2a87523c..e7fc63f44bd 100644 --- a/src/vs/workbench/services/views/browser/viewDescriptorService.ts +++ b/src/vs/workbench/services/views/browser/viewDescriptorService.ts @@ -27,7 +27,7 @@ interface ICachedViewContainerInfo { export class ViewDescriptorService extends Disposable implements IViewDescriptorService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private static readonly CACHED_VIEW_POSITIONS = 'views.cachedViewPositions'; private static readonly CACHED_VIEW_CONTAINER_LOCATIONS = 'views.cachedViewContainerLocations'; diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts b/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts index 40392b684db..6f5586492b7 100644 --- a/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts +++ b/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts @@ -73,7 +73,7 @@ type WorkingCopyProvider = (resourceOrFolder: URI) => IWorkingCopy[]; */ export interface IWorkingCopyFileService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; //#region Events @@ -169,7 +169,7 @@ export interface IWorkingCopyFileService { export class WorkingCopyFileService extends Disposable implements IWorkingCopyFileService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; //#region Events diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyService.ts b/src/vs/workbench/services/workingCopy/common/workingCopyService.ts index 825f8e9f584..ba56c701fec 100644 --- a/src/vs/workbench/services/workingCopy/common/workingCopyService.ts +++ b/src/vs/workbench/services/workingCopy/common/workingCopyService.ts @@ -117,7 +117,7 @@ export const IWorkingCopyService = createDecorator('working export interface IWorkingCopyService { - _serviceBrand: undefined; + readonly _serviceBrand: undefined; //#region Events @@ -163,7 +163,7 @@ export interface IWorkingCopyService { export class WorkingCopyService extends Disposable implements IWorkingCopyService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; //#region Events diff --git a/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts b/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts index c26ceb99b95..b745c710edb 100644 --- a/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts +++ b/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts @@ -27,7 +27,7 @@ import { Schemas } from 'vs/base/common/network'; export abstract class AbstractWorkspaceEditingService implements IWorkspaceEditingService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IJSONEditingService private readonly jsonEditingService: IJSONEditingService, diff --git a/src/vs/workbench/services/workspaces/browser/workspaceEditingService.ts b/src/vs/workbench/services/workspaces/browser/workspaceEditingService.ts index b1a2011c60e..3436b872342 100644 --- a/src/vs/workbench/services/workspaces/browser/workspaceEditingService.ts +++ b/src/vs/workbench/services/workspaces/browser/workspaceEditingService.ts @@ -22,7 +22,7 @@ import { URI } from 'vs/base/common/uri'; export class BrowserWorkspaceEditingService extends AbstractWorkspaceEditingService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IJSONEditingService jsonEditingService: IJSONEditingService, diff --git a/src/vs/workbench/services/workspaces/browser/workspacesService.ts b/src/vs/workbench/services/workspaces/browser/workspacesService.ts index 7bbd6581909..faf2abf6388 100644 --- a/src/vs/workbench/services/workspaces/browser/workspacesService.ts +++ b/src/vs/workbench/services/workspaces/browser/workspacesService.ts @@ -22,7 +22,7 @@ export class BrowserWorkspacesService extends Disposable implements IWorkspacesS static readonly RECENTLY_OPENED_KEY = 'recently.opened'; - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onRecentlyOpenedChange = this._register(new Emitter()); readonly onRecentlyOpenedChange = this._onRecentlyOpenedChange.event; diff --git a/src/vs/workbench/services/workspaces/common/workspaceEditing.ts b/src/vs/workbench/services/workspaces/common/workspaceEditing.ts index 6bf3b4019e1..400fdac1944 100644 --- a/src/vs/workbench/services/workspaces/common/workspaceEditing.ts +++ b/src/vs/workbench/services/workspaces/common/workspaceEditing.ts @@ -11,7 +11,7 @@ export const IWorkspaceEditingService = createDecorator void) { } diff --git a/src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts b/src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts index 4f4ba509d9a..48b2da2c996 100644 --- a/src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts +++ b/src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts @@ -82,7 +82,7 @@ suite('MainThreadDocumentsAndEditors', () => { editorGroupService, null!, new class extends mock() implements IPanelService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; onDidPanelOpen = Event.None; onDidPanelClose = Event.None; getActivePanel() { diff --git a/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts index 82f64e955f8..306c6662332 100644 --- a/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts +++ b/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts @@ -133,7 +133,7 @@ suite('MainThreadEditors', () => { }); services.set(IPanelService, new class extends mock() implements IPanelService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; onDidPanelOpen = Event.None; onDidPanelClose = Event.None; getActivePanel() { diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts index 85c72911cf8..2e951924bb6 100644 --- a/src/vs/workbench/test/browser/workbenchTestServices.ts +++ b/src/vs/workbench/test/browser/workbenchTestServices.ts @@ -281,7 +281,7 @@ export const TestEnvironmentService = new TestEnvironmentServiceWithArgs(Object. export class TestProgressService implements IProgressService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; withProgress( options: IProgressOptions | IProgressWindowOptions | IProgressNotificationOptions | IProgressCompositeOptions, @@ -294,7 +294,7 @@ export class TestProgressService implements IProgressService { export class TestAccessibilityService implements IAccessibilityService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; onDidChangeScreenReaderOptimized = Event.None; @@ -306,7 +306,7 @@ export class TestAccessibilityService implements IAccessibilityService { export class TestDecorationsService implements IDecorationsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; onDidChangeDecorations: Event = Event.None; @@ -316,7 +316,7 @@ export class TestDecorationsService implements IDecorationsService { export class TestMenuService implements IMenuService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; createMenu(_id: MenuId, _scopedKeybindingService: IContextKeyService): IMenu { return { @@ -329,7 +329,7 @@ export class TestMenuService implements IMenuService { export class TestHistoryService implements IHistoryService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private root?: URI) { } @@ -350,7 +350,7 @@ export class TestHistoryService implements IHistoryService { export class TestFileDialogService implements IFileDialogService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private confirmResult!: ConfirmResult; @@ -375,7 +375,7 @@ export class TestFileDialogService implements IFileDialogService { export class TestLayoutService implements IWorkbenchLayoutService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; openedDefaultEditors = false; @@ -435,7 +435,7 @@ export class TestLayoutService implements IWorkbenchLayoutService { let activeViewlet: Viewlet = {} as any; export class TestViewletService implements IViewletService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; onDidViewletRegisterEmitter = new Emitter(); onDidViewletDeregisterEmitter = new Emitter(); @@ -460,7 +460,7 @@ export class TestViewletService implements IViewletService { } export class TestPanelService implements IPanelService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; onDidPanelOpen = new Emitter<{ panel: IPanel, focus: boolean }>().event; onDidPanelClose = new Emitter().event; @@ -479,7 +479,7 @@ export class TestPanelService implements IPanelService { } export class TestViewsService implements IViewsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; onDidChangeViewContainerVisibility = new Emitter<{ id: string; visible: boolean; location: ViewContainerLocation }>().event; @@ -499,7 +499,7 @@ export class TestViewsService implements IViewsService { export class TestEditorGroupsService implements IEditorGroupsService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(public groups: TestEditorGroupView[] = []) { } @@ -630,7 +630,7 @@ export class TestEditorGroupAccessor implements IEditorGroupsAccessor { export class TestEditorService implements EditorServiceImpl { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; onDidActiveEditorChange: Event = Event.None; onDidVisibleEditorsChange: Event = Event.None; @@ -690,7 +690,7 @@ export class TestEditorService implements EditorServiceImpl { export class TestFileService implements IFileService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private readonly _onDidFilesChange = new Emitter(); private readonly _onDidRunOperation = new Emitter(); @@ -840,7 +840,7 @@ export class TestFileService implements IFileService { } export class TestBackupFileService implements IBackupFileService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; hasBackups(): Promise { return Promise.resolve(false); } hasBackup(_resource: URI): Promise { return Promise.resolve(false); } @@ -862,7 +862,7 @@ export class TestBackupFileService implements IBackupFileService { export class TestLifecycleService implements ILifecycleService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; phase!: LifecyclePhase; startupKind!: StartupKind; @@ -890,7 +890,7 @@ export class TestLifecycleService implements ILifecycleService { export class TestTextResourceConfigurationService implements ITextResourceConfigurationService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private configurationService = new TestConfigurationService()) { } @@ -947,7 +947,7 @@ export const productService: IProductService = { _serviceBrand: undefined, ...pr export class TestHostService implements IHostService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private _hasFocus = true; get hasFocus() { return this._hasFocus; } @@ -1132,7 +1132,7 @@ export class TestEditorPart extends EditorPart { } export class TestListService implements IListService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; lastFocusedList: any | undefined = undefined; @@ -1143,7 +1143,7 @@ export class TestListService implements IListService { export class TestPathService implements IPathService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(private readonly fallbackUserHome: URI = URI.from({ scheme: Schemas.vscodeRemote, path: '/' })) { } diff --git a/src/vs/workbench/test/common/workbenchTestServices.ts b/src/vs/workbench/test/common/workbenchTestServices.ts index 8c9574d17be..5ec62b286e5 100644 --- a/src/vs/workbench/test/common/workbenchTestServices.ts +++ b/src/vs/workbench/test/common/workbenchTestServices.ts @@ -22,7 +22,7 @@ import { FileOperation, IFileStatWithMetadata } from 'vs/platform/files/common/f export class TestTextResourcePropertiesService implements ITextResourcePropertiesService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor( @IConfigurationService private readonly configurationService: IConfigurationService, @@ -40,7 +40,7 @@ export class TestTextResourcePropertiesService implements ITextResourcePropertie export class TestContextService implements IWorkspaceContextService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; private workspace: Workspace; private options: object; @@ -126,7 +126,7 @@ export class TestWorkingCopyService extends WorkingCopyService { } export class TestWorkingCopyFileService implements IWorkingCopyFileService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; onWillRunWorkingCopyFileOperation: Event = Event.None; onDidFailWorkingCopyFileOperation: Event = Event.None; diff --git a/src/vs/workbench/test/electron-browser/workbenchTestServices.ts b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts index 75b4eb33ae2..a080fba7091 100644 --- a/src/vs/workbench/test/electron-browser/workbenchTestServices.ts +++ b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts @@ -152,7 +152,7 @@ class TestEncodingOracle extends EncodingOracle { export class TestSharedProcessService implements ISharedProcessService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; getChannel(channelName: string): any { return undefined; } @@ -164,7 +164,7 @@ export class TestSharedProcessService implements ISharedProcessService { export class TestElectronService implements IElectronService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; readonly windowId = -1; @@ -260,7 +260,7 @@ export class TestServiceAccessor { export class TestNativePathService extends TestPathService { - _serviceBrand: undefined; + declare readonly _serviceBrand: undefined; constructor(@IWorkbenchEnvironmentService environmentService: INativeWorkbenchEnvironmentService) { super(environmentService.userHome);