Skip to content

Commit 539c6cc

Browse files
committed
Marking more emitters as readonly
1 parent 3586808 commit 539c6cc

17 files changed

Lines changed: 41 additions & 41 deletions

File tree

src/vs/base/browser/ui/menu/menubar.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ export class MenuBar extends Disposable {
7575
private _focusState: MenubarState;
7676
private actionRunner: IActionRunner;
7777

78-
private _onVisibilityChange: Emitter<boolean>;
79-
private _onFocusStateChange: Emitter<boolean>;
78+
private readonly _onVisibilityChange: Emitter<boolean>;
79+
private readonly _onFocusStateChange: Emitter<boolean>;
8080

8181
private numMenusShown: number;
8282
private menuStyle: IMenuStyles;

src/vs/base/node/storage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export class Storage extends Disposable implements IStorage {
8383

8484
private static readonly DEFAULT_FLUSH_DELAY = 100;
8585

86-
private _onDidChangeStorage: Emitter<string> = this._register(new Emitter<string>());
86+
private readonly _onDidChangeStorage: Emitter<string> = this._register(new Emitter<string>());
8787
get onDidChangeStorage(): Event<string> { return this._onDidChangeStorage.event; }
8888

8989
private state = StorageState.None;

src/vs/base/parts/ipc/test/node/ipc.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class TestIPCClient extends IPCClient<string> {
7171

7272
class TestIPCServer extends IPCServer<string> {
7373

74-
private onDidClientConnect: Emitter<ClientConnectionEvent>;
74+
private readonly onDidClientConnect: Emitter<ClientConnectionEvent>;
7575

7676
constructor() {
7777
const onDidClientConnect = new Emitter<ClientConnectionEvent>();

src/vs/platform/storage/common/storage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export interface IWorkspaceStorageChangeEvent {
108108
export class InMemoryStorageService extends Disposable implements IStorageService {
109109
_serviceBrand = undefined;
110110

111-
private _onDidChangeStorage: Emitter<IWorkspaceStorageChangeEvent> = this._register(new Emitter<IWorkspaceStorageChangeEvent>());
111+
private readonly _onDidChangeStorage: Emitter<IWorkspaceStorageChangeEvent> = this._register(new Emitter<IWorkspaceStorageChangeEvent>());
112112
get onDidChangeStorage(): Event<IWorkspaceStorageChangeEvent> { return this._onDidChangeStorage.event; }
113113

114114
readonly onWillSaveState = Event.None;

src/vs/platform/storage/node/storageIpc.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class GlobalStorageDatabaseChannel extends Disposable implements IServerC
2727

2828
private static STORAGE_CHANGE_DEBOUNCE_TIME = 100;
2929

30-
private _onDidChangeItems: Emitter<ISerializableItemsChangeEvent> = this._register(new Emitter<ISerializableItemsChangeEvent>());
30+
private readonly _onDidChangeItems: Emitter<ISerializableItemsChangeEvent> = this._register(new Emitter<ISerializableItemsChangeEvent>());
3131
get onDidChangeItems(): Event<ISerializableItemsChangeEvent> { return this._onDidChangeItems.event; }
3232

3333
constructor(private storageMainService: StorageMainService) {
@@ -104,7 +104,7 @@ export class GlobalStorageDatabaseChannelClient extends Disposable implements IS
104104

105105
_serviceBrand: any;
106106

107-
private _onDidChangeItemsExternal: Emitter<IStorageItemsChangeEvent> = this._register(new Emitter<IStorageItemsChangeEvent>());
107+
private readonly _onDidChangeItemsExternal: Emitter<IStorageItemsChangeEvent> = this._register(new Emitter<IStorageItemsChangeEvent>());
108108
get onDidChangeItemsExternal(): Event<IStorageItemsChangeEvent> { return this._onDidChangeItemsExternal.event; }
109109

110110
private onDidChangeItemsOnMainListener: IDisposable;

src/vs/platform/storage/node/storageMainService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ export class StorageMainService extends Disposable implements IStorageMainServic
7878

7979
private static STORAGE_NAME = 'state.vscdb';
8080

81-
private _onDidChangeStorage: Emitter<IStorageChangeEvent> = this._register(new Emitter<IStorageChangeEvent>());
81+
private readonly _onDidChangeStorage: Emitter<IStorageChangeEvent> = this._register(new Emitter<IStorageChangeEvent>());
8282
get onDidChangeStorage(): Event<IStorageChangeEvent> { return this._onDidChangeStorage.event; }
8383

84-
private _onWillSaveState: Emitter<void> = this._register(new Emitter<void>());
84+
private readonly _onWillSaveState: Emitter<void> = this._register(new Emitter<void>());
8585
get onWillSaveState(): Event<void> { return this._onWillSaveState.event; }
8686

8787
get items(): Map<string, string> { return this.storage.items; }

src/vs/platform/storage/node/storageService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ export class StorageService extends Disposable implements IStorageService {
2424
private static WORKSPACE_STORAGE_NAME = 'state.vscdb';
2525
private static WORKSPACE_META_NAME = 'workspace.json';
2626

27-
private _onDidChangeStorage: Emitter<IWorkspaceStorageChangeEvent> = this._register(new Emitter<IWorkspaceStorageChangeEvent>());
27+
private readonly _onDidChangeStorage: Emitter<IWorkspaceStorageChangeEvent> = this._register(new Emitter<IWorkspaceStorageChangeEvent>());
2828
get onDidChangeStorage(): Event<IWorkspaceStorageChangeEvent> { return this._onDidChangeStorage.event; }
2929

30-
private _onWillSaveState: Emitter<IWillSaveStateEvent> = this._register(new Emitter<IWillSaveStateEvent>());
30+
private readonly _onWillSaveState: Emitter<IWillSaveStateEvent> = this._register(new Emitter<IWillSaveStateEvent>());
3131
get onWillSaveState(): Event<IWillSaveStateEvent> { return this._onWillSaveState.event; }
3232

3333
private globalStorage: IStorage;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class EditorControl extends Disposable {
2727
get maximumWidth() { return this._activeControl ? this._activeControl.maximumWidth : DEFAULT_EDITOR_MAX_DIMENSIONS.width; }
2828
get maximumHeight() { return this._activeControl ? this._activeControl.maximumHeight : DEFAULT_EDITOR_MAX_DIMENSIONS.height; }
2929

30-
private _onDidFocus: Emitter<void> = this._register(new Emitter<void>());
30+
private readonly _onDidFocus: Emitter<void> = this._register(new Emitter<void>());
3131
get onDidFocus(): Event<void> { return this._onDidFocus.event; }
3232

3333
private _onDidSizeConstraintsChange = this._register(new Emitter<{ width: number; height: number; } | undefined>());

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,25 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
6666

6767
//#region events
6868

69-
private _onDidFocus: Emitter<void> = this._register(new Emitter<void>());
69+
private readonly _onDidFocus: Emitter<void> = this._register(new Emitter<void>());
7070
get onDidFocus(): Event<void> { return this._onDidFocus.event; }
7171

72-
private _onWillDispose: Emitter<void> = this._register(new Emitter<void>());
72+
private readonly _onWillDispose: Emitter<void> = this._register(new Emitter<void>());
7373
get onWillDispose(): Event<void> { return this._onWillDispose.event; }
7474

75-
private _onDidGroupChange: Emitter<IGroupChangeEvent> = this._register(new Emitter<IGroupChangeEvent>());
75+
private readonly _onDidGroupChange: Emitter<IGroupChangeEvent> = this._register(new Emitter<IGroupChangeEvent>());
7676
get onDidGroupChange(): Event<IGroupChangeEvent> { return this._onDidGroupChange.event; }
7777

78-
private _onWillOpenEditor: Emitter<IEditorOpeningEvent> = this._register(new Emitter<IEditorOpeningEvent>());
78+
private readonly _onWillOpenEditor: Emitter<IEditorOpeningEvent> = this._register(new Emitter<IEditorOpeningEvent>());
7979
get onWillOpenEditor(): Event<IEditorOpeningEvent> { return this._onWillOpenEditor.event; }
8080

81-
private _onDidOpenEditorFail: Emitter<EditorInput> = this._register(new Emitter<EditorInput>());
81+
private readonly _onDidOpenEditorFail: Emitter<EditorInput> = this._register(new Emitter<EditorInput>());
8282
get onDidOpenEditorFail(): Event<EditorInput> { return this._onDidOpenEditorFail.event; }
8383

84-
private _onWillCloseEditor: Emitter<IEditorCloseEvent> = this._register(new Emitter<IEditorCloseEvent>());
84+
private readonly _onWillCloseEditor: Emitter<IEditorCloseEvent> = this._register(new Emitter<IEditorCloseEvent>());
8585
get onWillCloseEditor(): Event<IEditorCloseEvent> { return this._onWillCloseEditor.event; }
8686

87-
private _onDidCloseEditor: Emitter<IEditorCloseEvent> = this._register(new Emitter<IEditorCloseEvent>());
87+
private readonly _onDidCloseEditor: Emitter<IEditorCloseEvent> = this._register(new Emitter<IEditorCloseEvent>());
8888
get onDidCloseEditor(): Event<IEditorCloseEvent> { return this._onDidCloseEditor.event; }
8989

9090
//#endregion

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,29 +88,29 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
8888

8989
//#region Events
9090

91-
private _onDidLayout: Emitter<Dimension> = this._register(new Emitter<Dimension>());
91+
private readonly _onDidLayout: Emitter<Dimension> = this._register(new Emitter<Dimension>());
9292
get onDidLayout(): Event<Dimension> { return this._onDidLayout.event; }
9393

94-
private _onDidActiveGroupChange: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
94+
private readonly _onDidActiveGroupChange: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
9595
get onDidActiveGroupChange(): Event<IEditorGroupView> { return this._onDidActiveGroupChange.event; }
9696

97-
private _onDidAddGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
97+
private readonly _onDidAddGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
9898
get onDidAddGroup(): Event<IEditorGroupView> { return this._onDidAddGroup.event; }
9999

100-
private _onDidRemoveGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
100+
private readonly _onDidRemoveGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
101101
get onDidRemoveGroup(): Event<IEditorGroupView> { return this._onDidRemoveGroup.event; }
102102

103-
private _onDidMoveGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
103+
private readonly _onDidMoveGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
104104
get onDidMoveGroup(): Event<IEditorGroupView> { return this._onDidMoveGroup.event; }
105105

106106
private onDidSetGridWidget = this._register(new Emitter<{ width: number; height: number; }>());
107107
private _onDidSizeConstraintsChange = this._register(new Relay<{ width: number; height: number; }>());
108108
get onDidSizeConstraintsChange(): Event<{ width: number; height: number; }> { return Event.any(this.onDidSetGridWidget.event, this._onDidSizeConstraintsChange.event); }
109109

110-
private _onDidPreferredSizeChange: Emitter<void> = this._register(new Emitter<void>());
110+
private readonly _onDidPreferredSizeChange: Emitter<void> = this._register(new Emitter<void>());
111111
get onDidPreferredSizeChange(): Event<void> { return this._onDidPreferredSizeChange.event; }
112112

113-
private _onDidActivateGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
113+
private readonly _onDidActivateGroup: Emitter<IEditorGroupView> = this._register(new Emitter<IEditorGroupView>());
114114
get onDidActivateGroup(): Event<IEditorGroupView> { return this._onDidActivateGroup.event; }
115115

116116
//#endregion
@@ -168,7 +168,7 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
168168

169169
private enforcedPartOptions: IEditorPartOptions[] = [];
170170

171-
private _onDidEditorPartOptionsChange: Emitter<IEditorPartOptionsChangeEvent> = this._register(new Emitter<IEditorPartOptionsChangeEvent>());
171+
private readonly _onDidEditorPartOptionsChange: Emitter<IEditorPartOptionsChangeEvent> = this._register(new Emitter<IEditorPartOptionsChangeEvent>());
172172
get onDidEditorPartOptionsChange(): Event<IEditorPartOptionsChangeEvent> { return this._onDidEditorPartOptionsChange.event; }
173173

174174
private registerListeners(): void {

0 commit comments

Comments
 (0)