diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts index ffef9180cc64ae484eabc4da37fd71af92052d74..413a256483fbe5d8b000a8ac5ca234f848a60ccc 100644 --- a/src/vs/base/browser/ui/actionbar/actionbar.ts +++ b/src/vs/base/browser/ui/actionbar/actionbar.ts @@ -405,16 +405,16 @@ export class ActionBar extends Disposable implements IActionRunner { protected actionsList: HTMLElement; private _onDidBlur = this._register(new Emitter()); - get onDidBlur(): Event { return this._onDidBlur.event; } + readonly onDidBlur: Event = this._onDidBlur.event; private _onDidCancel = this._register(new Emitter()); - get onDidCancel(): Event { return this._onDidCancel.event; } + readonly onDidCancel: Event = this._onDidCancel.event; private _onDidRun = this._register(new Emitter()); - get onDidRun(): Event { return this._onDidRun.event; } + readonly onDidRun: Event = this._onDidRun.event; private _onDidBeforeRun = this._register(new Emitter()); - get onDidBeforeRun(): Event { return this._onDidBeforeRun.event; } + readonly onDidBeforeRun: Event = this._onDidBeforeRun.event; constructor(container: HTMLElement, options: IActionBarOptions = defaultOptions) { super(); diff --git a/src/vs/base/browser/ui/checkbox/checkbox.ts b/src/vs/base/browser/ui/checkbox/checkbox.ts index 21580062e5b849053364792cc39a91ea31e2fadd..40dcdfbb9ab30fe4785487faf41ebc04c7d40691 100644 --- a/src/vs/base/browser/ui/checkbox/checkbox.ts +++ b/src/vs/base/browser/ui/checkbox/checkbox.ts @@ -72,10 +72,10 @@ export class CheckboxActionViewItem extends BaseActionViewItem { export class Checkbox extends Widget { private readonly _onChange = this._register(new Emitter()); - get onChange(): Event { return this._onChange.event; } + readonly onChange: Event = this._onChange.event; private readonly _onKeyDown = this._register(new Emitter()); - get onKeyDown(): Event { return this._onKeyDown.event; } + readonly onKeyDown: Event = this._onKeyDown.event; private readonly _opts: ICheckboxOpts; readonly domNode: HTMLElement; diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts index 7e4aa5fb5b467b079c78a9bccab6beb4e20745a1..08728828e580ea050d74bf285bd0be7d93094279 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -111,7 +111,7 @@ class Trait implements ISpliceable, IDisposable { private sortedIndexes: number[] = []; private _onChange = new Emitter(); - get onChange(): Event { return this._onChange.event; } + readonly onChange: Event = this._onChange.event; get trait(): string { return this._trait; } @@ -1165,7 +1165,7 @@ export class List implements ISpliceable, IDisposable { readonly onDidBlur: Event; private _onDidDispose = new Emitter(); - get onDidDispose(): Event { return this._onDidDispose.event; } + readonly onDidDispose: Event = this._onDidDispose.event; constructor( container: HTMLElement, diff --git a/src/vs/base/parts/storage/common/storage.ts b/src/vs/base/parts/storage/common/storage.ts index 3f3892a8e1930935877372e650aaed4118b186f9..03dedeca57f45615bccbc52e64627d9a47a29f1a 100644 --- a/src/vs/base/parts/storage/common/storage.ts +++ b/src/vs/base/parts/storage/common/storage.ts @@ -74,7 +74,7 @@ export class Storage extends Disposable implements IStorage { private static readonly DEFAULT_FLUSH_DELAY = 100; private readonly _onDidChangeStorage: Emitter = this._register(new Emitter()); - get onDidChangeStorage(): Event { return this._onDidChangeStorage.event; } + readonly onDidChangeStorage: Event = this._onDidChangeStorage.event; private state = StorageState.None; diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts index 6852c0c727e75b2aa32851ccd2a9be7fdcab0b19..2042f576d556267062877b9197ef64750df8cae0 100644 --- a/src/vs/base/parts/tree/browser/treeView.ts +++ b/src/vs/base/parts/tree/browser/treeView.ts @@ -447,13 +447,13 @@ export class TreeView extends HeightMap { private onHiddenScrollTop: number | null = null; private readonly _onDOMFocus = new Emitter(); - get onDOMFocus(): Event { return this._onDOMFocus.event; } + readonly onDOMFocus: Event = this._onDOMFocus.event; private readonly _onDOMBlur = new Emitter(); - get onDOMBlur(): Event { return this._onDOMBlur.event; } + readonly onDOMBlur: Event = this._onDOMBlur.event; private readonly _onDidScroll = new Emitter(); - get onDidScroll(): Event { return this._onDidScroll.event; } + readonly onDidScroll: Event = this._onDidScroll.event; constructor(context: _.ITreeContext, container: HTMLElement) { super(); diff --git a/src/vs/editor/contrib/find/findState.ts b/src/vs/editor/contrib/find/findState.ts index 0af1b84cd30eb969c6f0eda8cb76e9031b7fd15b..96f1078f1301e8f7e4e29e369104e6690e01a342 100644 --- a/src/vs/editor/contrib/find/findState.ts +++ b/src/vs/editor/contrib/find/findState.ts @@ -69,7 +69,7 @@ export class FindReplaceState implements IDisposable { private _matchesPosition: number; private _matchesCount: number; private _currentMatch: Range | null; - private readonly _onFindReplaceStateChange: Emitter; + private readonly _onFindReplaceStateChange = new Emitter(); public get searchString(): string { return this._searchString; } public get replaceString(): string { return this._replaceString; } @@ -87,7 +87,7 @@ export class FindReplaceState implements IDisposable { public get matchesPosition(): number { return this._matchesPosition; } public get matchesCount(): number { return this._matchesCount; } public get currentMatch(): Range | null { return this._currentMatch; } - public get onFindReplaceStateChange(): Event { return this._onFindReplaceStateChange.event; } + public readonly onFindReplaceStateChange: Event = this._onFindReplaceStateChange.event; constructor() { this._searchString = ''; @@ -104,7 +104,6 @@ export class FindReplaceState implements IDisposable { this._matchesPosition = 0; this._matchesCount = 0; this._currentMatch = null; - this._onFindReplaceStateChange = new Emitter(); } public dispose(): void { diff --git a/src/vs/editor/contrib/folding/foldingModel.ts b/src/vs/editor/contrib/folding/foldingModel.ts index 70906b653eb4391486c09a6cc0480dbdfd0f3b65..e81b529d0610e4cb6898150881f0efaa87b83648 100644 --- a/src/vs/editor/contrib/folding/foldingModel.ts +++ b/src/vs/editor/contrib/folding/foldingModel.ts @@ -29,9 +29,9 @@ export class FoldingModel { private _isInitialized: boolean; private _updateEventEmitter = new Emitter(); + public readonly onDidChange: Event = this._updateEventEmitter.event; public get regions(): FoldingRegions { return this._regions; } - public get onDidChange(): Event { return this._updateEventEmitter.event; } public get textModel() { return this._textModel; } public get isInitialized() { return this._isInitialized; } diff --git a/src/vs/platform/contextview/browser/contextMenuService.ts b/src/vs/platform/contextview/browser/contextMenuService.ts index e2fc80ef4ec85ee7ea74f587a39310c36c58ec4b..bb76d44886af82a004c38ffebd336d1dd07d42a6 100644 --- a/src/vs/platform/contextview/browser/contextMenuService.ts +++ b/src/vs/platform/contextview/browser/contextMenuService.ts @@ -17,7 +17,7 @@ export class ContextMenuService extends Disposable implements IContextMenuServic _serviceBrand: any; private _onDidContextMenu = this._register(new Emitter()); - get onDidContextMenu(): Event { return this._onDidContextMenu.event; } + readonly onDidContextMenu: Event = this._onDidContextMenu.event; private contextMenuHandler: ContextMenuHandler; diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts index 67dd28f9bbb801239efb1f64ec440a4d1d07eb96..5beb3a1c8b82263a91b7a1e406308f2521a35d6b 100644 --- a/src/vs/platform/files/common/fileService.ts +++ b/src/vs/platform/files/common/fileService.ts @@ -32,10 +32,10 @@ export class FileService extends Disposable implements IFileService { //#region File System Provider private _onDidChangeFileSystemProviderRegistrations: Emitter = this._register(new Emitter()); - get onDidChangeFileSystemProviderRegistrations(): Event { return this._onDidChangeFileSystemProviderRegistrations.event; } + readonly onDidChangeFileSystemProviderRegistrations: Event = this._onDidChangeFileSystemProviderRegistrations.event; private _onWillActivateFileSystemProvider: Emitter = this._register(new Emitter()); - get onWillActivateFileSystemProvider(): Event { return this._onWillActivateFileSystemProvider.event; } + readonly onWillActivateFileSystemProvider: Event = this._onWillActivateFileSystemProvider.event; private readonly provider = new Map(); @@ -132,10 +132,10 @@ export class FileService extends Disposable implements IFileService { //#endregion private _onAfterOperation: Emitter = this._register(new Emitter()); - get onAfterOperation(): Event { return this._onAfterOperation.event; } + readonly onAfterOperation: Event = this._onAfterOperation.event; private _onError: Emitter = this._register(new Emitter()); - get onError(): Event { return this._onError.event; } + readonly onError: Event = this._onError.event; //#region File Metadata Resolving @@ -763,7 +763,7 @@ export class FileService extends Disposable implements IFileService { //#region File Watching private _onFileChanges: Emitter = this._register(new Emitter()); - get onFileChanges(): Event { return this._onFileChanges.event; } + readonly onFileChanges: Event = this._onFileChanges.event; private activeWatchers = new Map(); diff --git a/src/vs/platform/files/node/diskFileSystemProvider.ts b/src/vs/platform/files/node/diskFileSystemProvider.ts index 1a7534ffe08033293efae39ae55c4249373a1c16..8ef39ec23f074ce140e5f2061b6ba12c8e05f9b7 100644 --- a/src/vs/platform/files/node/diskFileSystemProvider.ts +++ b/src/vs/platform/files/node/diskFileSystemProvider.ts @@ -367,7 +367,7 @@ export class DiskFileSystemProvider extends Disposable implements IFileSystemPro //#region File Watching private _onDidWatchErrorOccur: Emitter = this._register(new Emitter()); - get onDidErrorOccur(): Event { return this._onDidWatchErrorOccur.event; } + readonly onDidErrorOccur: Event = this._onDidWatchErrorOccur.event; private _onDidChangeFile: Emitter = this._register(new Emitter()); get onDidChangeFile(): Event { return this._onDidChangeFile.event; } diff --git a/src/vs/platform/lifecycle/common/lifecycleService.ts b/src/vs/platform/lifecycle/common/lifecycleService.ts index b325cde418a947f31ae63175bc0ad001bdb36ab9..2225c04ca99e374a5f05d78edbb3e8dac4af7d95 100644 --- a/src/vs/platform/lifecycle/common/lifecycleService.ts +++ b/src/vs/platform/lifecycle/common/lifecycleService.ts @@ -16,13 +16,13 @@ export abstract class AbstractLifecycleService extends Disposable implements ILi _serviceBrand: ServiceIdentifier; protected readonly _onBeforeShutdown = this._register(new Emitter()); - get onBeforeShutdown(): Event { return this._onBeforeShutdown.event; } + readonly onBeforeShutdown: Event = this._onBeforeShutdown.event; protected readonly _onWillShutdown = this._register(new Emitter()); - get onWillShutdown(): Event { return this._onWillShutdown.event; } + readonly onWillShutdown: Event = this._onWillShutdown.event; protected readonly _onShutdown = this._register(new Emitter()); - get onShutdown(): Event { return this._onShutdown.event; } + readonly onShutdown: Event = this._onShutdown.event; protected _startupKind: StartupKind; get startupKind(): StartupKind { return this._startupKind; } diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts index 75549c25f55729949ba54f9d5efded1aaf42e0cd..173b575822e118672dade3337309086a76dd4612 100644 --- a/src/vs/platform/notification/common/notification.ts +++ b/src/vs/platform/notification/common/notification.ts @@ -254,7 +254,7 @@ export class NoOpNotification implements INotificationHandle { readonly progress = new NoOpProgress(); private readonly _onDidClose: Emitter = new Emitter(); - get onDidClose(): Event { return this._onDidClose.event; } + readonly onDidClose: Event = this._onDidClose.event; updateSeverity(severity: Severity): void { } updateMessage(message: NotificationMessage): void { } diff --git a/src/vs/platform/remote/common/remoteAgentFileSystemChannel.ts b/src/vs/platform/remote/common/remoteAgentFileSystemChannel.ts index edc89fb407e0ccd3138963abe9c3b618dacc2863..cefb3518ba0b27263c8ad02cdf64d6123a436005 100644 --- a/src/vs/platform/remote/common/remoteAgentFileSystemChannel.ts +++ b/src/vs/platform/remote/common/remoteAgentFileSystemChannel.ts @@ -28,7 +28,7 @@ export class RemoteExtensionsFileSystemProvider extends Disposable implements IF readonly onDidChangeFile: Event = this._onDidChange.event; private _onDidWatchErrorOccur: Emitter = this._register(new Emitter()); - get onDidErrorOccur(): Event { return this._onDidWatchErrorOccur.event; } + readonly onDidErrorOccur: Event = this._onDidWatchErrorOccur.event; private readonly _onDidChangeCapabilities = this._register(new Emitter()); readonly onDidChangeCapabilities: Event = this._onDidChangeCapabilities.event; diff --git a/src/vs/platform/storage/browser/storageService.ts b/src/vs/platform/storage/browser/storageService.ts index 734397a9f16a07b0be9d45616a1c556df80c487b..7e18f2ba09d75f8f01244243154f188414a230d6 100644 --- a/src/vs/platform/storage/browser/storageService.ts +++ b/src/vs/platform/storage/browser/storageService.ts @@ -20,10 +20,10 @@ export class BrowserStorageService extends Disposable implements IStorageService _serviceBrand: ServiceIdentifier; private readonly _onDidChangeStorage: Emitter = this._register(new Emitter()); - get onDidChangeStorage(): Event { return this._onDidChangeStorage.event; } + readonly onDidChangeStorage: Event = this._onDidChangeStorage.event; private readonly _onWillSaveState: Emitter = this._register(new Emitter()); - get onWillSaveState(): Event { return this._onWillSaveState.event; } + readonly onWillSaveState: Event = this._onWillSaveState.event; private globalStorage: IStorage; private workspaceStorage: IStorage; diff --git a/src/vs/platform/storage/common/storage.ts b/src/vs/platform/storage/common/storage.ts index 443cf4a01315bffe12e54e684d1b6b31835497dd..5f6e2b6673f2914d1d900d6984b023580b289a98 100644 --- a/src/vs/platform/storage/common/storage.ts +++ b/src/vs/platform/storage/common/storage.ts @@ -126,7 +126,7 @@ export class InMemoryStorageService extends Disposable implements IStorageServic _serviceBrand = null as any; private readonly _onDidChangeStorage: Emitter = this._register(new Emitter()); - get onDidChangeStorage(): Event { return this._onDidChangeStorage.event; } + readonly onDidChangeStorage: Event = this._onDidChangeStorage.event; readonly onWillSaveState = Event.None; diff --git a/src/vs/platform/storage/node/storageIpc.ts b/src/vs/platform/storage/node/storageIpc.ts index d317e31a55b285a33b2c6041c73def09c3ed0a6c..aaba475a2695f4c08982012dc631a5f48ece211b 100644 --- a/src/vs/platform/storage/node/storageIpc.ts +++ b/src/vs/platform/storage/node/storageIpc.ts @@ -32,7 +32,7 @@ export class GlobalStorageDatabaseChannel extends Disposable implements IServerC private static STORAGE_CHANGE_DEBOUNCE_TIME = 100; private readonly _onDidChangeItems: Emitter = this._register(new Emitter()); - get onDidChangeItems(): Event { return this._onDidChangeItems.event; } + readonly onDidChangeItems: Event = this._onDidChangeItems.event; private whenReady: Promise; @@ -150,7 +150,7 @@ export class GlobalStorageDatabaseChannelClient extends Disposable implements IS _serviceBrand: any; private readonly _onDidChangeItemsExternal: Emitter = this._register(new Emitter()); - get onDidChangeItemsExternal(): Event { return this._onDidChangeItemsExternal.event; } + readonly onDidChangeItemsExternal: Event = this._onDidChangeItemsExternal.event; private onDidChangeItemsOnMainListener: IDisposable; diff --git a/src/vs/platform/storage/node/storageMainService.ts b/src/vs/platform/storage/node/storageMainService.ts index ccb1698886010836ddaf274224f21762022e5d52..8c76782626a301edba7f6ae5c5baa2464ec6a12d 100644 --- a/src/vs/platform/storage/node/storageMainService.ts +++ b/src/vs/platform/storage/node/storageMainService.ts @@ -80,10 +80,10 @@ export class StorageMainService extends Disposable implements IStorageMainServic private static STORAGE_NAME = 'state.vscdb'; private readonly _onDidChangeStorage: Emitter = this._register(new Emitter()); - get onDidChangeStorage(): Event { return this._onDidChangeStorage.event; } + readonly onDidChangeStorage: Event = this._onDidChangeStorage.event; private readonly _onWillSaveState: Emitter = this._register(new Emitter()); - get onWillSaveState(): Event { return this._onWillSaveState.event; } + readonly onWillSaveState: Event = this._onWillSaveState.event; get items(): Map { return this.storage.items; } diff --git a/src/vs/platform/storage/node/storageService.ts b/src/vs/platform/storage/node/storageService.ts index 27d30af0527661f6aeee9f6087c9368414f14790..caff11a3483251527adcf708d11874b7e68890d9 100644 --- a/src/vs/platform/storage/node/storageService.ts +++ b/src/vs/platform/storage/node/storageService.ts @@ -25,10 +25,10 @@ export class StorageService extends Disposable implements IStorageService { private static WORKSPACE_META_NAME = 'workspace.json'; private readonly _onDidChangeStorage: Emitter = this._register(new Emitter()); - get onDidChangeStorage(): Event { return this._onDidChangeStorage.event; } + readonly onDidChangeStorage: Event = this._onDidChangeStorage.event; private readonly _onWillSaveState: Emitter = this._register(new Emitter()); - get onWillSaveState(): Event { return this._onWillSaveState.event; } + readonly onWillSaveState: Event = this._onWillSaveState.event; private globalStorage: IStorage; diff --git a/src/vs/platform/update/electron-browser/updateService.ts b/src/vs/platform/update/electron-browser/updateService.ts index 023ea3ea7da5db13bb4db5a5dbcc80a446e54877..952c39cdbedeb5d2937bdba59fe96db05a45cb94 100644 --- a/src/vs/platform/update/electron-browser/updateService.ts +++ b/src/vs/platform/update/electron-browser/updateService.ts @@ -14,7 +14,7 @@ export class UpdateService implements IUpdateService { _serviceBrand: ServiceIdentifier; private _onStateChange = new Emitter(); - get onStateChange(): Event { return this._onStateChange.event; } + readonly onStateChange: Event = this._onStateChange.event; private _state: State = State.Uninitialized; get state(): State { return this._state; } diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts index 76544db222162d0e6db5994b538a1f2f39440c89..f8059fb04b612e743bd463c3b504828f484a1ec0 100644 --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts @@ -27,7 +27,7 @@ export abstract class AbstractUpdateService implements IUpdateService { private _state: State = State.Uninitialized; private _onStateChange = new Emitter(); - get onStateChange(): Event { return this._onStateChange.event; } + readonly onStateChange: Event = this._onStateChange.event; get state(): State { return this._state; diff --git a/src/vs/platform/update/electron-main/updateService.snap.ts b/src/vs/platform/update/electron-main/updateService.snap.ts index 33dac3229274e1578fbec795cb5d86308ff7ac41..ad64d8adfe07b22a8dfea4ae53b7c224f9b112be 100644 --- a/src/vs/platform/update/electron-main/updateService.snap.ts +++ b/src/vs/platform/update/electron-main/updateService.snap.ts @@ -21,7 +21,7 @@ abstract class AbstractUpdateService2 implements IUpdateService { private _state: State = State.Uninitialized; private _onStateChange = new Emitter(); - get onStateChange(): Event { return this._onStateChange.event; } + readonly onStateChange: Event = this._onStateChange.event; get state(): State { return this._state; diff --git a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts index 58107e613f2cf54b2fe63cf5ea1eb0a068b87f74..54d6757842a500475958641f7449c7fe2df80595 100644 --- a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts +++ b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts @@ -31,7 +31,7 @@ export class WorkspacesMainService extends Disposable implements IWorkspacesMain private readonly untitledWorkspacesHome: URI; // local URI that contains all untitled workspaces private readonly _onUntitledWorkspaceDeleted = this._register(new Emitter()); - get onUntitledWorkspaceDeleted(): Event { return this._onUntitledWorkspaceDeleted.event; } + readonly onUntitledWorkspaceDeleted: Event = this._onUntitledWorkspaceDeleted.event; constructor( @IEnvironmentService private readonly environmentService: IEnvironmentService, diff --git a/src/vs/workbench/api/browser/mainThreadComments.ts b/src/vs/workbench/api/browser/mainThreadComments.ts index 7bce8f98deedf06cf37579546cc458b40ad6d18a..77c2e1052a76b43ec9f63cd769cdafbe1581b39a 100644 --- a/src/vs/workbench/api/browser/mainThreadComments.ts +++ b/src/vs/workbench/api/browser/mainThreadComments.ts @@ -57,7 +57,7 @@ export class MainThreadCommentThread implements modes.CommentThread { } private _onDidChangeLabel = new Emitter(); - get onDidChangeLabel(): Event { return this._onDidChangeLabel.event; } + readonly onDidChangeLabel: Event = this._onDidChangeLabel.event; private _comments: modes.Comment[] | undefined; diff --git a/src/vs/workbench/api/browser/mainThreadSCM.ts b/src/vs/workbench/api/browser/mainThreadSCM.ts index b0a25696935431187a3211cea983408fc6d4acee..089cb517b4565fbc1f8f7322edfedc6f28df5f23 100644 --- a/src/vs/workbench/api/browser/mainThreadSCM.ts +++ b/src/vs/workbench/api/browser/mainThreadSCM.ts @@ -24,7 +24,7 @@ class MainThreadSCMResourceGroup implements ISCMResourceGroup { get hideWhenEmpty(): boolean { return !!this.features.hideWhenEmpty; } private _onDidChange = new Emitter(); - get onDidChange(): Event { return this._onDidChange.event; } + readonly onDidChange: Event = this._onDidChange.event; constructor( private readonly sourceControlHandle: number, @@ -105,7 +105,7 @@ class MainThreadSCMProvider implements ISCMProvider { // } private _onDidChangeResources = new Emitter(); - get onDidChangeResources(): Event { return this._onDidChangeResources.event; } + readonly onDidChangeResources: Event = this._onDidChangeResources.event; private features: SCMProviderFeatures = {}; @@ -120,13 +120,13 @@ class MainThreadSCMProvider implements ISCMProvider { get count(): number | undefined { return this.features.count; } private _onDidChangeCommitTemplate = new Emitter(); - get onDidChangeCommitTemplate(): Event { return this._onDidChangeCommitTemplate.event; } + readonly onDidChangeCommitTemplate: Event = this._onDidChangeCommitTemplate.event; private _onDidChangeStatusBarCommands = new Emitter(); get onDidChangeStatusBarCommands(): Event { return this._onDidChangeStatusBarCommands.event; } private _onDidChange = new Emitter(); - get onDidChange(): Event { return this._onDidChange.event; } + readonly onDidChange: Event = this._onDidChange.event; constructor( private readonly proxy: ExtHostSCMShape, diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts index 87657c7e6f11574b61dbc1bec45b7382d8968d05..56d11496bb07e5844f46908228470e9f501cad67 100644 --- a/src/vs/workbench/api/node/extHostTerminalService.ts +++ b/src/vs/workbench/api/node/extHostTerminalService.ts @@ -726,13 +726,13 @@ class ExtHostVirtualProcess implements ITerminalChildProcess { private _queueDisposables: IDisposable[] | undefined; private readonly _onProcessData = new Emitter(); - public get onProcessData(): Event { return this._onProcessData.event; } + public readonly onProcessData: Event = this._onProcessData.event; private readonly _onProcessExit = new Emitter(); - public get onProcessExit(): Event { return this._onProcessExit.event; } + public readonly onProcessExit: Event = this._onProcessExit.event; private readonly _onProcessReady = new Emitter<{ pid: number, cwd: string }>(); public get onProcessReady(): Event<{ pid: number, cwd: string }> { return this._onProcessReady.event; } private readonly _onProcessTitleChanged = new Emitter(); - public get onProcessTitleChanged(): Event { return this._onProcessTitleChanged.event; } + public readonly onProcessTitleChanged: Event = this._onProcessTitleChanged.event; private readonly _onProcessOverrideDimensions = new Emitter(); public get onProcessOverrideDimensions(): Event { return this._onProcessOverrideDimensions.event; } diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts index 84bf4619b0ef4ffed279516fe25f422f270b0b80..123e9a9b692de50bdedcea2835c5517cd356fe51 100644 --- a/src/vs/workbench/browser/composite.ts +++ b/src/vs/workbench/browser/composite.ts @@ -30,10 +30,10 @@ import { Disposable } from 'vs/base/common/lifecycle'; export abstract class Composite extends Component implements IComposite { private readonly _onTitleAreaUpdate: Emitter = this._register(new Emitter()); - get onTitleAreaUpdate(): Event { return this._onTitleAreaUpdate.event; } + readonly onTitleAreaUpdate: Event = this._onTitleAreaUpdate.event; private readonly _onDidChangeVisibility: Emitter = this._register(new Emitter()); - get onDidChangeVisibility(): Event { return this._onDidChangeVisibility.event; } + readonly onDidChangeVisibility: Event = this._onDidChangeVisibility.event; private _onDidFocus: Emitter; get onDidFocus(): Event { diff --git a/src/vs/workbench/browser/labels.ts b/src/vs/workbench/browser/labels.ts index 4c0ccf3809ee9760ff0511e8ca3f2944900e1cf9..9db4979a3aaa82ae36c74588135340de0c703671 100644 --- a/src/vs/workbench/browser/labels.ts +++ b/src/vs/workbench/browser/labels.ts @@ -239,7 +239,7 @@ enum Redraw { class ResourceLabelWidget extends IconLabel { private _onDidRender = this._register(new Emitter()); - get onDidRender(): Event { return this._onDidRender.event; } + readonly onDidRender: Event = this._onDidRender.event; private label?: IResourceLabelProps; private options?: IResourceLabelOptions; diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts index 88e9676f1e73dd617c8d6ed98b7c767948249d75..a70593c43909e4ab6d257e2b1d649902f19aa5ad 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -63,22 +63,22 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi _serviceBrand: ServiceIdentifier; private readonly _onTitleBarVisibilityChange: Emitter = this._register(new Emitter()); - get onTitleBarVisibilityChange(): Event { return this._onTitleBarVisibilityChange.event; } + readonly onTitleBarVisibilityChange: Event = this._onTitleBarVisibilityChange.event; private readonly _onZenModeChange: Emitter = this._register(new Emitter()); - get onZenModeChange(): Event { return this._onZenModeChange.event; } + readonly onZenModeChange: Event = this._onZenModeChange.event; private readonly _onFullscreenChange: Emitter = this._register(new Emitter()); - get onFullscreenChange(): Event { return this._onFullscreenChange.event; } + readonly onFullscreenChange: Event = this._onFullscreenChange.event; private readonly _onCenteredLayoutChange: Emitter = this._register(new Emitter()); - get onCenteredLayoutChange(): Event { return this._onCenteredLayoutChange.event; } + readonly onCenteredLayoutChange: Event = this._onCenteredLayoutChange.event; private readonly _onPanelPositionChange: Emitter = this._register(new Emitter()); - get onPanelPositionChange(): Event { return this._onPanelPositionChange.event; } + readonly onPanelPositionChange: Event = this._onPanelPositionChange.event; private readonly _onLayout = this._register(new Emitter()); - get onLayout(): Event { return this._onLayout.event; } + readonly onLayout: Event = this._onLayout.event; private _dimension: IDimension; get dimension(): IDimension { return this._dimension; } diff --git a/src/vs/workbench/browser/parts/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositeBarActions.ts index fe21d315410501112d0207d2e445a7b76c69ea2b..d3445a9bbb6bb0cce94732ddbe7f9c1efc1f72e3 100644 --- a/src/vs/workbench/browser/parts/compositeBarActions.ts +++ b/src/vs/workbench/browser/parts/compositeBarActions.ts @@ -52,10 +52,10 @@ export interface ICompositeBar { export class ActivityAction extends Action { private _onDidChangeActivity = new Emitter(); - get onDidChangeActivity(): Event { return this._onDidChangeActivity.event; } + readonly onDidChangeActivity: Event = this._onDidChangeActivity.event; private _onDidChangeBadge = new Emitter(); - get onDidChangeBadge(): Event { return this._onDidChangeBadge.event; } + readonly onDidChangeBadge: Event = this._onDidChangeBadge.event; private badge?: IBadge; private clazz: string | undefined; diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts index b2d51bde13c288d3286ca864a39c992898f22c14..81a6096128b440055df5bb741e56bdda2c206675 100644 --- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts +++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts @@ -33,10 +33,10 @@ export interface IOpenCallbacks { export abstract class BaseBinaryResourceEditor extends BaseEditor { private readonly _onMetadataChanged: Emitter = this._register(new Emitter()); - get onMetadataChanged(): Event { return this._onMetadataChanged.event; } + readonly onMetadataChanged: Event = this._onMetadataChanged.event; private readonly _onDidOpenInPlace: Emitter = this._register(new Emitter()); - get onDidOpenInPlace(): Event { return this._onDidOpenInPlace.event; } + readonly onDidOpenInPlace: Event = this._onDidOpenInPlace.event; private callbacks: IOpenCallbacks; private metadata: string | undefined; diff --git a/src/vs/workbench/browser/parts/editor/editorControl.ts b/src/vs/workbench/browser/parts/editor/editorControl.ts index 3db5b69060b1b72fee4dd61d2f11655a7d969c26..726b84c97db8c9ff4440efec5885a096c92a4b32 100644 --- a/src/vs/workbench/browser/parts/editor/editorControl.ts +++ b/src/vs/workbench/browser/parts/editor/editorControl.ts @@ -30,7 +30,7 @@ export class EditorControl extends Disposable { get maximumHeight() { return this._activeControl ? this._activeControl.maximumHeight : DEFAULT_EDITOR_MAX_DIMENSIONS.height; } private readonly _onDidFocus: Emitter = this._register(new Emitter()); - get onDidFocus(): Event { return this._onDidFocus.event; } + readonly onDidFocus: Event = this._onDidFocus.event; private _onDidSizeConstraintsChange = this._register(new Emitter<{ width: number; height: number; } | undefined>()); get onDidSizeConstraintsChange(): Event<{ width: number; height: number; } | undefined> { return this._onDidSizeConstraintsChange.event; } diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts index c38cf579a7a69f0061162a163b35d88f8fa1d9a3..e5cc3843429a70d550d35f7a82778d67160c33e5 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts @@ -71,25 +71,25 @@ export class EditorGroupView extends Themable implements IEditorGroupView { //#region events private readonly _onDidFocus: Emitter = this._register(new Emitter()); - get onDidFocus(): Event { return this._onDidFocus.event; } + readonly onDidFocus: Event = this._onDidFocus.event; private readonly _onWillDispose: Emitter = this._register(new Emitter()); - get onWillDispose(): Event { return this._onWillDispose.event; } + readonly onWillDispose: Event = this._onWillDispose.event; private readonly _onDidGroupChange: Emitter = this._register(new Emitter()); - get onDidGroupChange(): Event { return this._onDidGroupChange.event; } + readonly onDidGroupChange: Event = this._onDidGroupChange.event; private readonly _onWillOpenEditor: Emitter = this._register(new Emitter()); - get onWillOpenEditor(): Event { return this._onWillOpenEditor.event; } + readonly onWillOpenEditor: Event = this._onWillOpenEditor.event; private readonly _onDidOpenEditorFail: Emitter = this._register(new Emitter()); - get onDidOpenEditorFail(): Event { return this._onDidOpenEditorFail.event; } + readonly onDidOpenEditorFail: Event = this._onDidOpenEditorFail.event; private readonly _onWillCloseEditor: Emitter = this._register(new Emitter()); - get onWillCloseEditor(): Event { return this._onWillCloseEditor.event; } + readonly onWillCloseEditor: Event = this._onWillCloseEditor.event; private readonly _onDidCloseEditor: Emitter = this._register(new Emitter()); - get onDidCloseEditor(): Event { return this._onDidCloseEditor.event; } + readonly onDidCloseEditor: Event = this._onDidCloseEditor.event; //#endregion diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 5bb777ae85f001a666af855f1c4c7e96815d180b..dc894921aaaba60d423e3b7e1851a788d6df0216 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -91,29 +91,29 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro //#region Events private readonly _onDidLayout: Emitter = this._register(new Emitter()); - get onDidLayout(): Event { return this._onDidLayout.event; } + readonly onDidLayout: Event = this._onDidLayout.event; private readonly _onDidActiveGroupChange: Emitter = this._register(new Emitter()); - get onDidActiveGroupChange(): Event { return this._onDidActiveGroupChange.event; } + readonly onDidActiveGroupChange: Event = this._onDidActiveGroupChange.event; private readonly _onDidActivateGroup: Emitter = this._register(new Emitter()); - get onDidActivateGroup(): Event { return this._onDidActivateGroup.event; } + readonly onDidActivateGroup: Event = this._onDidActivateGroup.event; private readonly _onDidAddGroup: Emitter = this._register(new Emitter()); - get onDidAddGroup(): Event { return this._onDidAddGroup.event; } + readonly onDidAddGroup: Event = this._onDidAddGroup.event; private readonly _onDidRemoveGroup: Emitter = this._register(new Emitter()); - get onDidRemoveGroup(): Event { return this._onDidRemoveGroup.event; } + readonly onDidRemoveGroup: Event = this._onDidRemoveGroup.event; private readonly _onDidMoveGroup: Emitter = this._register(new Emitter()); - get onDidMoveGroup(): Event { return this._onDidMoveGroup.event; } + readonly onDidMoveGroup: Event = this._onDidMoveGroup.event; private onDidSetGridWidget = this._register(new Emitter<{ width: number; height: number; } | undefined>()); private _onDidSizeConstraintsChange = this._register(new Relay<{ width: number; height: number; } | undefined>()); get onDidSizeConstraintsChange(): Event<{ width: number; height: number; } | undefined> { return Event.any(this.onDidSetGridWidget.event, this._onDidSizeConstraintsChange.event); } private readonly _onDidPreferredSizeChange: Emitter = this._register(new Emitter()); - get onDidPreferredSizeChange(): Event { return this._onDidPreferredSizeChange.event; } + readonly onDidPreferredSizeChange: Event = this._onDidPreferredSizeChange.event; //#endregion @@ -162,7 +162,7 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro private enforcedPartOptions: IEditorPartOptions[] = []; private readonly _onDidEditorPartOptionsChange: Emitter = this._register(new Emitter()); - get onDidEditorPartOptionsChange(): Event { return this._onDidEditorPartOptionsChange.event; } + readonly onDidEditorPartOptionsChange: Event = this._onDidEditorPartOptionsChange.event; private registerListeners(): void { this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e))); diff --git a/src/vs/workbench/browser/parts/editor/editorWidgets.ts b/src/vs/workbench/browser/parts/editor/editorWidgets.ts index de5aacf53546efe94e52222b547706917280d30c..d0595046aaaa7f5388f0f879ee196204cf981774 100644 --- a/src/vs/workbench/browser/parts/editor/editorWidgets.ts +++ b/src/vs/workbench/browser/parts/editor/editorWidgets.ts @@ -24,7 +24,7 @@ import { IFileService } from 'vs/platform/files/common/files'; export class FloatingClickWidget extends Widget implements IOverlayWidget { private readonly _onClick: Emitter = this._register(new Emitter()); - get onClick(): Event { return this._onClick.event; } + readonly onClick: Event = this._onClick.event; private _domNode: HTMLElement; diff --git a/src/vs/workbench/browser/parts/editor/rangeDecorations.ts b/src/vs/workbench/browser/parts/editor/rangeDecorations.ts index 0e994f72c34f11e5cfab32f36ba66c9d8ae41faf..4c52be6ca694edebc14a0c1e7ede949526f5d523 100644 --- a/src/vs/workbench/browser/parts/editor/rangeDecorations.ts +++ b/src/vs/workbench/browser/parts/editor/rangeDecorations.ts @@ -26,7 +26,7 @@ export class RangeHighlightDecorations extends Disposable { private readonly editorDisposables = this._register(new DisposableStore()); private readonly _onHighlightRemoved: Emitter = this._register(new Emitter()); - get onHighlightRemoved(): Event { return this._onHighlightRemoved.event; } + readonly onHighlightRemoved: Event = this._onHighlightRemoved.event; constructor(@IEditorService private readonly editorService: IEditorService) { super(); diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts index e06e38cde6440823ddfaf66f7fe74370f1049458..adef1d21348f91d0cb7965e3e03d8e0e27b82489 100644 --- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts +++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts @@ -28,7 +28,7 @@ export class NotificationsCenter extends Themable { private static MAX_DIMENSIONS = new Dimension(450, 400); private readonly _onDidChangeVisibility: Emitter = this._register(new Emitter()); - get onDidChangeVisibility(): Event { return this._onDidChangeVisibility.event; } + readonly onDidChangeVisibility: Event = this._onDidChangeVisibility.event; private notificationsCenterContainer: HTMLElement; private notificationsCenterHeader: HTMLElement; diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts index 88eb05032e8f9ad5e4dc2352d6ca05a674820a41..874d81baddbb342580e5cab566c9c83f635f7144 100644 --- a/src/vs/workbench/browser/parts/panel/panelPart.ts +++ b/src/vs/workbench/browser/parts/panel/panelPart.ts @@ -62,10 +62,10 @@ export class PanelPart extends CompositePart implements IPanelService { //#endregion get onDidPanelOpen(): Event<{ panel: IPanel, focus: boolean }> { return Event.map(this.onDidCompositeOpen.event, compositeOpen => ({ panel: compositeOpen.composite, focus: compositeOpen.focus })); } - get onDidPanelClose(): Event { return this.onDidCompositeClose.event; } + readonly onDidPanelClose: Event = this.onDidCompositeClose.event; private _onDidVisibilityChange = this._register(new Emitter()); - get onDidVisibilityChange(): Event { return this._onDidVisibilityChange.event; } + readonly onDidVisibilityChange: Event = this._onDidVisibilityChange.event; private activePanelContextKey: IContextKey; private panelFocusContextKey: IContextKey; diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index 5cfc04c3743ea05b9bfe37e598970b9f81edd53d..f31bd9d480e37a194d33cdcba52618cb1e50c0b1 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -64,10 +64,10 @@ export class QuickOpenController extends Component implements IQuickOpenService _serviceBrand: ServiceIdentifier; private readonly _onShow: Emitter = this._register(new Emitter()); - get onShow(): Event { return this._onShow.event; } + readonly onShow: Event = this._onShow.event; private readonly _onHide: Emitter = this._register(new Emitter()); - get onHide(): Event { return this._onHide.event; } + readonly onHide: Event = this._onHide.event; private preserveInput: boolean; private isQuickOpen: boolean; diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts index 942257ef3e90fe5f0288ac12f92ab00c9de14784..88c40e827ae9ed4ddab5ee85ceb15ef89e427679 100644 --- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts +++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts @@ -52,10 +52,10 @@ export class SidebarPart extends CompositePart implements IViewletServi get onDidViewletRegister(): Event { return >this.viewletRegistry.onDidRegister; } private _onDidVisibilityChange = this._register(new Emitter()); - get onDidVisibilityChange(): Event { return this._onDidVisibilityChange.event; } + readonly onDidVisibilityChange: Event = this._onDidVisibilityChange.event; private _onDidViewletDeregister = this._register(new Emitter()); - get onDidViewletDeregister(): Event { return this._onDidViewletDeregister.event; } + readonly onDidViewletDeregister: Event = this._onDidViewletDeregister.event; get onDidViewletOpen(): Event { return Event.map(this.onDidCompositeOpen.event, compositeEvent => compositeEvent.composite); } get onDidViewletClose(): Event { return this.onDidCompositeClose.event as Event; } diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts index 83457d8a39fd0f53618c602d757b8bb9d7feb7af..f6b0a6849f985a2b9f5db204193e596bedb94fd7 100644 --- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts +++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts @@ -56,7 +56,7 @@ export class TitlebarPart extends Part implements ITitleService { //#endregion private _onMenubarVisibilityChange = this._register(new Emitter()); - get onMenubarVisibilityChange(): Event { return this._onMenubarVisibilityChange.event; } + readonly onMenubarVisibilityChange: Event = this._onMenubarVisibilityChange.event; _serviceBrand: ServiceIdentifier; diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts index ee1ae6612f9be16113bac0a2aec98a9e9a26d151..99a141b9b3a9e0955d227c74ad8f996dc66572fa 100644 --- a/src/vs/workbench/browser/parts/views/customView.ts +++ b/src/vs/workbench/browser/parts/views/customView.ts @@ -108,7 +108,7 @@ class TitleMenus extends Disposable { private titleSecondaryActions: IAction[] = []; private _onDidChangeTitle = this._register(new Emitter()); - get onDidChangeTitle(): Event { return this._onDidChangeTitle.event; } + readonly onDidChangeTitle: Event = this._onDidChangeTitle.event; constructor( id: string, diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts index 3fae12549dd0fc9ff950ac73de189f1ad5e2ed50..634655ffa84c5ba85d6980fa6d33055a804b21f4 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts @@ -48,10 +48,10 @@ import { Layout } from 'vs/workbench/browser/layout'; export class Workbench extends Layout { private readonly _onShutdown = this._register(new Emitter()); - get onShutdown(): Event { return this._onShutdown.event; } + readonly onShutdown: Event = this._onShutdown.event; private readonly _onWillShutdown = this._register(new Emitter()); - get onWillShutdown(): Event { return this._onWillShutdown.event; } + readonly onWillShutdown: Event = this._onWillShutdown.event; constructor( parent: HTMLElement, diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts index dca1d783821004b7a871e6e4dd70898c57ff743e..4cd3bb02e5d2b66acfef6240932fbd8added66d2 100644 --- a/src/vs/workbench/common/editor.ts +++ b/src/vs/workbench/common/editor.ts @@ -330,13 +330,13 @@ export interface IEditorInput extends IDisposable { export abstract class EditorInput extends Disposable implements IEditorInput { protected readonly _onDidChangeDirty: Emitter = this._register(new Emitter()); - get onDidChangeDirty(): Event { return this._onDidChangeDirty.event; } + readonly onDidChangeDirty: Event = this._onDidChangeDirty.event; protected readonly _onDidChangeLabel: Emitter = this._register(new Emitter()); - get onDidChangeLabel(): Event { return this._onDidChangeLabel.event; } + readonly onDidChangeLabel: Event = this._onDidChangeLabel.event; private readonly _onDispose: Emitter = this._register(new Emitter()); - get onDispose(): Event { return this._onDispose.event; } + readonly onDispose: Event = this._onDispose.event; private disposed: boolean = false; @@ -658,7 +658,7 @@ export interface ITextEditorModel extends IEditorModel { export class EditorModel extends Disposable implements IEditorModel { private readonly _onDispose: Emitter = this._register(new Emitter()); - get onDispose(): Event { return this._onDispose.event; } + readonly onDispose: Event = this._onDispose.event; /** * Causes this model to load returning a promise when loading is completed. diff --git a/src/vs/workbench/common/editor/editorGroup.ts b/src/vs/workbench/common/editor/editorGroup.ts index e5b47924916006a651df5da0af74a00f4e314ba7..5b207d4a79db9e69b95454feb1f22628c785812e 100644 --- a/src/vs/workbench/common/editor/editorGroup.ts +++ b/src/vs/workbench/common/editor/editorGroup.ts @@ -60,31 +60,31 @@ export class EditorGroup extends Disposable { //#region events private readonly _onDidEditorActivate = this._register(new Emitter()); - get onDidEditorActivate(): Event { return this._onDidEditorActivate.event; } + readonly onDidEditorActivate: Event = this._onDidEditorActivate.event; private readonly _onDidEditorOpen = this._register(new Emitter()); - get onDidEditorOpen(): Event { return this._onDidEditorOpen.event; } + readonly onDidEditorOpen: Event = this._onDidEditorOpen.event; private readonly _onDidEditorClose = this._register(new Emitter()); - get onDidEditorClose(): Event { return this._onDidEditorClose.event; } + readonly onDidEditorClose: Event = this._onDidEditorClose.event; private readonly _onDidEditorDispose = this._register(new Emitter()); - get onDidEditorDispose(): Event { return this._onDidEditorDispose.event; } + readonly onDidEditorDispose: Event = this._onDidEditorDispose.event; private readonly _onDidEditorBecomeDirty = this._register(new Emitter()); - get onDidEditorBecomeDirty(): Event { return this._onDidEditorBecomeDirty.event; } + readonly onDidEditorBecomeDirty: Event = this._onDidEditorBecomeDirty.event; private readonly _onDidEditorLabelChange = this._register(new Emitter()); - get onDidEditorLabelChange(): Event { return this._onDidEditorLabelChange.event; } + readonly onDidEditorLabelChange: Event = this._onDidEditorLabelChange.event; private readonly _onDidEditorMove = this._register(new Emitter()); - get onDidEditorMove(): Event { return this._onDidEditorMove.event; } + readonly onDidEditorMove: Event = this._onDidEditorMove.event; private readonly _onDidEditorPin = this._register(new Emitter()); - get onDidEditorPin(): Event { return this._onDidEditorPin.event; } + readonly onDidEditorPin: Event = this._onDidEditorPin.event; private readonly _onDidEditorUnpin = this._register(new Emitter()); - get onDidEditorUnpin(): Event { return this._onDidEditorUnpin.event; } + readonly onDidEditorUnpin: Event = this._onDidEditorUnpin.event; //#endregion diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts index 2d89afb0bb01e47353ea62198d3e91c3f3021584..561b5cb6f87f01cc7ed2fcff3d78f2275a0dfac4 100644 --- a/src/vs/workbench/common/editor/untitledEditorInput.ts +++ b/src/vs/workbench/common/editor/untitledEditorInput.ts @@ -28,10 +28,10 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport private modelResolve: Promise | null; private readonly _onDidModelChangeContent: Emitter = this._register(new Emitter()); - get onDidModelChangeContent(): Event { return this._onDidModelChangeContent.event; } + readonly onDidModelChangeContent: Event = this._onDidModelChangeContent.event; private readonly _onDidModelChangeEncoding: Emitter = this._register(new Emitter()); - get onDidModelChangeEncoding(): Event { return this._onDidModelChangeEncoding.event; } + readonly onDidModelChangeEncoding: Event = this._onDidModelChangeEncoding.event; constructor( private readonly resource: URI, diff --git a/src/vs/workbench/common/editor/untitledEditorModel.ts b/src/vs/workbench/common/editor/untitledEditorModel.ts index 8b2c38d28f686f9bf9d7e9577035239564124910..57a77b7267bb9b1920c4164102c5b2fc7ec623b9 100644 --- a/src/vs/workbench/common/editor/untitledEditorModel.ts +++ b/src/vs/workbench/common/editor/untitledEditorModel.ts @@ -22,13 +22,13 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY; private readonly _onDidChangeContent: Emitter = this._register(new Emitter()); - get onDidChangeContent(): Event { return this._onDidChangeContent.event; } + readonly onDidChangeContent: Event = this._onDidChangeContent.event; private readonly _onDidChangeDirty: Emitter = this._register(new Emitter()); - get onDidChangeDirty(): Event { return this._onDidChangeDirty.event; } + readonly onDidChangeDirty: Event = this._onDidChangeDirty.event; private readonly _onDidChangeEncoding: Emitter = this._register(new Emitter()); - get onDidChangeEncoding(): Event { return this._onDidChangeEncoding.event; } + readonly onDidChangeEncoding: Event = this._onDidChangeEncoding.event; private dirty: boolean = false; private versionId: number = 0; diff --git a/src/vs/workbench/common/notifications.ts b/src/vs/workbench/common/notifications.ts index e4718e06f67024010ca66900bbb7e84b10b18115..b83f959943699c85bdbc2e46cf87f2d16a793189 100644 --- a/src/vs/workbench/common/notifications.ts +++ b/src/vs/workbench/common/notifications.ts @@ -86,7 +86,7 @@ export interface IStatusMessageChangeEvent { export class NotificationHandle implements INotificationHandle { private readonly _onDidClose: Emitter = new Emitter(); - get onDidClose(): Event { return this._onDidClose.event; } + readonly onDidClose: Event = this._onDidClose.event; constructor(private readonly item: INotificationViewItem, private readonly closeItem: (item: INotificationViewItem) => void) { this.registerListeners(); @@ -126,10 +126,10 @@ export class NotificationsModel extends Disposable implements INotificationsMode private static NO_OP_NOTIFICATION = new NoOpNotification(); private readonly _onDidNotificationChange: Emitter = this._register(new Emitter()); - get onDidNotificationChange(): Event { return this._onDidNotificationChange.event; } + readonly onDidNotificationChange: Event = this._onDidNotificationChange.event; private readonly _onDidStatusMessageChange: Emitter = this._register(new Emitter()); - get onDidStatusMessageChange(): Event { return this._onDidStatusMessageChange.event; } + readonly onDidStatusMessageChange: Event = this._onDidStatusMessageChange.event; private readonly _notifications: INotificationViewItem[] = []; get notifications(): INotificationViewItem[] { return this._notifications; } @@ -301,7 +301,7 @@ export class NotificationViewItemProgress extends Disposable implements INotific private readonly _state: INotificationViewItemProgressState; private readonly _onDidChange: Emitter = this._register(new Emitter()); - get onDidChange(): Event { return this._onDidChange.event; } + readonly onDidChange: Event = this._onDidChange.event; constructor() { super(); @@ -397,13 +397,13 @@ export class NotificationViewItem extends Disposable implements INotificationVie private _progress: NotificationViewItemProgress; private readonly _onDidExpansionChange: Emitter = this._register(new Emitter()); - get onDidExpansionChange(): Event { return this._onDidExpansionChange.event; } + readonly onDidExpansionChange: Event = this._onDidExpansionChange.event; private readonly _onDidClose: Emitter = this._register(new Emitter()); - get onDidClose(): Event { return this._onDidClose.event; } + readonly onDidClose: Event = this._onDidClose.event; private readonly _onDidLabelChange: Emitter = this._register(new Emitter()); - get onDidLabelChange(): Event { return this._onDidLabelChange.event; } + readonly onDidLabelChange: Event = this._onDidLabelChange.event; static create(notification: INotification): INotificationViewItem | null { if (!notification || !notification.message || isPromiseCanceledError(notification.message)) { @@ -654,7 +654,7 @@ export class NotificationViewItem extends Disposable implements INotificationVie export class ChoiceAction extends Action { private readonly _onDidRun = new Emitter(); - get onDidRun(): Event { return this._onDidRun.event; } + readonly onDidRun: Event = this._onDidRun.event; private readonly _keepOpen: boolean; diff --git a/src/vs/workbench/common/resources.ts b/src/vs/workbench/common/resources.ts index 1b1e64b5992565eaf0c8d3c591f0d1184fcebbd0..53de865d8f1bf10296fae8d4ee2dc3c46ae66f0c 100644 --- a/src/vs/workbench/common/resources.ts +++ b/src/vs/workbench/common/resources.ts @@ -107,7 +107,7 @@ export class ResourceGlobMatcher extends Disposable { private static readonly NO_ROOT: string | null = null; private readonly _onExpressionChange: Emitter = this._register(new Emitter()); - get onExpressionChange(): Event { return this._onExpressionChange.event; } + readonly onExpressionChange: Event = this._onExpressionChange.event; private readonly mapRootToParsedExpression: Map = new Map(); private readonly mapRootToExpressionConfig: Map = new Map(); diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts index e353af16e1323efeb0b18ea0bd8b678fdb7cedc3..360bc205add8d25c5848952538990228bcb1b468 100644 --- a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts +++ b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts @@ -437,7 +437,7 @@ class DefaultSettingsHeaderRenderer extends Disposable { export class SettingsGroupTitleRenderer extends Disposable implements HiddenAreasProvider { private readonly _onHiddenAreasChanged = this._register(new Emitter()); - get onHiddenAreasChanged(): Event { return this._onHiddenAreasChanged.event; } + readonly onHiddenAreasChanged: Event = this._onHiddenAreasChanged.event; private settingsGroups: ISettingsGroup[]; private hiddenGroups: ISettingsGroup[] = []; diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts index f45d098fb72f4f7b760a8c8732f9c12f8ed5f370..7eeb9c15120f5d415093d7f9bfbac997b2e0ae8f 100644 --- a/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts +++ b/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts @@ -745,7 +745,7 @@ export class EditPreferenceWidget extends Disposable { private _editPreferenceDecoration: string[]; private readonly _onClick = this._register(new Emitter()); - get onClick(): Event { return this._onClick.event; } + readonly onClick: Event = this._onClick.event; constructor(private editor: ICodeEditor ) { diff --git a/src/vs/workbench/contrib/scm/common/scmService.ts b/src/vs/workbench/contrib/scm/common/scmService.ts index 4b5e9e6d10bb99fefc88ffb78d08d2b17304381d..e75d7df468e8110493951b32b78c9e7aa367e600 100644 --- a/src/vs/workbench/contrib/scm/common/scmService.ts +++ b/src/vs/workbench/contrib/scm/common/scmService.ts @@ -23,7 +23,7 @@ class SCMInput implements ISCMInput { } private _onDidChange = new Emitter(); - get onDidChange(): Event { return this._onDidChange.event; } + readonly onDidChange: Event = this._onDidChange.event; private _placeholder = ''; @@ -37,7 +37,7 @@ class SCMInput implements ISCMInput { } private _onDidChangePlaceholder = new Emitter(); - get onDidChangePlaceholder(): Event { return this._onDidChangePlaceholder.event; } + readonly onDidChangePlaceholder: Event = this._onDidChangePlaceholder.event; private _visible = true; @@ -51,7 +51,7 @@ class SCMInput implements ISCMInput { } private _onDidChangeVisibility = new Emitter(); - get onDidChangeVisibility(): Event { return this._onDidChangeVisibility.event; } + readonly onDidChangeVisibility: Event = this._onDidChangeVisibility.event; private _validateInput: IInputValidator = () => Promise.resolve(undefined); @@ -65,7 +65,7 @@ class SCMInput implements ISCMInput { } private _onDidChangeValidateInput = new Emitter(); - get onDidChangeValidateInput(): Event { return this._onDidChangeValidateInput.event; } + readonly onDidChangeValidateInput: Event = this._onDidChangeValidateInput.event; } class SCMRepository implements ISCMRepository { @@ -118,10 +118,10 @@ export class SCMService implements ISCMService { readonly onDidChangeSelectedRepositories: Event = this._onDidChangeSelectedRepositories.event; private _onDidAddProvider = new Emitter(); - get onDidAddRepository(): Event { return this._onDidAddProvider.event; } + readonly onDidAddRepository: Event = this._onDidAddProvider.event; private _onDidRemoveProvider = new Emitter(); - get onDidRemoveRepository(): Event { return this._onDidRemoveProvider.event; } + readonly onDidRemoveRepository: Event = this._onDidRemoveProvider.event; constructor(@ILogService private readonly logService: ILogService) { } diff --git a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts index 30c10b277a6d8ccc7accd9dc3ff0e6d62e123a6d..1c4f457c5b953428097849d4cdc614052509f408 100644 --- a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts +++ b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts @@ -1718,7 +1718,7 @@ class ProblemMatcherRegistryImpl implements IProblemMatcherRegistry { private matchers: IStringDictionary; private readyPromise: Promise; private readonly _onMatchersChanged: Emitter = new Emitter(); - public get onMatcherChanged(): Event { return this._onMatchersChanged.event; } + public readonly onMatcherChanged: Event = this._onMatchersChanged.event; constructor() { diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTab.ts b/src/vs/workbench/contrib/terminal/browser/terminalTab.ts index 23d85afde8e0e0e7cc914afebc594faf752c1928..a984ba5623224ccaa82660d8a80cf9126236a06d 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalTab.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalTab.ts @@ -223,9 +223,9 @@ export class TerminalTab extends Disposable implements ITerminalTab { public get terminalInstances(): ITerminalInstance[] { return this._terminalInstances; } private readonly _onDisposed: Emitter; - public get onDisposed(): Event { return this._onDisposed.event; } + public readonly onDisposed: Event = this._onDisposed.event; private readonly _onInstancesChanged: Emitter; - public get onInstancesChanged(): Event { return this._onInstancesChanged.event; } + public readonly onInstancesChanged: Event = this._onInstancesChanged.event; constructor( terminalFocusContextKey: IContextKey, diff --git a/src/vs/workbench/contrib/webview/browser/webviewEditor.ts b/src/vs/workbench/contrib/webview/browser/webviewEditor.ts index 9dfa9721021f851bd5af2b9690a98cbc2ae1bc2a..889766333d3927f0b911ff2ec4c1e765e4dc7db0 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewEditor.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewEditor.ts @@ -37,7 +37,7 @@ export class WebviewEditor extends BaseEditor { private readonly _onFocusWindowHandler = this._register(new MutableDisposable()); private readonly _onDidFocusWebview = this._register(new Emitter()); - public get onDidFocus(): Event { return this._onDidFocusWebview.event; } + public readonly onDidFocus: Event = this._onDidFocusWebview.event; private pendingMessages: any[] = []; diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts index 32d4b8d25f0b5db620a4313614fdecb17b9991c2..e0c1d79deb1a859c2607c244f468c8b48e7fccb9 100644 --- a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts @@ -296,7 +296,7 @@ export class WebviewElement extends Disposable implements Webview { private _focused = false; private readonly _onDidFocus = this._register(new Emitter()); - public get onDidFocus(): Event { return this._onDidFocus.event; } + public readonly onDidFocus: Event = this._onDidFocus.event; constructor( private readonly _options: WebviewOptions, diff --git a/src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts b/src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts index f0a715d58688c7fe2981794dbec4362479ddec20..37d10c4d8fd05d98c1e82db4f035705b56c5b829 100644 --- a/src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts +++ b/src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts @@ -66,7 +66,7 @@ class NativeContextMenuService extends Disposable implements IContextMenuService _serviceBrand: any; private _onDidContextMenu = this._register(new Emitter()); - get onDidContextMenu(): Event { return this._onDidContextMenu.event; } + readonly onDidContextMenu: Event = this._onDidContextMenu.event; constructor( @INotificationService private readonly notificationService: INotificationService, diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts index 039e5b9624c3232d6b142fb52c200f11fb6f3631..444045e88254618c2bd31c4aa1f6139269c463c5 100644 --- a/src/vs/workbench/services/editor/browser/editorService.ts +++ b/src/vs/workbench/services/editor/browser/editorService.ts @@ -40,16 +40,16 @@ export class EditorService extends Disposable implements EditorServiceImpl { //#region events private readonly _onDidActiveEditorChange: Emitter = this._register(new Emitter()); - get onDidActiveEditorChange(): Event { return this._onDidActiveEditorChange.event; } + readonly onDidActiveEditorChange: Event = this._onDidActiveEditorChange.event; private readonly _onDidVisibleEditorsChange: Emitter = this._register(new Emitter()); - get onDidVisibleEditorsChange(): Event { return this._onDidVisibleEditorsChange.event; } + readonly onDidVisibleEditorsChange: Event = this._onDidVisibleEditorsChange.event; private readonly _onDidCloseEditor: Emitter = this._register(new Emitter()); - get onDidCloseEditor(): Event { return this._onDidCloseEditor.event; } + readonly onDidCloseEditor: Event = this._onDidCloseEditor.event; private readonly _onDidOpenEditorFail: Emitter = this._register(new Emitter()); - get onDidOpenEditorFail(): Event { return this._onDidOpenEditorFail.event; } + readonly onDidOpenEditorFail: Event = this._onDidOpenEditorFail.event; //#endregion diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts index e860bcd604886c29f349f26203f6804ebf0b8d31..819e2a1fc0807d97861086b674380039ae6183d5 100644 --- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts +++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts @@ -70,10 +70,10 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil static setSaveParticipant(handler: ISaveParticipant | null): void { TextFileEditorModel.saveParticipant = handler; } private readonly _onDidContentChange: Emitter = this._register(new Emitter()); - get onDidContentChange(): Event { return this._onDidContentChange.event; } + readonly onDidContentChange: Event = this._onDidContentChange.event; private readonly _onDidStateChange: Emitter = this._register(new Emitter()); - get onDidStateChange(): Event { return this._onDidStateChange.event; } + readonly onDidStateChange: Event = this._onDidStateChange.event; private resource: URI; diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts index af67898ef698bf3213c78fa1c404d03ea90c15d4..8afe2d46768ee86787831d286e70d32590e49cdf 100644 --- a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts +++ b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts @@ -15,28 +15,28 @@ import { ResourceMap } from 'vs/base/common/map'; export class TextFileEditorModelManager extends Disposable implements ITextFileEditorModelManager { private readonly _onModelDisposed: Emitter = this._register(new Emitter()); - get onModelDisposed(): Event { return this._onModelDisposed.event; } + readonly onModelDisposed: Event = this._onModelDisposed.event; private readonly _onModelContentChanged: Emitter = this._register(new Emitter()); - get onModelContentChanged(): Event { return this._onModelContentChanged.event; } + readonly onModelContentChanged: Event = this._onModelContentChanged.event; private readonly _onModelDirty: Emitter = this._register(new Emitter()); - get onModelDirty(): Event { return this._onModelDirty.event; } + readonly onModelDirty: Event = this._onModelDirty.event; private readonly _onModelSaveError: Emitter = this._register(new Emitter()); - get onModelSaveError(): Event { return this._onModelSaveError.event; } + readonly onModelSaveError: Event = this._onModelSaveError.event; private readonly _onModelSaved: Emitter = this._register(new Emitter()); - get onModelSaved(): Event { return this._onModelSaved.event; } + readonly onModelSaved: Event = this._onModelSaved.event; private readonly _onModelReverted: Emitter = this._register(new Emitter()); - get onModelReverted(): Event { return this._onModelReverted.event; } + readonly onModelReverted: Event = this._onModelReverted.event; private readonly _onModelEncodingChanged: Emitter = this._register(new Emitter()); - get onModelEncodingChanged(): Event { return this._onModelEncodingChanged.event; } + readonly onModelEncodingChanged: Event = this._onModelEncodingChanged.event; private readonly _onModelOrphanedChanged: Emitter = this._register(new Emitter()); - get onModelOrphanedChanged(): Event { return this._onModelOrphanedChanged.event; } + readonly onModelOrphanedChanged: Event = this._onModelOrphanedChanged.event; private _onModelsDirtyEvent: Event; private _onModelsSaveError: Event; diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts index 34ac606235f3f654431add205c96f0a5ec9b2ce7..33870009b838537890a780c0122fb11ace9bb9f7 100644 --- a/src/vs/workbench/services/textfile/common/textFileService.ts +++ b/src/vs/workbench/services/textfile/common/textFileService.ts @@ -49,13 +49,13 @@ export abstract class TextFileService extends Disposable implements ITextFileSer _serviceBrand: ServiceIdentifier; private readonly _onAutoSaveConfigurationChange: Emitter = this._register(new Emitter()); - get onAutoSaveConfigurationChange(): Event { return this._onAutoSaveConfigurationChange.event; } + readonly onAutoSaveConfigurationChange: Event = this._onAutoSaveConfigurationChange.event; private readonly _onFilesAssociationChange: Emitter = this._register(new Emitter()); - get onFilesAssociationChange(): Event { return this._onFilesAssociationChange.event; } + readonly onFilesAssociationChange: Event = this._onFilesAssociationChange.event; private readonly _onWillMove = this._register(new Emitter()); - get onWillMove(): Event { return this._onWillMove.event; } + readonly onWillMove: Event = this._onWillMove.event; private _models: TextFileEditorModelManager; get models(): ITextFileEditorModelManager { return this._models; } diff --git a/src/vs/workbench/services/themes/common/colorThemeStore.ts b/src/vs/workbench/services/themes/common/colorThemeStore.ts index a803474e6066d5caeb6a1e8b58cb2a67af14d146..272338755fcead4a2b500e86da323f1c1e5517a7 100644 --- a/src/vs/workbench/services/themes/common/colorThemeStore.ts +++ b/src/vs/workbench/services/themes/common/colorThemeStore.ts @@ -53,17 +53,15 @@ export interface ColorThemeChangeEvent { export class ColorThemeStore { private extensionsColorThemes: ColorThemeData[]; - private readonly onDidChangeEmitter: Emitter; - public get onDidChange(): Event { return this.onDidChangeEmitter.event; } + private readonly onDidChangeEmitter = new Emitter(); + public readonly onDidChange: Event = this.onDidChangeEmitter.event; constructor(@IExtensionService private readonly extensionService: IExtensionService, defaultTheme: ColorThemeData) { this.extensionsColorThemes = [defaultTheme]; - this.onDidChangeEmitter = new Emitter(); this.initialize(); } - private initialize() { themesExtPoint.setHandler((extensions, delta) => { const previousIds: { [key: string]: boolean } = {}; diff --git a/src/vs/workbench/services/untitled/common/untitledEditorService.ts b/src/vs/workbench/services/untitled/common/untitledEditorService.ts index 5996ee18648d3cec442a5f092a81692b21b50378..ad0498407ffbe691ea5bc6f9683644bf1b7a96a3 100644 --- a/src/vs/workbench/services/untitled/common/untitledEditorService.ts +++ b/src/vs/workbench/services/untitled/common/untitledEditorService.ts @@ -118,16 +118,16 @@ export class UntitledEditorService extends Disposable implements IUntitledEditor private mapResourceToAssociatedFilePath = new ResourceMap(); private readonly _onDidChangeContent: Emitter = this._register(new Emitter()); - get onDidChangeContent(): Event { return this._onDidChangeContent.event; } + readonly onDidChangeContent: Event = this._onDidChangeContent.event; private readonly _onDidChangeDirty: Emitter = this._register(new Emitter()); - get onDidChangeDirty(): Event { return this._onDidChangeDirty.event; } + readonly onDidChangeDirty: Event = this._onDidChangeDirty.event; private readonly _onDidChangeEncoding: Emitter = this._register(new Emitter()); - get onDidChangeEncoding(): Event { return this._onDidChangeEncoding.event; } + readonly onDidChangeEncoding: Event = this._onDidChangeEncoding.event; private readonly _onDidDisposeModel: Emitter = this._register(new Emitter()); - get onDidDisposeModel(): Event { return this._onDidDisposeModel.event; } + readonly onDidDisposeModel: Event = this._onDidDisposeModel.event; constructor( @IInstantiationService private readonly instantiationService: IInstantiationService,