提交 7411e3f3 编写于 作者: M Matt Bierner

Convert many simple getters for events into readonly properties

We seem to use the readonly property way of exposing these values more widely. Standardizing this a bit across the codebase
上级 20d2018d
...@@ -405,16 +405,16 @@ export class ActionBar extends Disposable implements IActionRunner { ...@@ -405,16 +405,16 @@ export class ActionBar extends Disposable implements IActionRunner {
protected actionsList: HTMLElement; protected actionsList: HTMLElement;
private _onDidBlur = this._register(new Emitter<void>()); private _onDidBlur = this._register(new Emitter<void>());
get onDidBlur(): Event<void> { return this._onDidBlur.event; } readonly onDidBlur: Event<void> = this._onDidBlur.event;
private _onDidCancel = this._register(new Emitter<void>()); private _onDidCancel = this._register(new Emitter<void>());
get onDidCancel(): Event<void> { return this._onDidCancel.event; } readonly onDidCancel: Event<void> = this._onDidCancel.event;
private _onDidRun = this._register(new Emitter<IRunEvent>()); private _onDidRun = this._register(new Emitter<IRunEvent>());
get onDidRun(): Event<IRunEvent> { return this._onDidRun.event; } readonly onDidRun: Event<IRunEvent> = this._onDidRun.event;
private _onDidBeforeRun = this._register(new Emitter<IRunEvent>()); private _onDidBeforeRun = this._register(new Emitter<IRunEvent>());
get onDidBeforeRun(): Event<IRunEvent> { return this._onDidBeforeRun.event; } readonly onDidBeforeRun: Event<IRunEvent> = this._onDidBeforeRun.event;
constructor(container: HTMLElement, options: IActionBarOptions = defaultOptions) { constructor(container: HTMLElement, options: IActionBarOptions = defaultOptions) {
super(); super();
......
...@@ -72,10 +72,10 @@ export class CheckboxActionViewItem extends BaseActionViewItem { ...@@ -72,10 +72,10 @@ export class CheckboxActionViewItem extends BaseActionViewItem {
export class Checkbox extends Widget { export class Checkbox extends Widget {
private readonly _onChange = this._register(new Emitter<boolean>()); private readonly _onChange = this._register(new Emitter<boolean>());
get onChange(): Event<boolean /* via keyboard */> { return this._onChange.event; } readonly onChange: Event<boolean /* via keyboard */> = this._onChange.event;
private readonly _onKeyDown = this._register(new Emitter<IKeyboardEvent>()); private readonly _onKeyDown = this._register(new Emitter<IKeyboardEvent>());
get onKeyDown(): Event<IKeyboardEvent> { return this._onKeyDown.event; } readonly onKeyDown: Event<IKeyboardEvent> = this._onKeyDown.event;
private readonly _opts: ICheckboxOpts; private readonly _opts: ICheckboxOpts;
readonly domNode: HTMLElement; readonly domNode: HTMLElement;
......
...@@ -111,7 +111,7 @@ class Trait<T> implements ISpliceable<boolean>, IDisposable { ...@@ -111,7 +111,7 @@ class Trait<T> implements ISpliceable<boolean>, IDisposable {
private sortedIndexes: number[] = []; private sortedIndexes: number[] = [];
private _onChange = new Emitter<ITraitChangeEvent>(); private _onChange = new Emitter<ITraitChangeEvent>();
get onChange(): Event<ITraitChangeEvent> { return this._onChange.event; } readonly onChange: Event<ITraitChangeEvent> = this._onChange.event;
get trait(): string { return this._trait; } get trait(): string { return this._trait; }
...@@ -1165,7 +1165,7 @@ export class List<T> implements ISpliceable<T>, IDisposable { ...@@ -1165,7 +1165,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
readonly onDidBlur: Event<void>; readonly onDidBlur: Event<void>;
private _onDidDispose = new Emitter<void>(); private _onDidDispose = new Emitter<void>();
get onDidDispose(): Event<void> { return this._onDidDispose.event; } readonly onDidDispose: Event<void> = this._onDidDispose.event;
constructor( constructor(
container: HTMLElement, container: HTMLElement,
......
...@@ -74,7 +74,7 @@ export class Storage extends Disposable implements IStorage { ...@@ -74,7 +74,7 @@ export class Storage extends Disposable implements IStorage {
private static readonly DEFAULT_FLUSH_DELAY = 100; private static readonly DEFAULT_FLUSH_DELAY = 100;
private readonly _onDidChangeStorage: Emitter<string> = this._register(new Emitter<string>()); private readonly _onDidChangeStorage: Emitter<string> = this._register(new Emitter<string>());
get onDidChangeStorage(): Event<string> { return this._onDidChangeStorage.event; } readonly onDidChangeStorage: Event<string> = this._onDidChangeStorage.event;
private state = StorageState.None; private state = StorageState.None;
......
...@@ -447,13 +447,13 @@ export class TreeView extends HeightMap { ...@@ -447,13 +447,13 @@ export class TreeView extends HeightMap {
private onHiddenScrollTop: number | null = null; private onHiddenScrollTop: number | null = null;
private readonly _onDOMFocus = new Emitter<void>(); private readonly _onDOMFocus = new Emitter<void>();
get onDOMFocus(): Event<void> { return this._onDOMFocus.event; } readonly onDOMFocus: Event<void> = this._onDOMFocus.event;
private readonly _onDOMBlur = new Emitter<void>(); private readonly _onDOMBlur = new Emitter<void>();
get onDOMBlur(): Event<void> { return this._onDOMBlur.event; } readonly onDOMBlur: Event<void> = this._onDOMBlur.event;
private readonly _onDidScroll = new Emitter<void>(); private readonly _onDidScroll = new Emitter<void>();
get onDidScroll(): Event<void> { return this._onDidScroll.event; } readonly onDidScroll: Event<void> = this._onDidScroll.event;
constructor(context: _.ITreeContext, container: HTMLElement) { constructor(context: _.ITreeContext, container: HTMLElement) {
super(); super();
......
...@@ -69,7 +69,7 @@ export class FindReplaceState implements IDisposable { ...@@ -69,7 +69,7 @@ export class FindReplaceState implements IDisposable {
private _matchesPosition: number; private _matchesPosition: number;
private _matchesCount: number; private _matchesCount: number;
private _currentMatch: Range | null; private _currentMatch: Range | null;
private readonly _onFindReplaceStateChange: Emitter<FindReplaceStateChangedEvent>; private readonly _onFindReplaceStateChange = new Emitter<FindReplaceStateChangedEvent>();
public get searchString(): string { return this._searchString; } public get searchString(): string { return this._searchString; }
public get replaceString(): string { return this._replaceString; } public get replaceString(): string { return this._replaceString; }
...@@ -87,7 +87,7 @@ export class FindReplaceState implements IDisposable { ...@@ -87,7 +87,7 @@ export class FindReplaceState implements IDisposable {
public get matchesPosition(): number { return this._matchesPosition; } public get matchesPosition(): number { return this._matchesPosition; }
public get matchesCount(): number { return this._matchesCount; } public get matchesCount(): number { return this._matchesCount; }
public get currentMatch(): Range | null { return this._currentMatch; } public get currentMatch(): Range | null { return this._currentMatch; }
public get onFindReplaceStateChange(): Event<FindReplaceStateChangedEvent> { return this._onFindReplaceStateChange.event; } public readonly onFindReplaceStateChange: Event<FindReplaceStateChangedEvent> = this._onFindReplaceStateChange.event;
constructor() { constructor() {
this._searchString = ''; this._searchString = '';
...@@ -104,7 +104,6 @@ export class FindReplaceState implements IDisposable { ...@@ -104,7 +104,6 @@ export class FindReplaceState implements IDisposable {
this._matchesPosition = 0; this._matchesPosition = 0;
this._matchesCount = 0; this._matchesCount = 0;
this._currentMatch = null; this._currentMatch = null;
this._onFindReplaceStateChange = new Emitter<FindReplaceStateChangedEvent>();
} }
public dispose(): void { public dispose(): void {
......
...@@ -29,9 +29,9 @@ export class FoldingModel { ...@@ -29,9 +29,9 @@ export class FoldingModel {
private _isInitialized: boolean; private _isInitialized: boolean;
private _updateEventEmitter = new Emitter<FoldingModelChangeEvent>(); private _updateEventEmitter = new Emitter<FoldingModelChangeEvent>();
public readonly onDidChange: Event<FoldingModelChangeEvent> = this._updateEventEmitter.event;
public get regions(): FoldingRegions { return this._regions; } public get regions(): FoldingRegions { return this._regions; }
public get onDidChange(): Event<FoldingModelChangeEvent> { return this._updateEventEmitter.event; }
public get textModel() { return this._textModel; } public get textModel() { return this._textModel; }
public get isInitialized() { return this._isInitialized; } public get isInitialized() { return this._isInitialized; }
......
...@@ -17,7 +17,7 @@ export class ContextMenuService extends Disposable implements IContextMenuServic ...@@ -17,7 +17,7 @@ export class ContextMenuService extends Disposable implements IContextMenuServic
_serviceBrand: any; _serviceBrand: any;
private _onDidContextMenu = this._register(new Emitter<void>()); private _onDidContextMenu = this._register(new Emitter<void>());
get onDidContextMenu(): Event<void> { return this._onDidContextMenu.event; } readonly onDidContextMenu: Event<void> = this._onDidContextMenu.event;
private contextMenuHandler: ContextMenuHandler; private contextMenuHandler: ContextMenuHandler;
......
...@@ -32,10 +32,10 @@ export class FileService extends Disposable implements IFileService { ...@@ -32,10 +32,10 @@ export class FileService extends Disposable implements IFileService {
//#region File System Provider //#region File System Provider
private _onDidChangeFileSystemProviderRegistrations: Emitter<IFileSystemProviderRegistrationEvent> = this._register(new Emitter<IFileSystemProviderRegistrationEvent>()); private _onDidChangeFileSystemProviderRegistrations: Emitter<IFileSystemProviderRegistrationEvent> = this._register(new Emitter<IFileSystemProviderRegistrationEvent>());
get onDidChangeFileSystemProviderRegistrations(): Event<IFileSystemProviderRegistrationEvent> { return this._onDidChangeFileSystemProviderRegistrations.event; } readonly onDidChangeFileSystemProviderRegistrations: Event<IFileSystemProviderRegistrationEvent> = this._onDidChangeFileSystemProviderRegistrations.event;
private _onWillActivateFileSystemProvider: Emitter<IFileSystemProviderActivationEvent> = this._register(new Emitter<IFileSystemProviderActivationEvent>()); private _onWillActivateFileSystemProvider: Emitter<IFileSystemProviderActivationEvent> = this._register(new Emitter<IFileSystemProviderActivationEvent>());
get onWillActivateFileSystemProvider(): Event<IFileSystemProviderActivationEvent> { return this._onWillActivateFileSystemProvider.event; } readonly onWillActivateFileSystemProvider: Event<IFileSystemProviderActivationEvent> = this._onWillActivateFileSystemProvider.event;
private readonly provider = new Map<string, IFileSystemProvider>(); private readonly provider = new Map<string, IFileSystemProvider>();
...@@ -132,10 +132,10 @@ export class FileService extends Disposable implements IFileService { ...@@ -132,10 +132,10 @@ export class FileService extends Disposable implements IFileService {
//#endregion //#endregion
private _onAfterOperation: Emitter<FileOperationEvent> = this._register(new Emitter<FileOperationEvent>()); private _onAfterOperation: Emitter<FileOperationEvent> = this._register(new Emitter<FileOperationEvent>());
get onAfterOperation(): Event<FileOperationEvent> { return this._onAfterOperation.event; } readonly onAfterOperation: Event<FileOperationEvent> = this._onAfterOperation.event;
private _onError: Emitter<Error> = this._register(new Emitter<Error>()); private _onError: Emitter<Error> = this._register(new Emitter<Error>());
get onError(): Event<Error> { return this._onError.event; } readonly onError: Event<Error> = this._onError.event;
//#region File Metadata Resolving //#region File Metadata Resolving
...@@ -763,7 +763,7 @@ export class FileService extends Disposable implements IFileService { ...@@ -763,7 +763,7 @@ export class FileService extends Disposable implements IFileService {
//#region File Watching //#region File Watching
private _onFileChanges: Emitter<FileChangesEvent> = this._register(new Emitter<FileChangesEvent>()); private _onFileChanges: Emitter<FileChangesEvent> = this._register(new Emitter<FileChangesEvent>());
get onFileChanges(): Event<FileChangesEvent> { return this._onFileChanges.event; } readonly onFileChanges: Event<FileChangesEvent> = this._onFileChanges.event;
private activeWatchers = new Map<string, { disposable: IDisposable, count: number }>(); private activeWatchers = new Map<string, { disposable: IDisposable, count: number }>();
......
...@@ -367,7 +367,7 @@ export class DiskFileSystemProvider extends Disposable implements IFileSystemPro ...@@ -367,7 +367,7 @@ export class DiskFileSystemProvider extends Disposable implements IFileSystemPro
//#region File Watching //#region File Watching
private _onDidWatchErrorOccur: Emitter<string> = this._register(new Emitter<string>()); private _onDidWatchErrorOccur: Emitter<string> = this._register(new Emitter<string>());
get onDidErrorOccur(): Event<string> { return this._onDidWatchErrorOccur.event; } readonly onDidErrorOccur: Event<string> = this._onDidWatchErrorOccur.event;
private _onDidChangeFile: Emitter<IFileChange[]> = this._register(new Emitter<IFileChange[]>()); private _onDidChangeFile: Emitter<IFileChange[]> = this._register(new Emitter<IFileChange[]>());
get onDidChangeFile(): Event<IFileChange[]> { return this._onDidChangeFile.event; } get onDidChangeFile(): Event<IFileChange[]> { return this._onDidChangeFile.event; }
......
...@@ -16,13 +16,13 @@ export abstract class AbstractLifecycleService extends Disposable implements ILi ...@@ -16,13 +16,13 @@ export abstract class AbstractLifecycleService extends Disposable implements ILi
_serviceBrand: ServiceIdentifier<ILifecycleService>; _serviceBrand: ServiceIdentifier<ILifecycleService>;
protected readonly _onBeforeShutdown = this._register(new Emitter<BeforeShutdownEvent>()); protected readonly _onBeforeShutdown = this._register(new Emitter<BeforeShutdownEvent>());
get onBeforeShutdown(): Event<BeforeShutdownEvent> { return this._onBeforeShutdown.event; } readonly onBeforeShutdown: Event<BeforeShutdownEvent> = this._onBeforeShutdown.event;
protected readonly _onWillShutdown = this._register(new Emitter<WillShutdownEvent>()); protected readonly _onWillShutdown = this._register(new Emitter<WillShutdownEvent>());
get onWillShutdown(): Event<WillShutdownEvent> { return this._onWillShutdown.event; } readonly onWillShutdown: Event<WillShutdownEvent> = this._onWillShutdown.event;
protected readonly _onShutdown = this._register(new Emitter<void>()); protected readonly _onShutdown = this._register(new Emitter<void>());
get onShutdown(): Event<void> { return this._onShutdown.event; } readonly onShutdown: Event<void> = this._onShutdown.event;
protected _startupKind: StartupKind; protected _startupKind: StartupKind;
get startupKind(): StartupKind { return this._startupKind; } get startupKind(): StartupKind { return this._startupKind; }
......
...@@ -254,7 +254,7 @@ export class NoOpNotification implements INotificationHandle { ...@@ -254,7 +254,7 @@ export class NoOpNotification implements INotificationHandle {
readonly progress = new NoOpProgress(); readonly progress = new NoOpProgress();
private readonly _onDidClose: Emitter<void> = new Emitter(); private readonly _onDidClose: Emitter<void> = new Emitter();
get onDidClose(): Event<void> { return this._onDidClose.event; } readonly onDidClose: Event<void> = this._onDidClose.event;
updateSeverity(severity: Severity): void { } updateSeverity(severity: Severity): void { }
updateMessage(message: NotificationMessage): void { } updateMessage(message: NotificationMessage): void { }
......
...@@ -28,7 +28,7 @@ export class RemoteExtensionsFileSystemProvider extends Disposable implements IF ...@@ -28,7 +28,7 @@ export class RemoteExtensionsFileSystemProvider extends Disposable implements IF
readonly onDidChangeFile: Event<IFileChange[]> = this._onDidChange.event; readonly onDidChangeFile: Event<IFileChange[]> = this._onDidChange.event;
private _onDidWatchErrorOccur: Emitter<string> = this._register(new Emitter<string>()); private _onDidWatchErrorOccur: Emitter<string> = this._register(new Emitter<string>());
get onDidErrorOccur(): Event<string> { return this._onDidWatchErrorOccur.event; } readonly onDidErrorOccur: Event<string> = this._onDidWatchErrorOccur.event;
private readonly _onDidChangeCapabilities = this._register(new Emitter<void>()); private readonly _onDidChangeCapabilities = this._register(new Emitter<void>());
readonly onDidChangeCapabilities: Event<void> = this._onDidChangeCapabilities.event; readonly onDidChangeCapabilities: Event<void> = this._onDidChangeCapabilities.event;
......
...@@ -20,10 +20,10 @@ export class BrowserStorageService extends Disposable implements IStorageService ...@@ -20,10 +20,10 @@ export class BrowserStorageService extends Disposable implements IStorageService
_serviceBrand: ServiceIdentifier<any>; _serviceBrand: ServiceIdentifier<any>;
private readonly _onDidChangeStorage: Emitter<IWorkspaceStorageChangeEvent> = this._register(new Emitter<IWorkspaceStorageChangeEvent>()); private readonly _onDidChangeStorage: Emitter<IWorkspaceStorageChangeEvent> = this._register(new Emitter<IWorkspaceStorageChangeEvent>());
get onDidChangeStorage(): Event<IWorkspaceStorageChangeEvent> { return this._onDidChangeStorage.event; } readonly onDidChangeStorage: Event<IWorkspaceStorageChangeEvent> = this._onDidChangeStorage.event;
private readonly _onWillSaveState: Emitter<IWillSaveStateEvent> = this._register(new Emitter<IWillSaveStateEvent>()); private readonly _onWillSaveState: Emitter<IWillSaveStateEvent> = this._register(new Emitter<IWillSaveStateEvent>());
get onWillSaveState(): Event<IWillSaveStateEvent> { return this._onWillSaveState.event; } readonly onWillSaveState: Event<IWillSaveStateEvent> = this._onWillSaveState.event;
private globalStorage: IStorage; private globalStorage: IStorage;
private workspaceStorage: IStorage; private workspaceStorage: IStorage;
......
...@@ -126,7 +126,7 @@ export class InMemoryStorageService extends Disposable implements IStorageServic ...@@ -126,7 +126,7 @@ export class InMemoryStorageService extends Disposable implements IStorageServic
_serviceBrand = null as any; _serviceBrand = null as any;
private readonly _onDidChangeStorage: Emitter<IWorkspaceStorageChangeEvent> = this._register(new Emitter<IWorkspaceStorageChangeEvent>()); private readonly _onDidChangeStorage: Emitter<IWorkspaceStorageChangeEvent> = this._register(new Emitter<IWorkspaceStorageChangeEvent>());
get onDidChangeStorage(): Event<IWorkspaceStorageChangeEvent> { return this._onDidChangeStorage.event; } readonly onDidChangeStorage: Event<IWorkspaceStorageChangeEvent> = this._onDidChangeStorage.event;
readonly onWillSaveState = Event.None; readonly onWillSaveState = Event.None;
......
...@@ -32,7 +32,7 @@ export class GlobalStorageDatabaseChannel extends Disposable implements IServerC ...@@ -32,7 +32,7 @@ export class GlobalStorageDatabaseChannel extends Disposable implements IServerC
private static STORAGE_CHANGE_DEBOUNCE_TIME = 100; private static STORAGE_CHANGE_DEBOUNCE_TIME = 100;
private readonly _onDidChangeItems: Emitter<ISerializableItemsChangeEvent> = this._register(new Emitter<ISerializableItemsChangeEvent>()); private readonly _onDidChangeItems: Emitter<ISerializableItemsChangeEvent> = this._register(new Emitter<ISerializableItemsChangeEvent>());
get onDidChangeItems(): Event<ISerializableItemsChangeEvent> { return this._onDidChangeItems.event; } readonly onDidChangeItems: Event<ISerializableItemsChangeEvent> = this._onDidChangeItems.event;
private whenReady: Promise<void>; private whenReady: Promise<void>;
...@@ -150,7 +150,7 @@ export class GlobalStorageDatabaseChannelClient extends Disposable implements IS ...@@ -150,7 +150,7 @@ export class GlobalStorageDatabaseChannelClient extends Disposable implements IS
_serviceBrand: any; _serviceBrand: any;
private readonly _onDidChangeItemsExternal: Emitter<IStorageItemsChangeEvent> = this._register(new Emitter<IStorageItemsChangeEvent>()); private readonly _onDidChangeItemsExternal: Emitter<IStorageItemsChangeEvent> = this._register(new Emitter<IStorageItemsChangeEvent>());
get onDidChangeItemsExternal(): Event<IStorageItemsChangeEvent> { return this._onDidChangeItemsExternal.event; } readonly onDidChangeItemsExternal: Event<IStorageItemsChangeEvent> = this._onDidChangeItemsExternal.event;
private onDidChangeItemsOnMainListener: IDisposable; private onDidChangeItemsOnMainListener: IDisposable;
......
...@@ -80,10 +80,10 @@ export class StorageMainService extends Disposable implements IStorageMainServic ...@@ -80,10 +80,10 @@ export class StorageMainService extends Disposable implements IStorageMainServic
private static STORAGE_NAME = 'state.vscdb'; private static STORAGE_NAME = 'state.vscdb';
private readonly _onDidChangeStorage: Emitter<IStorageChangeEvent> = this._register(new Emitter<IStorageChangeEvent>()); private readonly _onDidChangeStorage: Emitter<IStorageChangeEvent> = this._register(new Emitter<IStorageChangeEvent>());
get onDidChangeStorage(): Event<IStorageChangeEvent> { return this._onDidChangeStorage.event; } readonly onDidChangeStorage: Event<IStorageChangeEvent> = this._onDidChangeStorage.event;
private readonly _onWillSaveState: Emitter<void> = this._register(new Emitter<void>()); private readonly _onWillSaveState: Emitter<void> = this._register(new Emitter<void>());
get onWillSaveState(): Event<void> { return this._onWillSaveState.event; } readonly onWillSaveState: Event<void> = this._onWillSaveState.event;
get items(): Map<string, string> { return this.storage.items; } get items(): Map<string, string> { return this.storage.items; }
......
...@@ -25,10 +25,10 @@ export class StorageService extends Disposable implements IStorageService { ...@@ -25,10 +25,10 @@ export class StorageService extends Disposable implements IStorageService {
private static WORKSPACE_META_NAME = 'workspace.json'; private static WORKSPACE_META_NAME = 'workspace.json';
private readonly _onDidChangeStorage: Emitter<IWorkspaceStorageChangeEvent> = this._register(new Emitter<IWorkspaceStorageChangeEvent>()); private readonly _onDidChangeStorage: Emitter<IWorkspaceStorageChangeEvent> = this._register(new Emitter<IWorkspaceStorageChangeEvent>());
get onDidChangeStorage(): Event<IWorkspaceStorageChangeEvent> { return this._onDidChangeStorage.event; } readonly onDidChangeStorage: Event<IWorkspaceStorageChangeEvent> = this._onDidChangeStorage.event;
private readonly _onWillSaveState: Emitter<IWillSaveStateEvent> = this._register(new Emitter<IWillSaveStateEvent>()); private readonly _onWillSaveState: Emitter<IWillSaveStateEvent> = this._register(new Emitter<IWillSaveStateEvent>());
get onWillSaveState(): Event<IWillSaveStateEvent> { return this._onWillSaveState.event; } readonly onWillSaveState: Event<IWillSaveStateEvent> = this._onWillSaveState.event;
private globalStorage: IStorage; private globalStorage: IStorage;
......
...@@ -14,7 +14,7 @@ export class UpdateService implements IUpdateService { ...@@ -14,7 +14,7 @@ export class UpdateService implements IUpdateService {
_serviceBrand: ServiceIdentifier<any>; _serviceBrand: ServiceIdentifier<any>;
private _onStateChange = new Emitter<State>(); private _onStateChange = new Emitter<State>();
get onStateChange(): Event<State> { return this._onStateChange.event; } readonly onStateChange: Event<State> = this._onStateChange.event;
private _state: State = State.Uninitialized; private _state: State = State.Uninitialized;
get state(): State { return this._state; } get state(): State { return this._state; }
......
...@@ -27,7 +27,7 @@ export abstract class AbstractUpdateService implements IUpdateService { ...@@ -27,7 +27,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
private _state: State = State.Uninitialized; private _state: State = State.Uninitialized;
private _onStateChange = new Emitter<State>(); private _onStateChange = new Emitter<State>();
get onStateChange(): Event<State> { return this._onStateChange.event; } readonly onStateChange: Event<State> = this._onStateChange.event;
get state(): State { get state(): State {
return this._state; return this._state;
......
...@@ -21,7 +21,7 @@ abstract class AbstractUpdateService2 implements IUpdateService { ...@@ -21,7 +21,7 @@ abstract class AbstractUpdateService2 implements IUpdateService {
private _state: State = State.Uninitialized; private _state: State = State.Uninitialized;
private _onStateChange = new Emitter<State>(); private _onStateChange = new Emitter<State>();
get onStateChange(): Event<State> { return this._onStateChange.event; } readonly onStateChange: Event<State> = this._onStateChange.event;
get state(): State { get state(): State {
return this._state; return this._state;
......
...@@ -31,7 +31,7 @@ export class WorkspacesMainService extends Disposable implements IWorkspacesMain ...@@ -31,7 +31,7 @@ export class WorkspacesMainService extends Disposable implements IWorkspacesMain
private readonly untitledWorkspacesHome: URI; // local URI that contains all untitled workspaces private readonly untitledWorkspacesHome: URI; // local URI that contains all untitled workspaces
private readonly _onUntitledWorkspaceDeleted = this._register(new Emitter<IWorkspaceIdentifier>()); private readonly _onUntitledWorkspaceDeleted = this._register(new Emitter<IWorkspaceIdentifier>());
get onUntitledWorkspaceDeleted(): Event<IWorkspaceIdentifier> { return this._onUntitledWorkspaceDeleted.event; } readonly onUntitledWorkspaceDeleted: Event<IWorkspaceIdentifier> = this._onUntitledWorkspaceDeleted.event;
constructor( constructor(
@IEnvironmentService private readonly environmentService: IEnvironmentService, @IEnvironmentService private readonly environmentService: IEnvironmentService,
......
...@@ -57,7 +57,7 @@ export class MainThreadCommentThread implements modes.CommentThread { ...@@ -57,7 +57,7 @@ export class MainThreadCommentThread implements modes.CommentThread {
} }
private _onDidChangeLabel = new Emitter<string>(); private _onDidChangeLabel = new Emitter<string>();
get onDidChangeLabel(): Event<string> { return this._onDidChangeLabel.event; } readonly onDidChangeLabel: Event<string> = this._onDidChangeLabel.event;
private _comments: modes.Comment[] | undefined; private _comments: modes.Comment[] | undefined;
......
...@@ -24,7 +24,7 @@ class MainThreadSCMResourceGroup implements ISCMResourceGroup { ...@@ -24,7 +24,7 @@ class MainThreadSCMResourceGroup implements ISCMResourceGroup {
get hideWhenEmpty(): boolean { return !!this.features.hideWhenEmpty; } get hideWhenEmpty(): boolean { return !!this.features.hideWhenEmpty; }
private _onDidChange = new Emitter<void>(); private _onDidChange = new Emitter<void>();
get onDidChange(): Event<void> { return this._onDidChange.event; } readonly onDidChange: Event<void> = this._onDidChange.event;
constructor( constructor(
private readonly sourceControlHandle: number, private readonly sourceControlHandle: number,
...@@ -105,7 +105,7 @@ class MainThreadSCMProvider implements ISCMProvider { ...@@ -105,7 +105,7 @@ class MainThreadSCMProvider implements ISCMProvider {
// } // }
private _onDidChangeResources = new Emitter<void>(); private _onDidChangeResources = new Emitter<void>();
get onDidChangeResources(): Event<void> { return this._onDidChangeResources.event; } readonly onDidChangeResources: Event<void> = this._onDidChangeResources.event;
private features: SCMProviderFeatures = {}; private features: SCMProviderFeatures = {};
...@@ -120,13 +120,13 @@ class MainThreadSCMProvider implements ISCMProvider { ...@@ -120,13 +120,13 @@ class MainThreadSCMProvider implements ISCMProvider {
get count(): number | undefined { return this.features.count; } get count(): number | undefined { return this.features.count; }
private _onDidChangeCommitTemplate = new Emitter<string>(); private _onDidChangeCommitTemplate = new Emitter<string>();
get onDidChangeCommitTemplate(): Event<string> { return this._onDidChangeCommitTemplate.event; } readonly onDidChangeCommitTemplate: Event<string> = this._onDidChangeCommitTemplate.event;
private _onDidChangeStatusBarCommands = new Emitter<Command[]>(); private _onDidChangeStatusBarCommands = new Emitter<Command[]>();
get onDidChangeStatusBarCommands(): Event<Command[]> { return this._onDidChangeStatusBarCommands.event; } get onDidChangeStatusBarCommands(): Event<Command[]> { return this._onDidChangeStatusBarCommands.event; }
private _onDidChange = new Emitter<void>(); private _onDidChange = new Emitter<void>();
get onDidChange(): Event<void> { return this._onDidChange.event; } readonly onDidChange: Event<void> = this._onDidChange.event;
constructor( constructor(
private readonly proxy: ExtHostSCMShape, private readonly proxy: ExtHostSCMShape,
......
...@@ -726,13 +726,13 @@ class ExtHostVirtualProcess implements ITerminalChildProcess { ...@@ -726,13 +726,13 @@ class ExtHostVirtualProcess implements ITerminalChildProcess {
private _queueDisposables: IDisposable[] | undefined; private _queueDisposables: IDisposable[] | undefined;
private readonly _onProcessData = new Emitter<string>(); private readonly _onProcessData = new Emitter<string>();
public get onProcessData(): Event<string> { return this._onProcessData.event; } public readonly onProcessData: Event<string> = this._onProcessData.event;
private readonly _onProcessExit = new Emitter<number>(); private readonly _onProcessExit = new Emitter<number>();
public get onProcessExit(): Event<number> { return this._onProcessExit.event; } public readonly onProcessExit: Event<number> = this._onProcessExit.event;
private readonly _onProcessReady = new Emitter<{ pid: number, cwd: string }>(); private readonly _onProcessReady = new Emitter<{ pid: number, cwd: string }>();
public get onProcessReady(): Event<{ pid: number, cwd: string }> { return this._onProcessReady.event; } public get onProcessReady(): Event<{ pid: number, cwd: string }> { return this._onProcessReady.event; }
private readonly _onProcessTitleChanged = new Emitter<string>(); private readonly _onProcessTitleChanged = new Emitter<string>();
public get onProcessTitleChanged(): Event<string> { return this._onProcessTitleChanged.event; } public readonly onProcessTitleChanged: Event<string> = this._onProcessTitleChanged.event;
private readonly _onProcessOverrideDimensions = new Emitter<ITerminalDimensions | undefined>(); private readonly _onProcessOverrideDimensions = new Emitter<ITerminalDimensions | undefined>();
public get onProcessOverrideDimensions(): Event<ITerminalDimensions | undefined> { return this._onProcessOverrideDimensions.event; } public get onProcessOverrideDimensions(): Event<ITerminalDimensions | undefined> { return this._onProcessOverrideDimensions.event; }
......
...@@ -30,10 +30,10 @@ import { Disposable } from 'vs/base/common/lifecycle'; ...@@ -30,10 +30,10 @@ import { Disposable } from 'vs/base/common/lifecycle';
export abstract class Composite extends Component implements IComposite { export abstract class Composite extends Component implements IComposite {
private readonly _onTitleAreaUpdate: Emitter<void> = this._register(new Emitter<void>()); private readonly _onTitleAreaUpdate: Emitter<void> = this._register(new Emitter<void>());
get onTitleAreaUpdate(): Event<void> { return this._onTitleAreaUpdate.event; } readonly onTitleAreaUpdate: Event<void> = this._onTitleAreaUpdate.event;
private readonly _onDidChangeVisibility: Emitter<boolean> = this._register(new Emitter<boolean>()); private readonly _onDidChangeVisibility: Emitter<boolean> = this._register(new Emitter<boolean>());
get onDidChangeVisibility(): Event<boolean> { return this._onDidChangeVisibility.event; } readonly onDidChangeVisibility: Event<boolean> = this._onDidChangeVisibility.event;
private _onDidFocus: Emitter<void>; private _onDidFocus: Emitter<void>;
get onDidFocus(): Event<void> { get onDidFocus(): Event<void> {
......
...@@ -239,7 +239,7 @@ enum Redraw { ...@@ -239,7 +239,7 @@ enum Redraw {
class ResourceLabelWidget extends IconLabel { class ResourceLabelWidget extends IconLabel {
private _onDidRender = this._register(new Emitter<void>()); private _onDidRender = this._register(new Emitter<void>());
get onDidRender(): Event<void> { return this._onDidRender.event; } readonly onDidRender: Event<void> = this._onDidRender.event;
private label?: IResourceLabelProps; private label?: IResourceLabelProps;
private options?: IResourceLabelOptions; private options?: IResourceLabelOptions;
......
...@@ -63,22 +63,22 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi ...@@ -63,22 +63,22 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
_serviceBrand: ServiceIdentifier<any>; _serviceBrand: ServiceIdentifier<any>;
private readonly _onTitleBarVisibilityChange: Emitter<void> = this._register(new Emitter<void>()); private readonly _onTitleBarVisibilityChange: Emitter<void> = this._register(new Emitter<void>());
get onTitleBarVisibilityChange(): Event<void> { return this._onTitleBarVisibilityChange.event; } readonly onTitleBarVisibilityChange: Event<void> = this._onTitleBarVisibilityChange.event;
private readonly _onZenModeChange: Emitter<boolean> = this._register(new Emitter<boolean>()); private readonly _onZenModeChange: Emitter<boolean> = this._register(new Emitter<boolean>());
get onZenModeChange(): Event<boolean> { return this._onZenModeChange.event; } readonly onZenModeChange: Event<boolean> = this._onZenModeChange.event;
private readonly _onFullscreenChange: Emitter<boolean> = this._register(new Emitter<boolean>()); private readonly _onFullscreenChange: Emitter<boolean> = this._register(new Emitter<boolean>());
get onFullscreenChange(): Event<boolean> { return this._onFullscreenChange.event; } readonly onFullscreenChange: Event<boolean> = this._onFullscreenChange.event;
private readonly _onCenteredLayoutChange: Emitter<boolean> = this._register(new Emitter<boolean>()); private readonly _onCenteredLayoutChange: Emitter<boolean> = this._register(new Emitter<boolean>());
get onCenteredLayoutChange(): Event<boolean> { return this._onCenteredLayoutChange.event; } readonly onCenteredLayoutChange: Event<boolean> = this._onCenteredLayoutChange.event;
private readonly _onPanelPositionChange: Emitter<string> = this._register(new Emitter<string>()); private readonly _onPanelPositionChange: Emitter<string> = this._register(new Emitter<string>());
get onPanelPositionChange(): Event<string> { return this._onPanelPositionChange.event; } readonly onPanelPositionChange: Event<string> = this._onPanelPositionChange.event;
private readonly _onLayout = this._register(new Emitter<IDimension>()); private readonly _onLayout = this._register(new Emitter<IDimension>());
get onLayout(): Event<IDimension> { return this._onLayout.event; } readonly onLayout: Event<IDimension> = this._onLayout.event;
private _dimension: IDimension; private _dimension: IDimension;
get dimension(): IDimension { return this._dimension; } get dimension(): IDimension { return this._dimension; }
......
...@@ -52,10 +52,10 @@ export interface ICompositeBar { ...@@ -52,10 +52,10 @@ export interface ICompositeBar {
export class ActivityAction extends Action { export class ActivityAction extends Action {
private _onDidChangeActivity = new Emitter<this>(); private _onDidChangeActivity = new Emitter<this>();
get onDidChangeActivity(): Event<this> { return this._onDidChangeActivity.event; } readonly onDidChangeActivity: Event<this> = this._onDidChangeActivity.event;
private _onDidChangeBadge = new Emitter<this>(); private _onDidChangeBadge = new Emitter<this>();
get onDidChangeBadge(): Event<this> { return this._onDidChangeBadge.event; } readonly onDidChangeBadge: Event<this> = this._onDidChangeBadge.event;
private badge?: IBadge; private badge?: IBadge;
private clazz: string | undefined; private clazz: string | undefined;
......
...@@ -33,10 +33,10 @@ export interface IOpenCallbacks { ...@@ -33,10 +33,10 @@ export interface IOpenCallbacks {
export abstract class BaseBinaryResourceEditor extends BaseEditor { export abstract class BaseBinaryResourceEditor extends BaseEditor {
private readonly _onMetadataChanged: Emitter<void> = this._register(new Emitter<void>()); private readonly _onMetadataChanged: Emitter<void> = this._register(new Emitter<void>());
get onMetadataChanged(): Event<void> { return this._onMetadataChanged.event; } readonly onMetadataChanged: Event<void> = this._onMetadataChanged.event;
private readonly _onDidOpenInPlace: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidOpenInPlace: Emitter<void> = this._register(new Emitter<void>());
get onDidOpenInPlace(): Event<void> { return this._onDidOpenInPlace.event; } readonly onDidOpenInPlace: Event<void> = this._onDidOpenInPlace.event;
private callbacks: IOpenCallbacks; private callbacks: IOpenCallbacks;
private metadata: string | undefined; private metadata: string | undefined;
......
...@@ -30,7 +30,7 @@ export class EditorControl extends Disposable { ...@@ -30,7 +30,7 @@ export class EditorControl extends Disposable {
get maximumHeight() { return this._activeControl ? this._activeControl.maximumHeight : DEFAULT_EDITOR_MAX_DIMENSIONS.height; } get maximumHeight() { return this._activeControl ? this._activeControl.maximumHeight : DEFAULT_EDITOR_MAX_DIMENSIONS.height; }
private readonly _onDidFocus: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidFocus: Emitter<void> = this._register(new Emitter<void>());
get onDidFocus(): Event<void> { return this._onDidFocus.event; } readonly onDidFocus: Event<void> = this._onDidFocus.event;
private _onDidSizeConstraintsChange = this._register(new Emitter<{ width: number; height: number; } | undefined>()); private _onDidSizeConstraintsChange = this._register(new Emitter<{ width: number; height: number; } | undefined>());
get onDidSizeConstraintsChange(): Event<{ width: number; height: number; } | undefined> { return this._onDidSizeConstraintsChange.event; } get onDidSizeConstraintsChange(): Event<{ width: number; height: number; } | undefined> { return this._onDidSizeConstraintsChange.event; }
......
...@@ -71,25 +71,25 @@ export class EditorGroupView extends Themable implements IEditorGroupView { ...@@ -71,25 +71,25 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
//#region events //#region events
private readonly _onDidFocus: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidFocus: Emitter<void> = this._register(new Emitter<void>());
get onDidFocus(): Event<void> { return this._onDidFocus.event; } readonly onDidFocus: Event<void> = this._onDidFocus.event;
private readonly _onWillDispose: Emitter<void> = this._register(new Emitter<void>()); private readonly _onWillDispose: Emitter<void> = this._register(new Emitter<void>());
get onWillDispose(): Event<void> { return this._onWillDispose.event; } readonly onWillDispose: Event<void> = this._onWillDispose.event;
private readonly _onDidGroupChange: Emitter<IGroupChangeEvent> = this._register(new Emitter<IGroupChangeEvent>()); private readonly _onDidGroupChange: Emitter<IGroupChangeEvent> = this._register(new Emitter<IGroupChangeEvent>());
get onDidGroupChange(): Event<IGroupChangeEvent> { return this._onDidGroupChange.event; } readonly onDidGroupChange: Event<IGroupChangeEvent> = this._onDidGroupChange.event;
private readonly _onWillOpenEditor: Emitter<IEditorOpeningEvent> = this._register(new Emitter<IEditorOpeningEvent>()); private readonly _onWillOpenEditor: Emitter<IEditorOpeningEvent> = this._register(new Emitter<IEditorOpeningEvent>());
get onWillOpenEditor(): Event<IEditorOpeningEvent> { return this._onWillOpenEditor.event; } readonly onWillOpenEditor: Event<IEditorOpeningEvent> = this._onWillOpenEditor.event;
private readonly _onDidOpenEditorFail: Emitter<EditorInput> = this._register(new Emitter<EditorInput>()); private readonly _onDidOpenEditorFail: Emitter<EditorInput> = this._register(new Emitter<EditorInput>());
get onDidOpenEditorFail(): Event<EditorInput> { return this._onDidOpenEditorFail.event; } readonly onDidOpenEditorFail: Event<EditorInput> = this._onDidOpenEditorFail.event;
private readonly _onWillCloseEditor: Emitter<IEditorCloseEvent> = this._register(new Emitter<IEditorCloseEvent>()); private readonly _onWillCloseEditor: Emitter<IEditorCloseEvent> = this._register(new Emitter<IEditorCloseEvent>());
get onWillCloseEditor(): Event<IEditorCloseEvent> { return this._onWillCloseEditor.event; } readonly onWillCloseEditor: Event<IEditorCloseEvent> = this._onWillCloseEditor.event;
private readonly _onDidCloseEditor: Emitter<IEditorCloseEvent> = this._register(new Emitter<IEditorCloseEvent>()); private readonly _onDidCloseEditor: Emitter<IEditorCloseEvent> = this._register(new Emitter<IEditorCloseEvent>());
get onDidCloseEditor(): Event<IEditorCloseEvent> { return this._onDidCloseEditor.event; } readonly onDidCloseEditor: Event<IEditorCloseEvent> = this._onDidCloseEditor.event;
//#endregion //#endregion
......
...@@ -91,29 +91,29 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro ...@@ -91,29 +91,29 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
//#region Events //#region Events
private readonly _onDidLayout: Emitter<Dimension> = this._register(new Emitter<Dimension>()); private readonly _onDidLayout: Emitter<Dimension> = this._register(new Emitter<Dimension>());
get onDidLayout(): Event<Dimension> { return this._onDidLayout.event; } readonly onDidLayout: Event<Dimension> = this._onDidLayout.event;
private readonly _onDidActiveGroupChange: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>()); private readonly _onDidActiveGroupChange: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
get onDidActiveGroupChange(): Event<IEditorGroupView> { return this._onDidActiveGroupChange.event; } readonly onDidActiveGroupChange: Event<IEditorGroupView> = this._onDidActiveGroupChange.event;
private readonly _onDidActivateGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>()); private readonly _onDidActivateGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
get onDidActivateGroup(): Event<IEditorGroupView> { return this._onDidActivateGroup.event; } readonly onDidActivateGroup: Event<IEditorGroupView> = this._onDidActivateGroup.event;
private readonly _onDidAddGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>()); private readonly _onDidAddGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
get onDidAddGroup(): Event<IEditorGroupView> { return this._onDidAddGroup.event; } readonly onDidAddGroup: Event<IEditorGroupView> = this._onDidAddGroup.event;
private readonly _onDidRemoveGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>()); private readonly _onDidRemoveGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
get onDidRemoveGroup(): Event<IEditorGroupView> { return this._onDidRemoveGroup.event; } readonly onDidRemoveGroup: Event<IEditorGroupView> = this._onDidRemoveGroup.event;
private readonly _onDidMoveGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>()); private readonly _onDidMoveGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
get onDidMoveGroup(): Event<IEditorGroupView> { return this._onDidMoveGroup.event; } readonly onDidMoveGroup: Event<IEditorGroupView> = this._onDidMoveGroup.event;
private onDidSetGridWidget = this._register(new Emitter<{ width: number; height: number; } | undefined>()); private onDidSetGridWidget = this._register(new Emitter<{ width: number; height: number; } | undefined>());
private _onDidSizeConstraintsChange = this._register(new Relay<{ 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); } get onDidSizeConstraintsChange(): Event<{ width: number; height: number; } | undefined> { return Event.any(this.onDidSetGridWidget.event, this._onDidSizeConstraintsChange.event); }
private readonly _onDidPreferredSizeChange: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidPreferredSizeChange: Emitter<void> = this._register(new Emitter<void>());
get onDidPreferredSizeChange(): Event<void> { return this._onDidPreferredSizeChange.event; } readonly onDidPreferredSizeChange: Event<void> = this._onDidPreferredSizeChange.event;
//#endregion //#endregion
...@@ -162,7 +162,7 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro ...@@ -162,7 +162,7 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
private enforcedPartOptions: IEditorPartOptions[] = []; private enforcedPartOptions: IEditorPartOptions[] = [];
private readonly _onDidEditorPartOptionsChange: Emitter<IEditorPartOptionsChangeEvent> = this._register(new Emitter<IEditorPartOptionsChangeEvent>()); private readonly _onDidEditorPartOptionsChange: Emitter<IEditorPartOptionsChangeEvent> = this._register(new Emitter<IEditorPartOptionsChangeEvent>());
get onDidEditorPartOptionsChange(): Event<IEditorPartOptionsChangeEvent> { return this._onDidEditorPartOptionsChange.event; } readonly onDidEditorPartOptionsChange: Event<IEditorPartOptionsChangeEvent> = this._onDidEditorPartOptionsChange.event;
private registerListeners(): void { private registerListeners(): void {
this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e))); this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e)));
......
...@@ -24,7 +24,7 @@ import { IFileService } from 'vs/platform/files/common/files'; ...@@ -24,7 +24,7 @@ import { IFileService } from 'vs/platform/files/common/files';
export class FloatingClickWidget extends Widget implements IOverlayWidget { export class FloatingClickWidget extends Widget implements IOverlayWidget {
private readonly _onClick: Emitter<void> = this._register(new Emitter<void>()); private readonly _onClick: Emitter<void> = this._register(new Emitter<void>());
get onClick(): Event<void> { return this._onClick.event; } readonly onClick: Event<void> = this._onClick.event;
private _domNode: HTMLElement; private _domNode: HTMLElement;
......
...@@ -26,7 +26,7 @@ export class RangeHighlightDecorations extends Disposable { ...@@ -26,7 +26,7 @@ export class RangeHighlightDecorations extends Disposable {
private readonly editorDisposables = this._register(new DisposableStore()); private readonly editorDisposables = this._register(new DisposableStore());
private readonly _onHighlightRemoved: Emitter<void> = this._register(new Emitter<void>()); private readonly _onHighlightRemoved: Emitter<void> = this._register(new Emitter<void>());
get onHighlightRemoved(): Event<void> { return this._onHighlightRemoved.event; } readonly onHighlightRemoved: Event<void> = this._onHighlightRemoved.event;
constructor(@IEditorService private readonly editorService: IEditorService) { constructor(@IEditorService private readonly editorService: IEditorService) {
super(); super();
......
...@@ -28,7 +28,7 @@ export class NotificationsCenter extends Themable { ...@@ -28,7 +28,7 @@ export class NotificationsCenter extends Themable {
private static MAX_DIMENSIONS = new Dimension(450, 400); private static MAX_DIMENSIONS = new Dimension(450, 400);
private readonly _onDidChangeVisibility: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidChangeVisibility: Emitter<void> = this._register(new Emitter<void>());
get onDidChangeVisibility(): Event<void> { return this._onDidChangeVisibility.event; } readonly onDidChangeVisibility: Event<void> = this._onDidChangeVisibility.event;
private notificationsCenterContainer: HTMLElement; private notificationsCenterContainer: HTMLElement;
private notificationsCenterHeader: HTMLElement; private notificationsCenterHeader: HTMLElement;
......
...@@ -62,10 +62,10 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService { ...@@ -62,10 +62,10 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
//#endregion //#endregion
get onDidPanelOpen(): Event<{ panel: IPanel, focus: boolean }> { return Event.map(this.onDidCompositeOpen.event, compositeOpen => ({ panel: compositeOpen.composite, focus: compositeOpen.focus })); } get onDidPanelOpen(): Event<{ panel: IPanel, focus: boolean }> { return Event.map(this.onDidCompositeOpen.event, compositeOpen => ({ panel: compositeOpen.composite, focus: compositeOpen.focus })); }
get onDidPanelClose(): Event<IPanel> { return this.onDidCompositeClose.event; } readonly onDidPanelClose: Event<IPanel> = this.onDidCompositeClose.event;
private _onDidVisibilityChange = this._register(new Emitter<boolean>()); private _onDidVisibilityChange = this._register(new Emitter<boolean>());
get onDidVisibilityChange(): Event<boolean> { return this._onDidVisibilityChange.event; } readonly onDidVisibilityChange: Event<boolean> = this._onDidVisibilityChange.event;
private activePanelContextKey: IContextKey<string>; private activePanelContextKey: IContextKey<string>;
private panelFocusContextKey: IContextKey<boolean>; private panelFocusContextKey: IContextKey<boolean>;
......
...@@ -64,10 +64,10 @@ export class QuickOpenController extends Component implements IQuickOpenService ...@@ -64,10 +64,10 @@ export class QuickOpenController extends Component implements IQuickOpenService
_serviceBrand: ServiceIdentifier<any>; _serviceBrand: ServiceIdentifier<any>;
private readonly _onShow: Emitter<void> = this._register(new Emitter<void>()); private readonly _onShow: Emitter<void> = this._register(new Emitter<void>());
get onShow(): Event<void> { return this._onShow.event; } readonly onShow: Event<void> = this._onShow.event;
private readonly _onHide: Emitter<void> = this._register(new Emitter<void>()); private readonly _onHide: Emitter<void> = this._register(new Emitter<void>());
get onHide(): Event<void> { return this._onHide.event; } readonly onHide: Event<void> = this._onHide.event;
private preserveInput: boolean; private preserveInput: boolean;
private isQuickOpen: boolean; private isQuickOpen: boolean;
......
...@@ -52,10 +52,10 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi ...@@ -52,10 +52,10 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi
get onDidViewletRegister(): Event<ViewletDescriptor> { return <Event<ViewletDescriptor>>this.viewletRegistry.onDidRegister; } get onDidViewletRegister(): Event<ViewletDescriptor> { return <Event<ViewletDescriptor>>this.viewletRegistry.onDidRegister; }
private _onDidVisibilityChange = this._register(new Emitter<boolean>()); private _onDidVisibilityChange = this._register(new Emitter<boolean>());
get onDidVisibilityChange(): Event<boolean> { return this._onDidVisibilityChange.event; } readonly onDidVisibilityChange: Event<boolean> = this._onDidVisibilityChange.event;
private _onDidViewletDeregister = this._register(new Emitter<ViewletDescriptor>()); private _onDidViewletDeregister = this._register(new Emitter<ViewletDescriptor>());
get onDidViewletDeregister(): Event<ViewletDescriptor> { return this._onDidViewletDeregister.event; } readonly onDidViewletDeregister: Event<ViewletDescriptor> = this._onDidViewletDeregister.event;
get onDidViewletOpen(): Event<IViewlet> { return Event.map(this.onDidCompositeOpen.event, compositeEvent => <IViewlet>compositeEvent.composite); } get onDidViewletOpen(): Event<IViewlet> { return Event.map(this.onDidCompositeOpen.event, compositeEvent => <IViewlet>compositeEvent.composite); }
get onDidViewletClose(): Event<IViewlet> { return this.onDidCompositeClose.event as Event<IViewlet>; } get onDidViewletClose(): Event<IViewlet> { return this.onDidCompositeClose.event as Event<IViewlet>; }
......
...@@ -56,7 +56,7 @@ export class TitlebarPart extends Part implements ITitleService { ...@@ -56,7 +56,7 @@ export class TitlebarPart extends Part implements ITitleService {
//#endregion //#endregion
private _onMenubarVisibilityChange = this._register(new Emitter<boolean>()); private _onMenubarVisibilityChange = this._register(new Emitter<boolean>());
get onMenubarVisibilityChange(): Event<boolean> { return this._onMenubarVisibilityChange.event; } readonly onMenubarVisibilityChange: Event<boolean> = this._onMenubarVisibilityChange.event;
_serviceBrand: ServiceIdentifier<any>; _serviceBrand: ServiceIdentifier<any>;
......
...@@ -108,7 +108,7 @@ class TitleMenus extends Disposable { ...@@ -108,7 +108,7 @@ class TitleMenus extends Disposable {
private titleSecondaryActions: IAction[] = []; private titleSecondaryActions: IAction[] = [];
private _onDidChangeTitle = this._register(new Emitter<void>()); private _onDidChangeTitle = this._register(new Emitter<void>());
get onDidChangeTitle(): Event<void> { return this._onDidChangeTitle.event; } readonly onDidChangeTitle: Event<void> = this._onDidChangeTitle.event;
constructor( constructor(
id: string, id: string,
......
...@@ -48,10 +48,10 @@ import { Layout } from 'vs/workbench/browser/layout'; ...@@ -48,10 +48,10 @@ import { Layout } from 'vs/workbench/browser/layout';
export class Workbench extends Layout { export class Workbench extends Layout {
private readonly _onShutdown = this._register(new Emitter<void>()); private readonly _onShutdown = this._register(new Emitter<void>());
get onShutdown(): Event<void> { return this._onShutdown.event; } readonly onShutdown: Event<void> = this._onShutdown.event;
private readonly _onWillShutdown = this._register(new Emitter<WillShutdownEvent>()); private readonly _onWillShutdown = this._register(new Emitter<WillShutdownEvent>());
get onWillShutdown(): Event<WillShutdownEvent> { return this._onWillShutdown.event; } readonly onWillShutdown: Event<WillShutdownEvent> = this._onWillShutdown.event;
constructor( constructor(
parent: HTMLElement, parent: HTMLElement,
......
...@@ -330,13 +330,13 @@ export interface IEditorInput extends IDisposable { ...@@ -330,13 +330,13 @@ export interface IEditorInput extends IDisposable {
export abstract class EditorInput extends Disposable implements IEditorInput { export abstract class EditorInput extends Disposable implements IEditorInput {
protected readonly _onDidChangeDirty: Emitter<void> = this._register(new Emitter<void>()); protected readonly _onDidChangeDirty: Emitter<void> = this._register(new Emitter<void>());
get onDidChangeDirty(): Event<void> { return this._onDidChangeDirty.event; } readonly onDidChangeDirty: Event<void> = this._onDidChangeDirty.event;
protected readonly _onDidChangeLabel: Emitter<void> = this._register(new Emitter<void>()); protected readonly _onDidChangeLabel: Emitter<void> = this._register(new Emitter<void>());
get onDidChangeLabel(): Event<void> { return this._onDidChangeLabel.event; } readonly onDidChangeLabel: Event<void> = this._onDidChangeLabel.event;
private readonly _onDispose: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDispose: Emitter<void> = this._register(new Emitter<void>());
get onDispose(): Event<void> { return this._onDispose.event; } readonly onDispose: Event<void> = this._onDispose.event;
private disposed: boolean = false; private disposed: boolean = false;
...@@ -658,7 +658,7 @@ export interface ITextEditorModel extends IEditorModel { ...@@ -658,7 +658,7 @@ export interface ITextEditorModel extends IEditorModel {
export class EditorModel extends Disposable implements IEditorModel { export class EditorModel extends Disposable implements IEditorModel {
private readonly _onDispose: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDispose: Emitter<void> = this._register(new Emitter<void>());
get onDispose(): Event<void> { return this._onDispose.event; } readonly onDispose: Event<void> = this._onDispose.event;
/** /**
* Causes this model to load returning a promise when loading is completed. * Causes this model to load returning a promise when loading is completed.
......
...@@ -60,31 +60,31 @@ export class EditorGroup extends Disposable { ...@@ -60,31 +60,31 @@ export class EditorGroup extends Disposable {
//#region events //#region events
private readonly _onDidEditorActivate = this._register(new Emitter<EditorInput>()); private readonly _onDidEditorActivate = this._register(new Emitter<EditorInput>());
get onDidEditorActivate(): Event<EditorInput> { return this._onDidEditorActivate.event; } readonly onDidEditorActivate: Event<EditorInput> = this._onDidEditorActivate.event;
private readonly _onDidEditorOpen = this._register(new Emitter<EditorInput>()); private readonly _onDidEditorOpen = this._register(new Emitter<EditorInput>());
get onDidEditorOpen(): Event<EditorInput> { return this._onDidEditorOpen.event; } readonly onDidEditorOpen: Event<EditorInput> = this._onDidEditorOpen.event;
private readonly _onDidEditorClose = this._register(new Emitter<EditorCloseEvent>()); private readonly _onDidEditorClose = this._register(new Emitter<EditorCloseEvent>());
get onDidEditorClose(): Event<EditorCloseEvent> { return this._onDidEditorClose.event; } readonly onDidEditorClose: Event<EditorCloseEvent> = this._onDidEditorClose.event;
private readonly _onDidEditorDispose = this._register(new Emitter<EditorInput>()); private readonly _onDidEditorDispose = this._register(new Emitter<EditorInput>());
get onDidEditorDispose(): Event<EditorInput> { return this._onDidEditorDispose.event; } readonly onDidEditorDispose: Event<EditorInput> = this._onDidEditorDispose.event;
private readonly _onDidEditorBecomeDirty = this._register(new Emitter<EditorInput>()); private readonly _onDidEditorBecomeDirty = this._register(new Emitter<EditorInput>());
get onDidEditorBecomeDirty(): Event<EditorInput> { return this._onDidEditorBecomeDirty.event; } readonly onDidEditorBecomeDirty: Event<EditorInput> = this._onDidEditorBecomeDirty.event;
private readonly _onDidEditorLabelChange = this._register(new Emitter<EditorInput>()); private readonly _onDidEditorLabelChange = this._register(new Emitter<EditorInput>());
get onDidEditorLabelChange(): Event<EditorInput> { return this._onDidEditorLabelChange.event; } readonly onDidEditorLabelChange: Event<EditorInput> = this._onDidEditorLabelChange.event;
private readonly _onDidEditorMove = this._register(new Emitter<EditorInput>()); private readonly _onDidEditorMove = this._register(new Emitter<EditorInput>());
get onDidEditorMove(): Event<EditorInput> { return this._onDidEditorMove.event; } readonly onDidEditorMove: Event<EditorInput> = this._onDidEditorMove.event;
private readonly _onDidEditorPin = this._register(new Emitter<EditorInput>()); private readonly _onDidEditorPin = this._register(new Emitter<EditorInput>());
get onDidEditorPin(): Event<EditorInput> { return this._onDidEditorPin.event; } readonly onDidEditorPin: Event<EditorInput> = this._onDidEditorPin.event;
private readonly _onDidEditorUnpin = this._register(new Emitter<EditorInput>()); private readonly _onDidEditorUnpin = this._register(new Emitter<EditorInput>());
get onDidEditorUnpin(): Event<EditorInput> { return this._onDidEditorUnpin.event; } readonly onDidEditorUnpin: Event<EditorInput> = this._onDidEditorUnpin.event;
//#endregion //#endregion
......
...@@ -28,10 +28,10 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport ...@@ -28,10 +28,10 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
private modelResolve: Promise<UntitledEditorModel & IResolvedTextEditorModel> | null; private modelResolve: Promise<UntitledEditorModel & IResolvedTextEditorModel> | null;
private readonly _onDidModelChangeContent: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidModelChangeContent: Emitter<void> = this._register(new Emitter<void>());
get onDidModelChangeContent(): Event<void> { return this._onDidModelChangeContent.event; } readonly onDidModelChangeContent: Event<void> = this._onDidModelChangeContent.event;
private readonly _onDidModelChangeEncoding: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidModelChangeEncoding: Emitter<void> = this._register(new Emitter<void>());
get onDidModelChangeEncoding(): Event<void> { return this._onDidModelChangeEncoding.event; } readonly onDidModelChangeEncoding: Event<void> = this._onDidModelChangeEncoding.event;
constructor( constructor(
private readonly resource: URI, private readonly resource: URI,
......
...@@ -22,13 +22,13 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin ...@@ -22,13 +22,13 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY; static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY;
private readonly _onDidChangeContent: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidChangeContent: Emitter<void> = this._register(new Emitter<void>());
get onDidChangeContent(): Event<void> { return this._onDidChangeContent.event; } readonly onDidChangeContent: Event<void> = this._onDidChangeContent.event;
private readonly _onDidChangeDirty: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidChangeDirty: Emitter<void> = this._register(new Emitter<void>());
get onDidChangeDirty(): Event<void> { return this._onDidChangeDirty.event; } readonly onDidChangeDirty: Event<void> = this._onDidChangeDirty.event;
private readonly _onDidChangeEncoding: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidChangeEncoding: Emitter<void> = this._register(new Emitter<void>());
get onDidChangeEncoding(): Event<void> { return this._onDidChangeEncoding.event; } readonly onDidChangeEncoding: Event<void> = this._onDidChangeEncoding.event;
private dirty: boolean = false; private dirty: boolean = false;
private versionId: number = 0; private versionId: number = 0;
......
...@@ -86,7 +86,7 @@ export interface IStatusMessageChangeEvent { ...@@ -86,7 +86,7 @@ export interface IStatusMessageChangeEvent {
export class NotificationHandle implements INotificationHandle { export class NotificationHandle implements INotificationHandle {
private readonly _onDidClose: Emitter<void> = new Emitter(); private readonly _onDidClose: Emitter<void> = new Emitter();
get onDidClose(): Event<void> { return this._onDidClose.event; } readonly onDidClose: Event<void> = this._onDidClose.event;
constructor(private readonly item: INotificationViewItem, private readonly closeItem: (item: INotificationViewItem) => void) { constructor(private readonly item: INotificationViewItem, private readonly closeItem: (item: INotificationViewItem) => void) {
this.registerListeners(); this.registerListeners();
...@@ -126,10 +126,10 @@ export class NotificationsModel extends Disposable implements INotificationsMode ...@@ -126,10 +126,10 @@ export class NotificationsModel extends Disposable implements INotificationsMode
private static NO_OP_NOTIFICATION = new NoOpNotification(); private static NO_OP_NOTIFICATION = new NoOpNotification();
private readonly _onDidNotificationChange: Emitter<INotificationChangeEvent> = this._register(new Emitter<INotificationChangeEvent>()); private readonly _onDidNotificationChange: Emitter<INotificationChangeEvent> = this._register(new Emitter<INotificationChangeEvent>());
get onDidNotificationChange(): Event<INotificationChangeEvent> { return this._onDidNotificationChange.event; } readonly onDidNotificationChange: Event<INotificationChangeEvent> = this._onDidNotificationChange.event;
private readonly _onDidStatusMessageChange: Emitter<IStatusMessageChangeEvent> = this._register(new Emitter<IStatusMessageChangeEvent>()); private readonly _onDidStatusMessageChange: Emitter<IStatusMessageChangeEvent> = this._register(new Emitter<IStatusMessageChangeEvent>());
get onDidStatusMessageChange(): Event<IStatusMessageChangeEvent> { return this._onDidStatusMessageChange.event; } readonly onDidStatusMessageChange: Event<IStatusMessageChangeEvent> = this._onDidStatusMessageChange.event;
private readonly _notifications: INotificationViewItem[] = []; private readonly _notifications: INotificationViewItem[] = [];
get notifications(): INotificationViewItem[] { return this._notifications; } get notifications(): INotificationViewItem[] { return this._notifications; }
...@@ -301,7 +301,7 @@ export class NotificationViewItemProgress extends Disposable implements INotific ...@@ -301,7 +301,7 @@ export class NotificationViewItemProgress extends Disposable implements INotific
private readonly _state: INotificationViewItemProgressState; private readonly _state: INotificationViewItemProgressState;
private readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
get onDidChange(): Event<void> { return this._onDidChange.event; } readonly onDidChange: Event<void> = this._onDidChange.event;
constructor() { constructor() {
super(); super();
...@@ -397,13 +397,13 @@ export class NotificationViewItem extends Disposable implements INotificationVie ...@@ -397,13 +397,13 @@ export class NotificationViewItem extends Disposable implements INotificationVie
private _progress: NotificationViewItemProgress; private _progress: NotificationViewItemProgress;
private readonly _onDidExpansionChange: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidExpansionChange: Emitter<void> = this._register(new Emitter<void>());
get onDidExpansionChange(): Event<void> { return this._onDidExpansionChange.event; } readonly onDidExpansionChange: Event<void> = this._onDidExpansionChange.event;
private readonly _onDidClose: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidClose: Emitter<void> = this._register(new Emitter<void>());
get onDidClose(): Event<void> { return this._onDidClose.event; } readonly onDidClose: Event<void> = this._onDidClose.event;
private readonly _onDidLabelChange: Emitter<INotificationViewItemLabelChangeEvent> = this._register(new Emitter<INotificationViewItemLabelChangeEvent>()); private readonly _onDidLabelChange: Emitter<INotificationViewItemLabelChangeEvent> = this._register(new Emitter<INotificationViewItemLabelChangeEvent>());
get onDidLabelChange(): Event<INotificationViewItemLabelChangeEvent> { return this._onDidLabelChange.event; } readonly onDidLabelChange: Event<INotificationViewItemLabelChangeEvent> = this._onDidLabelChange.event;
static create(notification: INotification): INotificationViewItem | null { static create(notification: INotification): INotificationViewItem | null {
if (!notification || !notification.message || isPromiseCanceledError(notification.message)) { if (!notification || !notification.message || isPromiseCanceledError(notification.message)) {
...@@ -654,7 +654,7 @@ export class NotificationViewItem extends Disposable implements INotificationVie ...@@ -654,7 +654,7 @@ export class NotificationViewItem extends Disposable implements INotificationVie
export class ChoiceAction extends Action { export class ChoiceAction extends Action {
private readonly _onDidRun = new Emitter<void>(); private readonly _onDidRun = new Emitter<void>();
get onDidRun(): Event<void> { return this._onDidRun.event; } readonly onDidRun: Event<void> = this._onDidRun.event;
private readonly _keepOpen: boolean; private readonly _keepOpen: boolean;
......
...@@ -107,7 +107,7 @@ export class ResourceGlobMatcher extends Disposable { ...@@ -107,7 +107,7 @@ export class ResourceGlobMatcher extends Disposable {
private static readonly NO_ROOT: string | null = null; private static readonly NO_ROOT: string | null = null;
private readonly _onExpressionChange: Emitter<void> = this._register(new Emitter<void>()); private readonly _onExpressionChange: Emitter<void> = this._register(new Emitter<void>());
get onExpressionChange(): Event<void> { return this._onExpressionChange.event; } readonly onExpressionChange: Event<void> = this._onExpressionChange.event;
private readonly mapRootToParsedExpression: Map<string | null, ParsedExpression> = new Map<string, ParsedExpression>(); private readonly mapRootToParsedExpression: Map<string | null, ParsedExpression> = new Map<string, ParsedExpression>();
private readonly mapRootToExpressionConfig: Map<string | null, IExpression> = new Map<string, IExpression>(); private readonly mapRootToExpressionConfig: Map<string | null, IExpression> = new Map<string, IExpression>();
......
...@@ -437,7 +437,7 @@ class DefaultSettingsHeaderRenderer extends Disposable { ...@@ -437,7 +437,7 @@ class DefaultSettingsHeaderRenderer extends Disposable {
export class SettingsGroupTitleRenderer extends Disposable implements HiddenAreasProvider { export class SettingsGroupTitleRenderer extends Disposable implements HiddenAreasProvider {
private readonly _onHiddenAreasChanged = this._register(new Emitter<void>()); private readonly _onHiddenAreasChanged = this._register(new Emitter<void>());
get onHiddenAreasChanged(): Event<void> { return this._onHiddenAreasChanged.event; } readonly onHiddenAreasChanged: Event<void> = this._onHiddenAreasChanged.event;
private settingsGroups: ISettingsGroup[]; private settingsGroups: ISettingsGroup[];
private hiddenGroups: ISettingsGroup[] = []; private hiddenGroups: ISettingsGroup[] = [];
......
...@@ -745,7 +745,7 @@ export class EditPreferenceWidget<T> extends Disposable { ...@@ -745,7 +745,7 @@ export class EditPreferenceWidget<T> extends Disposable {
private _editPreferenceDecoration: string[]; private _editPreferenceDecoration: string[];
private readonly _onClick = this._register(new Emitter<IEditorMouseEvent>()); private readonly _onClick = this._register(new Emitter<IEditorMouseEvent>());
get onClick(): Event<IEditorMouseEvent> { return this._onClick.event; } readonly onClick: Event<IEditorMouseEvent> = this._onClick.event;
constructor(private editor: ICodeEditor constructor(private editor: ICodeEditor
) { ) {
......
...@@ -23,7 +23,7 @@ class SCMInput implements ISCMInput { ...@@ -23,7 +23,7 @@ class SCMInput implements ISCMInput {
} }
private _onDidChange = new Emitter<string>(); private _onDidChange = new Emitter<string>();
get onDidChange(): Event<string> { return this._onDidChange.event; } readonly onDidChange: Event<string> = this._onDidChange.event;
private _placeholder = ''; private _placeholder = '';
...@@ -37,7 +37,7 @@ class SCMInput implements ISCMInput { ...@@ -37,7 +37,7 @@ class SCMInput implements ISCMInput {
} }
private _onDidChangePlaceholder = new Emitter<string>(); private _onDidChangePlaceholder = new Emitter<string>();
get onDidChangePlaceholder(): Event<string> { return this._onDidChangePlaceholder.event; } readonly onDidChangePlaceholder: Event<string> = this._onDidChangePlaceholder.event;
private _visible = true; private _visible = true;
...@@ -51,7 +51,7 @@ class SCMInput implements ISCMInput { ...@@ -51,7 +51,7 @@ class SCMInput implements ISCMInput {
} }
private _onDidChangeVisibility = new Emitter<boolean>(); private _onDidChangeVisibility = new Emitter<boolean>();
get onDidChangeVisibility(): Event<boolean> { return this._onDidChangeVisibility.event; } readonly onDidChangeVisibility: Event<boolean> = this._onDidChangeVisibility.event;
private _validateInput: IInputValidator = () => Promise.resolve(undefined); private _validateInput: IInputValidator = () => Promise.resolve(undefined);
...@@ -65,7 +65,7 @@ class SCMInput implements ISCMInput { ...@@ -65,7 +65,7 @@ class SCMInput implements ISCMInput {
} }
private _onDidChangeValidateInput = new Emitter<void>(); private _onDidChangeValidateInput = new Emitter<void>();
get onDidChangeValidateInput(): Event<void> { return this._onDidChangeValidateInput.event; } readonly onDidChangeValidateInput: Event<void> = this._onDidChangeValidateInput.event;
} }
class SCMRepository implements ISCMRepository { class SCMRepository implements ISCMRepository {
...@@ -118,10 +118,10 @@ export class SCMService implements ISCMService { ...@@ -118,10 +118,10 @@ export class SCMService implements ISCMService {
readonly onDidChangeSelectedRepositories: Event<ISCMRepository[]> = this._onDidChangeSelectedRepositories.event; readonly onDidChangeSelectedRepositories: Event<ISCMRepository[]> = this._onDidChangeSelectedRepositories.event;
private _onDidAddProvider = new Emitter<ISCMRepository>(); private _onDidAddProvider = new Emitter<ISCMRepository>();
get onDidAddRepository(): Event<ISCMRepository> { return this._onDidAddProvider.event; } readonly onDidAddRepository: Event<ISCMRepository> = this._onDidAddProvider.event;
private _onDidRemoveProvider = new Emitter<ISCMRepository>(); private _onDidRemoveProvider = new Emitter<ISCMRepository>();
get onDidRemoveRepository(): Event<ISCMRepository> { return this._onDidRemoveProvider.event; } readonly onDidRemoveRepository: Event<ISCMRepository> = this._onDidRemoveProvider.event;
constructor(@ILogService private readonly logService: ILogService) { } constructor(@ILogService private readonly logService: ILogService) { }
......
...@@ -1718,7 +1718,7 @@ class ProblemMatcherRegistryImpl implements IProblemMatcherRegistry { ...@@ -1718,7 +1718,7 @@ class ProblemMatcherRegistryImpl implements IProblemMatcherRegistry {
private matchers: IStringDictionary<NamedProblemMatcher>; private matchers: IStringDictionary<NamedProblemMatcher>;
private readyPromise: Promise<void>; private readyPromise: Promise<void>;
private readonly _onMatchersChanged: Emitter<void> = new Emitter<void>(); private readonly _onMatchersChanged: Emitter<void> = new Emitter<void>();
public get onMatcherChanged(): Event<void> { return this._onMatchersChanged.event; } public readonly onMatcherChanged: Event<void> = this._onMatchersChanged.event;
constructor() { constructor() {
......
...@@ -223,9 +223,9 @@ export class TerminalTab extends Disposable implements ITerminalTab { ...@@ -223,9 +223,9 @@ export class TerminalTab extends Disposable implements ITerminalTab {
public get terminalInstances(): ITerminalInstance[] { return this._terminalInstances; } public get terminalInstances(): ITerminalInstance[] { return this._terminalInstances; }
private readonly _onDisposed: Emitter<ITerminalTab>; private readonly _onDisposed: Emitter<ITerminalTab>;
public get onDisposed(): Event<ITerminalTab> { return this._onDisposed.event; } public readonly onDisposed: Event<ITerminalTab> = this._onDisposed.event;
private readonly _onInstancesChanged: Emitter<void>; private readonly _onInstancesChanged: Emitter<void>;
public get onInstancesChanged(): Event<void> { return this._onInstancesChanged.event; } public readonly onInstancesChanged: Event<void> = this._onInstancesChanged.event;
constructor( constructor(
terminalFocusContextKey: IContextKey<boolean>, terminalFocusContextKey: IContextKey<boolean>,
......
...@@ -37,7 +37,7 @@ export class WebviewEditor extends BaseEditor { ...@@ -37,7 +37,7 @@ export class WebviewEditor extends BaseEditor {
private readonly _onFocusWindowHandler = this._register(new MutableDisposable()); private readonly _onFocusWindowHandler = this._register(new MutableDisposable());
private readonly _onDidFocusWebview = this._register(new Emitter<void>()); private readonly _onDidFocusWebview = this._register(new Emitter<void>());
public get onDidFocus(): Event<any> { return this._onDidFocusWebview.event; } public readonly onDidFocus: Event<any> = this._onDidFocusWebview.event;
private pendingMessages: any[] = []; private pendingMessages: any[] = [];
......
...@@ -296,7 +296,7 @@ export class WebviewElement extends Disposable implements Webview { ...@@ -296,7 +296,7 @@ export class WebviewElement extends Disposable implements Webview {
private _focused = false; private _focused = false;
private readonly _onDidFocus = this._register(new Emitter<void>()); private readonly _onDidFocus = this._register(new Emitter<void>());
public get onDidFocus(): Event<void> { return this._onDidFocus.event; } public readonly onDidFocus: Event<void> = this._onDidFocus.event;
constructor( constructor(
private readonly _options: WebviewOptions, private readonly _options: WebviewOptions,
......
...@@ -66,7 +66,7 @@ class NativeContextMenuService extends Disposable implements IContextMenuService ...@@ -66,7 +66,7 @@ class NativeContextMenuService extends Disposable implements IContextMenuService
_serviceBrand: any; _serviceBrand: any;
private _onDidContextMenu = this._register(new Emitter<void>()); private _onDidContextMenu = this._register(new Emitter<void>());
get onDidContextMenu(): Event<void> { return this._onDidContextMenu.event; } readonly onDidContextMenu: Event<void> = this._onDidContextMenu.event;
constructor( constructor(
@INotificationService private readonly notificationService: INotificationService, @INotificationService private readonly notificationService: INotificationService,
......
...@@ -40,16 +40,16 @@ export class EditorService extends Disposable implements EditorServiceImpl { ...@@ -40,16 +40,16 @@ export class EditorService extends Disposable implements EditorServiceImpl {
//#region events //#region events
private readonly _onDidActiveEditorChange: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidActiveEditorChange: Emitter<void> = this._register(new Emitter<void>());
get onDidActiveEditorChange(): Event<void> { return this._onDidActiveEditorChange.event; } readonly onDidActiveEditorChange: Event<void> = this._onDidActiveEditorChange.event;
private readonly _onDidVisibleEditorsChange: Emitter<void> = this._register(new Emitter<void>()); private readonly _onDidVisibleEditorsChange: Emitter<void> = this._register(new Emitter<void>());
get onDidVisibleEditorsChange(): Event<void> { return this._onDidVisibleEditorsChange.event; } readonly onDidVisibleEditorsChange: Event<void> = this._onDidVisibleEditorsChange.event;
private readonly _onDidCloseEditor: Emitter<IEditorCloseEvent> = this._register(new Emitter<IEditorCloseEvent>()); private readonly _onDidCloseEditor: Emitter<IEditorCloseEvent> = this._register(new Emitter<IEditorCloseEvent>());
get onDidCloseEditor(): Event<IEditorCloseEvent> { return this._onDidCloseEditor.event; } readonly onDidCloseEditor: Event<IEditorCloseEvent> = this._onDidCloseEditor.event;
private readonly _onDidOpenEditorFail: Emitter<IEditorIdentifier> = this._register(new Emitter<IEditorIdentifier>()); private readonly _onDidOpenEditorFail: Emitter<IEditorIdentifier> = this._register(new Emitter<IEditorIdentifier>());
get onDidOpenEditorFail(): Event<IEditorIdentifier> { return this._onDidOpenEditorFail.event; } readonly onDidOpenEditorFail: Event<IEditorIdentifier> = this._onDidOpenEditorFail.event;
//#endregion //#endregion
......
...@@ -70,10 +70,10 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil ...@@ -70,10 +70,10 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
static setSaveParticipant(handler: ISaveParticipant | null): void { TextFileEditorModel.saveParticipant = handler; } static setSaveParticipant(handler: ISaveParticipant | null): void { TextFileEditorModel.saveParticipant = handler; }
private readonly _onDidContentChange: Emitter<StateChange> = this._register(new Emitter<StateChange>()); private readonly _onDidContentChange: Emitter<StateChange> = this._register(new Emitter<StateChange>());
get onDidContentChange(): Event<StateChange> { return this._onDidContentChange.event; } readonly onDidContentChange: Event<StateChange> = this._onDidContentChange.event;
private readonly _onDidStateChange: Emitter<StateChange> = this._register(new Emitter<StateChange>()); private readonly _onDidStateChange: Emitter<StateChange> = this._register(new Emitter<StateChange>());
get onDidStateChange(): Event<StateChange> { return this._onDidStateChange.event; } readonly onDidStateChange: Event<StateChange> = this._onDidStateChange.event;
private resource: URI; private resource: URI;
......
...@@ -15,28 +15,28 @@ import { ResourceMap } from 'vs/base/common/map'; ...@@ -15,28 +15,28 @@ import { ResourceMap } from 'vs/base/common/map';
export class TextFileEditorModelManager extends Disposable implements ITextFileEditorModelManager { export class TextFileEditorModelManager extends Disposable implements ITextFileEditorModelManager {
private readonly _onModelDisposed: Emitter<URI> = this._register(new Emitter<URI>()); private readonly _onModelDisposed: Emitter<URI> = this._register(new Emitter<URI>());
get onModelDisposed(): Event<URI> { return this._onModelDisposed.event; } readonly onModelDisposed: Event<URI> = this._onModelDisposed.event;
private readonly _onModelContentChanged: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>()); private readonly _onModelContentChanged: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
get onModelContentChanged(): Event<TextFileModelChangeEvent> { return this._onModelContentChanged.event; } readonly onModelContentChanged: Event<TextFileModelChangeEvent> = this._onModelContentChanged.event;
private readonly _onModelDirty: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>()); private readonly _onModelDirty: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
get onModelDirty(): Event<TextFileModelChangeEvent> { return this._onModelDirty.event; } readonly onModelDirty: Event<TextFileModelChangeEvent> = this._onModelDirty.event;
private readonly _onModelSaveError: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>()); private readonly _onModelSaveError: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
get onModelSaveError(): Event<TextFileModelChangeEvent> { return this._onModelSaveError.event; } readonly onModelSaveError: Event<TextFileModelChangeEvent> = this._onModelSaveError.event;
private readonly _onModelSaved: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>()); private readonly _onModelSaved: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
get onModelSaved(): Event<TextFileModelChangeEvent> { return this._onModelSaved.event; } readonly onModelSaved: Event<TextFileModelChangeEvent> = this._onModelSaved.event;
private readonly _onModelReverted: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>()); private readonly _onModelReverted: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
get onModelReverted(): Event<TextFileModelChangeEvent> { return this._onModelReverted.event; } readonly onModelReverted: Event<TextFileModelChangeEvent> = this._onModelReverted.event;
private readonly _onModelEncodingChanged: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>()); private readonly _onModelEncodingChanged: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
get onModelEncodingChanged(): Event<TextFileModelChangeEvent> { return this._onModelEncodingChanged.event; } readonly onModelEncodingChanged: Event<TextFileModelChangeEvent> = this._onModelEncodingChanged.event;
private readonly _onModelOrphanedChanged: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>()); private readonly _onModelOrphanedChanged: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
get onModelOrphanedChanged(): Event<TextFileModelChangeEvent> { return this._onModelOrphanedChanged.event; } readonly onModelOrphanedChanged: Event<TextFileModelChangeEvent> = this._onModelOrphanedChanged.event;
private _onModelsDirtyEvent: Event<TextFileModelChangeEvent[]>; private _onModelsDirtyEvent: Event<TextFileModelChangeEvent[]>;
private _onModelsSaveError: Event<TextFileModelChangeEvent[]>; private _onModelsSaveError: Event<TextFileModelChangeEvent[]>;
......
...@@ -49,13 +49,13 @@ export abstract class TextFileService extends Disposable implements ITextFileSer ...@@ -49,13 +49,13 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
_serviceBrand: ServiceIdentifier<any>; _serviceBrand: ServiceIdentifier<any>;
private readonly _onAutoSaveConfigurationChange: Emitter<IAutoSaveConfiguration> = this._register(new Emitter<IAutoSaveConfiguration>()); private readonly _onAutoSaveConfigurationChange: Emitter<IAutoSaveConfiguration> = this._register(new Emitter<IAutoSaveConfiguration>());
get onAutoSaveConfigurationChange(): Event<IAutoSaveConfiguration> { return this._onAutoSaveConfigurationChange.event; } readonly onAutoSaveConfigurationChange: Event<IAutoSaveConfiguration> = this._onAutoSaveConfigurationChange.event;
private readonly _onFilesAssociationChange: Emitter<void> = this._register(new Emitter<void>()); private readonly _onFilesAssociationChange: Emitter<void> = this._register(new Emitter<void>());
get onFilesAssociationChange(): Event<void> { return this._onFilesAssociationChange.event; } readonly onFilesAssociationChange: Event<void> = this._onFilesAssociationChange.event;
private readonly _onWillMove = this._register(new Emitter<IWillMoveEvent>()); private readonly _onWillMove = this._register(new Emitter<IWillMoveEvent>());
get onWillMove(): Event<IWillMoveEvent> { return this._onWillMove.event; } readonly onWillMove: Event<IWillMoveEvent> = this._onWillMove.event;
private _models: TextFileEditorModelManager; private _models: TextFileEditorModelManager;
get models(): ITextFileEditorModelManager { return this._models; } get models(): ITextFileEditorModelManager { return this._models; }
......
...@@ -53,17 +53,15 @@ export interface ColorThemeChangeEvent { ...@@ -53,17 +53,15 @@ export interface ColorThemeChangeEvent {
export class ColorThemeStore { export class ColorThemeStore {
private extensionsColorThemes: ColorThemeData[]; private extensionsColorThemes: ColorThemeData[];
private readonly onDidChangeEmitter: Emitter<ColorThemeChangeEvent>;
public get onDidChange(): Event<ColorThemeChangeEvent> { return this.onDidChangeEmitter.event; } private readonly onDidChangeEmitter = new Emitter<ColorThemeChangeEvent>();
public readonly onDidChange: Event<ColorThemeChangeEvent> = this.onDidChangeEmitter.event;
constructor(@IExtensionService private readonly extensionService: IExtensionService, defaultTheme: ColorThemeData) { constructor(@IExtensionService private readonly extensionService: IExtensionService, defaultTheme: ColorThemeData) {
this.extensionsColorThemes = [defaultTheme]; this.extensionsColorThemes = [defaultTheme];
this.onDidChangeEmitter = new Emitter<ColorThemeChangeEvent>();
this.initialize(); this.initialize();
} }
private initialize() { private initialize() {
themesExtPoint.setHandler((extensions, delta) => { themesExtPoint.setHandler((extensions, delta) => {
const previousIds: { [key: string]: boolean } = {}; const previousIds: { [key: string]: boolean } = {};
......
...@@ -118,16 +118,16 @@ export class UntitledEditorService extends Disposable implements IUntitledEditor ...@@ -118,16 +118,16 @@ export class UntitledEditorService extends Disposable implements IUntitledEditor
private mapResourceToAssociatedFilePath = new ResourceMap<boolean>(); private mapResourceToAssociatedFilePath = new ResourceMap<boolean>();
private readonly _onDidChangeContent: Emitter<URI> = this._register(new Emitter<URI>()); private readonly _onDidChangeContent: Emitter<URI> = this._register(new Emitter<URI>());
get onDidChangeContent(): Event<URI> { return this._onDidChangeContent.event; } readonly onDidChangeContent: Event<URI> = this._onDidChangeContent.event;
private readonly _onDidChangeDirty: Emitter<URI> = this._register(new Emitter<URI>()); private readonly _onDidChangeDirty: Emitter<URI> = this._register(new Emitter<URI>());
get onDidChangeDirty(): Event<URI> { return this._onDidChangeDirty.event; } readonly onDidChangeDirty: Event<URI> = this._onDidChangeDirty.event;
private readonly _onDidChangeEncoding: Emitter<URI> = this._register(new Emitter<URI>()); private readonly _onDidChangeEncoding: Emitter<URI> = this._register(new Emitter<URI>());
get onDidChangeEncoding(): Event<URI> { return this._onDidChangeEncoding.event; } readonly onDidChangeEncoding: Event<URI> = this._onDidChangeEncoding.event;
private readonly _onDidDisposeModel: Emitter<URI> = this._register(new Emitter<URI>()); private readonly _onDidDisposeModel: Emitter<URI> = this._register(new Emitter<URI>());
get onDidDisposeModel(): Event<URI> { return this._onDidDisposeModel.event; } readonly onDidDisposeModel: Event<URI> = this._onDidDisposeModel.event;
constructor( constructor(
@IInstantiationService private readonly instantiationService: IInstantiationService, @IInstantiationService private readonly instantiationService: IInstantiationService,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册