diff --git a/src/vs/base/browser/browser.ts b/src/vs/base/browser/browser.ts index 311c99f15ca..f2ff8f11585 100644 --- a/src/vs/base/browser/browser.ts +++ b/src/vs/base/browser/browser.ts @@ -15,7 +15,7 @@ class WindowManager { // --- Zoom Level private _zoomLevel: number = 0; private _lastZoomLevelChangeTime: number = 0; - private _onDidChangeZoomLevel: Emitter = new Emitter(); + private readonly _onDidChangeZoomLevel: Emitter = new Emitter(); public readonly onDidChangeZoomLevel: Event = this._onDidChangeZoomLevel.event; public getZoomLevel(): number { @@ -61,7 +61,7 @@ class WindowManager { // --- Fullscreen private _fullscreen: boolean; - private _onDidChangeFullscreen: Emitter = new Emitter(); + private readonly _onDidChangeFullscreen: Emitter = new Emitter(); public readonly onDidChangeFullscreen: Event = this._onDidChangeFullscreen.event; public setFullscreen(fullscreen: boolean): void { @@ -78,7 +78,7 @@ class WindowManager { // --- Accessibility private _accessibilitySupport = Platform.AccessibilitySupport.Unknown; - private _onDidChangeAccessibilitySupport: Emitter = new Emitter(); + private readonly _onDidChangeAccessibilitySupport: Emitter = new Emitter(); public readonly onDidChangeAccessibilitySupport: Event = this._onDidChangeAccessibilitySupport.event; public setAccessibilitySupport(accessibilitySupport: Platform.AccessibilitySupport): void { diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts index 4da1f7555ae..23aaa4739fa 100644 --- a/src/vs/base/browser/ui/sash/sash.ts +++ b/src/vs/base/browser/ui/sash/sash.ts @@ -301,7 +301,7 @@ export class VSash extends Disposable implements IVerticalSashLayoutProvider { private position: number; private dimension: Dimension; - private _onPositionChange: Emitter = new Emitter(); + private readonly _onPositionChange: Emitter = new Emitter(); public get onPositionChange(): Event { return this._onPositionChange.event; } constructor(container: HTMLElement, private minWidth: number) { diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts index 351711fc8ec..390657b7df3 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts +++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts @@ -78,7 +78,7 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate; + private readonly _onDidSelect: Emitter; private toDispose: IDisposable[]; private styles: ISelectBoxStyles; private listRenderer: SelectListRenderer; diff --git a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts index c73dc90d1a0..cea2e072e88 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts +++ b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts @@ -16,7 +16,7 @@ export class SelectBoxNative implements ISelectBoxDelegate { private selectElement: HTMLSelectElement; private options: string[]; private selected: number; - private _onDidSelect: Emitter; + private readonly _onDidSelect: Emitter; private toDispose: IDisposable[]; private styles: ISelectBoxStyles; diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts index 64e2f36c829..200820e3f72 100644 --- a/src/vs/base/common/async.ts +++ b/src/vs/base/common/async.ts @@ -424,7 +424,7 @@ export class Limiter { private runningPromises: number; private maxDegreeOfParalellism: number; private outstandingPromises: ILimitedTaskFactory[]; - private _onFinished: Emitter; + private readonly _onFinished: Emitter; constructor(maxDegreeOfParalellism: number) { this.maxDegreeOfParalellism = maxDegreeOfParalellism; diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts index 36f2a501252..8180d4367de 100644 --- a/src/vs/base/common/event.ts +++ b/src/vs/base/common/event.ts @@ -163,7 +163,7 @@ export class Emitter { export class EventMultiplexer implements IDisposable { - private emitter: Emitter; + private readonly emitter: Emitter; private hasListeners = false; private events: { event: Event; listener: IDisposable; }[] = []; diff --git a/src/vs/base/node/config.ts b/src/vs/base/node/config.ts index dcbc909bb9f..54a03e7dac3 100644 --- a/src/vs/base/node/config.ts +++ b/src/vs/base/node/config.ts @@ -50,7 +50,7 @@ export class ConfigWatcher implements IConfigWatcher, IDisposable { private loaded: boolean; private timeoutHandle: NodeJS.Timer; private disposables: IDisposable[]; - private _onDidUpdateConfiguration: Emitter>; + private readonly _onDidUpdateConfiguration: Emitter>; private configName: string; constructor(private _path: string, private options: IConfigOptions = { changeBufferDelay: 0, defaultConfig: Object.create(null), onError: error => console.error(error) }) { diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts index 5d522ac8807..8d71242a75d 100644 --- a/src/vs/base/parts/tree/browser/treeView.ts +++ b/src/vs/base/parts/tree/browser/treeView.ts @@ -440,10 +440,10 @@ export class TreeView extends HeightMap { private highlightedItemWasDraggable: boolean; private onHiddenScrollTop: number; - private _onDOMFocus: Emitter = new Emitter(); + private readonly _onDOMFocus: Emitter = new Emitter(); get onDOMFocus(): Event { return this._onDOMFocus.event; } - private _onDOMBlur: Emitter = new Emitter(); + private readonly _onDOMBlur: Emitter = new Emitter(); get onDOMBlur(): Event { return this._onDOMBlur.event; } constructor(context: _.ITreeContext, container: HTMLElement) { diff --git a/src/vs/code/electron-main/keyboard.ts b/src/vs/code/electron-main/keyboard.ts index 0d53eb2146c..1dd9480260d 100644 --- a/src/vs/code/electron-main/keyboard.ts +++ b/src/vs/code/electron-main/keyboard.ts @@ -20,7 +20,7 @@ export class KeyboardLayoutMonitor { public static readonly INSTANCE = new KeyboardLayoutMonitor(); - private _emitter: Emitter; + private readonly _emitter: Emitter; private _registered: boolean; private constructor() { diff --git a/src/vs/editor/browser/services/abstractCodeEditorService.ts b/src/vs/editor/browser/services/abstractCodeEditorService.ts index 334ff2a9db8..ead0559373c 100644 --- a/src/vs/editor/browser/services/abstractCodeEditorService.ts +++ b/src/vs/editor/browser/services/abstractCodeEditorService.ts @@ -14,12 +14,12 @@ export abstract class AbstractCodeEditorService implements ICodeEditorService { _serviceBrand: any; - private _onCodeEditorAdd: Emitter; - private _onCodeEditorRemove: Emitter; + private readonly _onCodeEditorAdd: Emitter; + private readonly _onCodeEditorRemove: Emitter; private _codeEditors: { [editorId: string]: ICodeEditor; }; - private _onDiffEditorAdd: Emitter; - private _onDiffEditorRemove: Emitter; + private readonly _onDiffEditorAdd: Emitter; + private readonly _onDiffEditorRemove: Emitter; private _diffEditors: { [editorId: string]: IDiffEditor; }; constructor() { diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts index baa9e9be9fa..3e5d9240be6 100644 --- a/src/vs/editor/browser/widget/codeEditorWidget.ts +++ b/src/vs/editor/browser/widget/codeEditorWidget.ts @@ -455,7 +455,7 @@ class CodeEditorWidgetFocusTracker extends Disposable { private _hasFocus: boolean; private _domFocusTracker: dom.IFocusTracker; - private _onChange: Emitter = this._register(new Emitter()); + private readonly _onChange: Emitter = this._register(new Emitter()); public readonly onChange: Event = this._onChange.event; constructor(domElement: HTMLElement) { diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts index a1e2e35c041..072077be0db 100644 --- a/src/vs/editor/common/config/commonEditorConfig.ts +++ b/src/vs/editor/common/config/commonEditorConfig.ts @@ -34,7 +34,7 @@ export interface ITabFocus { export const TabFocus: ITabFocus = new class implements ITabFocus { private _tabFocus: boolean = false; - private _onDidChangeTabFocus: Emitter = new Emitter(); + private readonly _onDidChangeTabFocus: Emitter = new Emitter(); public readonly onDidChangeTabFocus: Event = this._onDidChangeTabFocus.event; public getTabFocusMode(): boolean { diff --git a/src/vs/editor/common/config/editorZoom.ts b/src/vs/editor/common/config/editorZoom.ts index 2c3efe550e3..f2ac269fb77 100644 --- a/src/vs/editor/common/config/editorZoom.ts +++ b/src/vs/editor/common/config/editorZoom.ts @@ -16,7 +16,7 @@ export const EditorZoom: IEditorZoom = new class implements IEditorZoom { private _zoomLevel: number = 0; - private _onDidChangeZoomLevel: Emitter = new Emitter(); + private readonly _onDidChangeZoomLevel: Emitter = new Emitter(); public readonly onDidChangeZoomLevel: Event = this._onDidChangeZoomLevel.event; public getZoomLevel(): number { diff --git a/src/vs/editor/common/modes/languageConfigurationRegistry.ts b/src/vs/editor/common/modes/languageConfigurationRegistry.ts index 6eb3521ff47..70a8e018fa3 100644 --- a/src/vs/editor/common/modes/languageConfigurationRegistry.ts +++ b/src/vs/editor/common/modes/languageConfigurationRegistry.ts @@ -177,7 +177,7 @@ export class LanguageConfigurationRegistryImpl { private _entries: RichEditSupport[]; - private _onDidChange: Emitter = new Emitter(); + private readonly _onDidChange: Emitter = new Emitter(); public readonly onDidChange: Event = this._onDidChange.event; constructor() { diff --git a/src/vs/editor/common/modes/languageFeatureRegistry.ts b/src/vs/editor/common/modes/languageFeatureRegistry.ts index 14631337e4b..319c7bdfdfc 100644 --- a/src/vs/editor/common/modes/languageFeatureRegistry.ts +++ b/src/vs/editor/common/modes/languageFeatureRegistry.ts @@ -21,7 +21,7 @@ export default class LanguageFeatureRegistry { private _clock: number = 0; private _entries: Entry[] = []; - private _onDidChange: Emitter = new Emitter(); + private readonly _onDidChange: Emitter = new Emitter(); constructor() { } diff --git a/src/vs/editor/common/modes/modesRegistry.ts b/src/vs/editor/common/modes/modesRegistry.ts index 346f1a8f7c7..29ca0e37796 100644 --- a/src/vs/editor/common/modes/modesRegistry.ts +++ b/src/vs/editor/common/modes/modesRegistry.ts @@ -20,7 +20,7 @@ export class EditorModesRegistry { private _languages: ILanguageExtensionPoint[]; - private _onDidAddLanguages: Emitter = new Emitter(); + private readonly _onDidAddLanguages: Emitter = new Emitter(); public readonly onDidAddLanguages: Event = this._onDidAddLanguages.event; constructor() { diff --git a/src/vs/editor/common/modes/tokenizationRegistry.ts b/src/vs/editor/common/modes/tokenizationRegistry.ts index f97b6319606..9a7ec67eaf3 100644 --- a/src/vs/editor/common/modes/tokenizationRegistry.ts +++ b/src/vs/editor/common/modes/tokenizationRegistry.ts @@ -13,7 +13,7 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry { private _map: { [language: string]: ITokenizationSupport }; - private _onDidChange: Emitter = new Emitter(); + private readonly _onDidChange: Emitter = new Emitter(); public readonly onDidChange: Event = this._onDidChange.event; private _colorMap: Color[]; diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts index 049217f20cc..9cb2e09f4e9 100644 --- a/src/vs/editor/common/services/modelServiceImpl.ts +++ b/src/vs/editor/common/services/modelServiceImpl.ts @@ -193,9 +193,9 @@ export class ModelServiceImpl implements IModelService { private _configurationService: IConfigurationService; private _configurationServiceSubscription: IDisposable; - private _onModelAdded: Emitter; - private _onModelRemoved: Emitter; - private _onModelModeChanged: Emitter<{ model: ITextModel; oldModeId: string; }>; + private readonly _onModelAdded: Emitter; + private readonly _onModelRemoved: Emitter; + private readonly _onModelModeChanged: Emitter<{ model: ITextModel; oldModeId: string; }>; private _modelCreationOptionsByLanguageAndResource: { [languageAndResource: string]: ITextModelCreationOptions; diff --git a/src/vs/editor/contrib/find/findState.ts b/src/vs/editor/contrib/find/findState.ts index 21d2d0f5399..0d1d236ee16 100644 --- a/src/vs/editor/contrib/find/findState.ts +++ b/src/vs/editor/contrib/find/findState.ts @@ -70,7 +70,7 @@ export class FindReplaceState implements IDisposable { private _matchesPosition: number; private _matchesCount: number; private _currentMatch: Range; - private _onFindReplaceStateChange: Emitter; + private readonly _onFindReplaceStateChange: Emitter; public get searchString(): string { return this._searchString; } public get replaceString(): string { return this._replaceString; } diff --git a/src/vs/editor/contrib/find/test/findController.test.ts b/src/vs/editor/contrib/find/test/findController.test.ts index a76838541cd..dffd51edcf1 100644 --- a/src/vs/editor/contrib/find/test/findController.test.ts +++ b/src/vs/editor/contrib/find/test/findController.test.ts @@ -28,7 +28,7 @@ export class TestFindController extends CommonFindController { public delayUpdateHistory: boolean = false; public delayedUpdateHistoryPromise: TPromise; - private _delayedUpdateHistoryEvent: Emitter = new Emitter(); + private readonly _delayedUpdateHistoryEvent: Emitter = new Emitter(); constructor( editor: ICodeEditor, diff --git a/src/vs/editor/contrib/gotoError/gotoError.ts b/src/vs/editor/contrib/gotoError/gotoError.ts index 215e98316d5..770097758c4 100644 --- a/src/vs/editor/contrib/gotoError/gotoError.ts +++ b/src/vs/editor/contrib/gotoError/gotoError.ts @@ -34,8 +34,8 @@ class MarkerModel { private _nextIdx: number; private _toUnbind: IDisposable[]; private _ignoreSelectionChange: boolean; - private _onCurrentMarkerChanged: Emitter; - private _onMarkerSetChanged: Emitter; + private readonly _onCurrentMarkerChanged: Emitter; + private readonly _onMarkerSetChanged: Emitter; constructor(editor: ICodeEditor, markers: IMarker[]) { this._editor = editor; diff --git a/src/vs/editor/contrib/suggest/suggestModel.ts b/src/vs/editor/contrib/suggest/suggestModel.ts index b1943cfeb8e..d5eb71c38f1 100644 --- a/src/vs/editor/contrib/suggest/suggestModel.ts +++ b/src/vs/editor/contrib/suggest/suggestModel.ts @@ -96,9 +96,9 @@ export class SuggestModel implements IDisposable { private _currentSelection: Selection; private _completionModel: CompletionModel; - private _onDidCancel: Emitter = new Emitter(); - private _onDidTrigger: Emitter = new Emitter(); - private _onDidSuggest: Emitter = new Emitter(); + private readonly _onDidCancel: Emitter = new Emitter(); + private readonly _onDidTrigger: Emitter = new Emitter(); + private readonly _onDidSuggest: Emitter = new Emitter(); readonly onDidCancel: Event = this._onDidCancel.event; readonly onDidTrigger: Event = this._onDidTrigger.event; diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts index 20bcbe47fb7..c5b200594bb 100644 --- a/src/vs/editor/standalone/browser/simpleServices.ts +++ b/src/vs/editor/standalone/browser/simpleServices.ts @@ -73,7 +73,7 @@ export class SimpleEditor implements IEditor { export class SimpleModel implements ITextEditorModel { private model: ITextModel; - private _onDispose: Emitter; + private readonly _onDispose: Emitter; constructor(model: ITextModel) { this.model = model; @@ -308,7 +308,7 @@ export class StandaloneCommandService implements ICommandService { private readonly _instantiationService: IInstantiationService; private _dynamicCommands: { [id: string]: ICommand; }; - private _onWillExecuteCommand: Emitter = new Emitter(); + private readonly _onWillExecuteCommand: Emitter = new Emitter(); public readonly onWillExecuteCommand: Event = this._onWillExecuteCommand.event; constructor(instantiationService: IInstantiationService) { diff --git a/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts b/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts index be2163b1df4..f968e8af4ee 100644 --- a/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts +++ b/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts @@ -118,7 +118,7 @@ export class StandaloneThemeServiceImpl implements IStandaloneThemeService { private _knownThemes: Map; private _styleElement: HTMLStyleElement; private _theme: IStandaloneTheme; - private _onThemeChange: Emitter; + private readonly _onThemeChange: Emitter; constructor() { diff --git a/src/vs/platform/broadcast/electron-browser/broadcastService.ts b/src/vs/platform/broadcast/electron-browser/broadcastService.ts index 09c7f4f8ed6..363742731f6 100644 --- a/src/vs/platform/broadcast/electron-browser/broadcastService.ts +++ b/src/vs/platform/broadcast/electron-browser/broadcastService.ts @@ -29,7 +29,7 @@ export interface IBroadcastService { export class BroadcastService implements IBroadcastService { public _serviceBrand: any; - private _onBroadcast: Emitter; + private readonly _onBroadcast: Emitter; constructor( private windowId: number, diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts index 34b7a40b1c3..6afa82847d0 100644 --- a/src/vs/platform/configuration/common/configurationRegistry.ts +++ b/src/vs/platform/configuration/common/configurationRegistry.ts @@ -108,7 +108,7 @@ class ConfigurationRegistry implements IConfigurationRegistry { private overrideIdentifiers: string[] = []; private overridePropertyPattern: string; - private _onDidRegisterConfiguration: Emitter = new Emitter(); + private readonly _onDidRegisterConfiguration: Emitter = new Emitter(); readonly onDidRegisterConfiguration: Event = this._onDidRegisterConfiguration.event; constructor() { diff --git a/src/vs/platform/configuration/node/configuration.ts b/src/vs/platform/configuration/node/configuration.ts index 2fd2a77c115..4baa2bacc97 100644 --- a/src/vs/platform/configuration/node/configuration.ts +++ b/src/vs/platform/configuration/node/configuration.ts @@ -14,7 +14,7 @@ export class UserConfiguration extends Disposable { private userConfigModelWatcher: ConfigWatcher; - private _onDidChangeConfiguration: Emitter = this._register(new Emitter()); + private readonly _onDidChangeConfiguration: Emitter = this._register(new Emitter()); readonly onDidChangeConfiguration: Event = this._onDidChangeConfiguration.event; constructor(settingsPath: string) { diff --git a/src/vs/platform/configuration/node/configurationService.ts b/src/vs/platform/configuration/node/configurationService.ts index 301cddc1767..ad09412f1b5 100644 --- a/src/vs/platform/configuration/node/configurationService.ts +++ b/src/vs/platform/configuration/node/configurationService.ts @@ -23,7 +23,7 @@ export class ConfigurationService extends Disposable implements IConfigurationSe private _configuration: Configuration; private userConfiguration: UserConfiguration; - private _onDidChangeConfiguration: Emitter = this._register(new Emitter()); + private readonly _onDidChangeConfiguration: Emitter = this._register(new Emitter()); readonly onDidChangeConfiguration: Event = this._onDidChangeConfiguration.event; constructor( diff --git a/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts b/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts index 94fcaf68949..5abb0e06161 100644 --- a/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts +++ b/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts @@ -55,7 +55,7 @@ class JSONContributionRegistry implements IJSONContributionRegistry { private schemasById: { [id: string]: IJSONSchema }; - private _onDidChangeSchema: Emitter = new Emitter(); + private readonly _onDidChangeSchema: Emitter = new Emitter(); readonly onDidChangeSchema: Event = this._onDidChangeSchema.event; constructor() { diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts index f82cacdcbe2..48354624237 100644 --- a/src/vs/platform/list/browser/listService.ts +++ b/src/vs/platform/list/browser/listService.ts @@ -455,7 +455,7 @@ export interface IResourceResultsNavigationOptions { export class TreeResourceNavigator extends Disposable { - private _openResource: Emitter = new Emitter(); + private readonly _openResource: Emitter = new Emitter(); readonly openResource: Event = this._openResource.event; constructor(private tree: WorkbenchTree, private options?: IResourceResultsNavigationOptions) { diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts index 8dda89e35da..98150bdbb57 100644 --- a/src/vs/platform/notification/common/notification.ts +++ b/src/vs/platform/notification/common/notification.ts @@ -194,7 +194,7 @@ export interface INotificationService { export class NoOpNotification implements INotificationHandle { readonly progress = new NoOpProgress(); - private _onDidDispose: Emitter = new Emitter(); + private readonly _onDidDispose: Emitter = new Emitter(); public get onDidDispose(): Event { return this._onDidDispose.event; diff --git a/src/vs/platform/theme/common/themeService.ts b/src/vs/platform/theme/common/themeService.ts index b1ea014c043..81d106e5d22 100644 --- a/src/vs/platform/theme/common/themeService.ts +++ b/src/vs/platform/theme/common/themeService.ts @@ -100,7 +100,7 @@ export interface IThemingRegistry { class ThemingRegistry implements IThemingRegistry { private themingParticipants: IThemingParticipant[] = []; - private onThemingParticipantAddedEmitter: Emitter; + private readonly onThemingParticipantAddedEmitter: Emitter; constructor() { this.themingParticipants = []; diff --git a/src/vs/platform/url/electron-main/urlService.ts b/src/vs/platform/url/electron-main/urlService.ts index 684ac0c1fad..9dc01ee8bfa 100644 --- a/src/vs/platform/url/electron-main/urlService.ts +++ b/src/vs/platform/url/electron-main/urlService.ts @@ -16,7 +16,7 @@ export class URLService implements IURLService { _serviceBrand: any; - private openUrlEmitter: Emitter = new Emitter(); + private readonly openUrlEmitter: Emitter = new Emitter(); onOpenURL: Event; constructor( diff --git a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts index da321bf8c23..07c6fe3a51c 100644 --- a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts +++ b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts @@ -37,8 +37,8 @@ export class WorkspacesMainService implements IWorkspacesMainService { protected workspacesHome: string; - private _onWorkspaceSaved: Emitter; - private _onUntitledWorkspaceDeleted: Emitter; + private readonly _onWorkspaceSaved: Emitter; + private readonly _onUntitledWorkspaceDeleted: Emitter; constructor( @IEnvironmentService private environmentService: IEnvironmentService, diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditor.ts b/src/vs/workbench/api/electron-browser/mainThreadEditor.ts index 70803531e32..fd6eb713997 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadEditor.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadEditor.ts @@ -185,7 +185,7 @@ export class MainThreadTextEditor { private _codeEditorListeners: IDisposable[]; private _properties: MainThreadTextEditorProperties; - private _onPropertiesChanged: Emitter; + private readonly _onPropertiesChanged: Emitter; constructor( id: string, diff --git a/src/vs/workbench/api/electron-browser/mainThreadHeapService.ts b/src/vs/workbench/api/electron-browser/mainThreadHeapService.ts index 0c699210c82..9c4f09b7868 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadHeapService.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadHeapService.ts @@ -32,7 +32,7 @@ export class HeapService implements IHeapService { _serviceBrand: any; - private _onGarbageCollection: Emitter = new Emitter(); + private readonly _onGarbageCollection: Emitter = new Emitter(); public readonly onGarbageCollection: Event = this._onGarbageCollection.event; private _activeSignals = new WeakMap(); diff --git a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts index da7f3fdf2c7..825c9887c48 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts @@ -59,10 +59,10 @@ type TreeItemHandle = string; class TreeViewDataProvider implements ITreeViewDataProvider { - private _onDidChange: Emitter = new Emitter(); + private readonly _onDidChange: Emitter = new Emitter(); readonly onDidChange: Event = this._onDidChange.event; - private _onDispose: Emitter = new Emitter(); + private readonly _onDispose: Emitter = new Emitter(); readonly onDispose: Event = this._onDispose.event; private itemsMap: Map = new Map(); diff --git a/src/vs/workbench/api/node/extHostDebugService.ts b/src/vs/workbench/api/node/extHostDebugService.ts index d26585513fb..4dae5c7e40e 100644 --- a/src/vs/workbench/api/node/extHostDebugService.ts +++ b/src/vs/workbench/api/node/extHostDebugService.ts @@ -29,19 +29,19 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape { private _debugServiceProxy: MainThreadDebugServiceShape; private _debugSessions: Map = new Map(); - private _onDidStartDebugSession: Emitter; + private readonly _onDidStartDebugSession: Emitter; get onDidStartDebugSession(): Event { return this._onDidStartDebugSession.event; } - private _onDidTerminateDebugSession: Emitter; + private readonly _onDidTerminateDebugSession: Emitter; get onDidTerminateDebugSession(): Event { return this._onDidTerminateDebugSession.event; } - private _onDidChangeActiveDebugSession: Emitter; + private readonly _onDidChangeActiveDebugSession: Emitter; get onDidChangeActiveDebugSession(): Event { return this._onDidChangeActiveDebugSession.event; } private _activeDebugSession: ExtHostDebugSession | undefined; get activeDebugSession(): ExtHostDebugSession | undefined { return this._activeDebugSession; } - private _onDidReceiveDebugSessionCustomEvent: Emitter; + private readonly _onDidReceiveDebugSessionCustomEvent: Emitter; get onDidReceiveDebugSessionCustomEvent(): Event { return this._onDidReceiveDebugSessionCustomEvent.event; } private _activeDebugConsole: ExtHostDebugConsole; @@ -50,7 +50,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape { private _breakpoints: Map; private _breakpointEventsActive: boolean; - private _onDidChangeBreakpoints: Emitter; + private readonly _onDidChangeBreakpoints: Emitter; constructor(mainContext: IMainContext, workspace: ExtHostWorkspace) { diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts index 386bb11f23e..9e8ab0f94ea 100644 --- a/src/vs/workbench/api/node/extHostTerminalService.ts +++ b/src/vs/workbench/api/node/extHostTerminalService.ts @@ -98,7 +98,7 @@ export class ExtHostTerminal implements vscode.Terminal { export class ExtHostTerminalService implements ExtHostTerminalServiceShape { - private _onDidCloseTerminal: Emitter; + private readonly _onDidCloseTerminal: Emitter; private _proxy: MainThreadTerminalServiceShape; private _terminals: ExtHostTerminal[]; diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts index c2ac268a2a5..630a4ea6d42 100644 --- a/src/vs/workbench/browser/composite.ts +++ b/src/vs/workbench/browser/composite.ts @@ -28,8 +28,8 @@ import { IDisposable } from 'vs/base/common/lifecycle'; * layout and focus call, but only one create and dispose call. */ export abstract class Composite extends Component implements IComposite { - private _onTitleAreaUpdate: Emitter; - private _onDidFocus: Emitter; + private readonly _onTitleAreaUpdate: Emitter; + private readonly _onDidFocus: Emitter; private _focusTracker?: DOM.IFocusTracker; private _focusListenerDisposable?: IDisposable; diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts index 01adcb9b6ee..d0d0d016832 100644 --- a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts +++ b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts @@ -37,7 +37,7 @@ export interface ICompositeBarOptions { export class CompositeBar implements ICompositeBar { - private _onDidContextMenu: Emitter; + private readonly _onDidContextMenu: Emitter; private dimension: Dimension; private toDispose: IDisposable[]; diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts index b4cea8223f8..7cb79f64f5b 100644 --- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts +++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts @@ -24,7 +24,7 @@ import { ResourceViewerContext, ResourceViewer } from 'vs/workbench/browser/part * This class is only intended to be subclassed and not instantiated. */ export abstract class BaseBinaryResourceEditor extends BaseEditor { - private _onMetadataChanged: Emitter; + private readonly _onMetadataChanged: Emitter; private metadata: string; private binaryContainer: Builder; diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts index b8fc544f02c..1d38ea1d4dc 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts @@ -160,7 +160,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro private visibleEditorFocusTrackerDisposable: IDisposable[]; - private _onGroupFocusChanged: Emitter; + private readonly _onGroupFocusChanged: Emitter; private onStacksChangeScheduler: RunOnceScheduler; private stacksChangedBuffer: IStacksModelChangeEvent[]; diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 5526dea8fb8..bc31d17f9f9 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -106,11 +106,11 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService private revealIfOpen: boolean; private _onEditorsChanged: ThrottledEmitter; - private _onEditorOpening: Emitter; - private _onEditorGroupMoved: Emitter; - private _onEditorOpenFail: Emitter; - private _onGroupOrientationChanged: Emitter; - private _onTabOptionsChanged: Emitter; + private readonly _onEditorOpening: Emitter; + private readonly _onEditorGroupMoved: Emitter; + private readonly _onEditorOpenFail: Emitter; + private readonly _onGroupOrientationChanged: Emitter; + private readonly _onTabOptionsChanged: Emitter; private textCompareEditorVisible: IContextKey; diff --git a/src/vs/workbench/browser/parts/editor/rangeDecorations.ts b/src/vs/workbench/browser/parts/editor/rangeDecorations.ts index 482aa2db83a..1ca14bda80b 100644 --- a/src/vs/workbench/browser/parts/editor/rangeDecorations.ts +++ b/src/vs/workbench/browser/parts/editor/rangeDecorations.ts @@ -25,7 +25,7 @@ export class RangeHighlightDecorations implements IDisposable { private editor: ICodeEditor = null; private editorDisposables: IDisposable[] = []; - private _onHighlightRemoved: Emitter = new Emitter(); + private readonly _onHighlightRemoved: Emitter = new Emitter(); public readonly onHighlghtRemoved: Event = this._onHighlightRemoved.event; constructor(@IWorkbenchEditorService private editorService: IWorkbenchEditorService) { diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts index 04871674f0d..bc99ef57d05 100644 --- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts +++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts @@ -36,7 +36,7 @@ export class NotificationsCenter extends Themable { private notificationsList: NotificationsList; private _isVisible: boolean; private workbenchDimensions: Dimension; - private _onDidChangeVisibility: Emitter; + private readonly _onDidChangeVisibility: Emitter; private notificationsCenterVisibleContextKey: IContextKey; constructor( diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index 1f2180a394b..1f7db0818ec 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -84,8 +84,8 @@ export class QuickOpenController extends Component implements IQuickOpenService private static readonly ID = 'workbench.component.quickopen'; - private _onShow: Emitter; - private _onHide: Emitter; + private readonly _onShow: Emitter; + private readonly _onHide: Emitter; private quickOpenWidget: QuickOpenWidget; private pickOpenWidget: QuickOpenWidget; diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts index 93ca24c1b5b..5902db9740d 100644 --- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts +++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts @@ -194,7 +194,7 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet { protected viewsStates: Map = new Map(); private areExtensionsReady: boolean = false; - private _onDidChangeViewVisibilityState: Emitter = new Emitter(); + private readonly _onDidChangeViewVisibilityState: Emitter = new Emitter(); readonly onDidChangeViewVisibilityState: Event = this._onDidChangeViewVisibilityState.event; constructor( diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts index c3c08ff0983..30ef75dab20 100644 --- a/src/vs/workbench/common/editor.ts +++ b/src/vs/workbench/common/editor.ts @@ -96,7 +96,7 @@ export interface IEditorInputFactory { * Each editor input is mapped to an editor that is capable of opening it through the Platform facade. */ export abstract class EditorInput implements IEditorInput { - private _onDispose: Emitter; + private readonly _onDispose: Emitter; protected _onDidChangeDirty: Emitter; protected _onDidChangeLabel: Emitter; @@ -475,7 +475,7 @@ export interface ITextEditorModel extends IEditorModel { * are typically cached for some while because they are expensive to construct. */ export class EditorModel extends Disposable implements IEditorModel { - private _onDispose: Emitter; + private readonly _onDispose: Emitter; constructor() { super(); diff --git a/src/vs/workbench/common/editor/editorStacksModel.ts b/src/vs/workbench/common/editor/editorStacksModel.ts index 1077d224809..17e680012c1 100644 --- a/src/vs/workbench/common/editor/editorStacksModel.ts +++ b/src/vs/workbench/common/editor/editorStacksModel.ts @@ -61,17 +61,17 @@ export class EditorGroup implements IEditorGroup { private toDispose: IDisposable[]; private editorOpenPositioning: 'left' | 'right' | 'first' | 'last'; - private _onEditorActivated: Emitter; - private _onEditorOpened: Emitter; - private _onEditorClosed: Emitter; - private _onEditorDisposed: Emitter; - private _onEditorDirty: Emitter; - private _onEditorLabelChange: Emitter; - private _onEditorMoved: Emitter; - private _onEditorPinned: Emitter; - private _onEditorUnpinned: Emitter; - private _onEditorStateChanged: Emitter; - private _onEditorsStructureChanged: Emitter; + private readonly _onEditorActivated: Emitter; + private readonly _onEditorOpened: Emitter; + private readonly _onEditorClosed: Emitter; + private readonly _onEditorDisposed: Emitter; + private readonly _onEditorDirty: Emitter; + private readonly _onEditorLabelChange: Emitter; + private readonly _onEditorMoved: Emitter; + private readonly _onEditorPinned: Emitter; + private readonly _onEditorUnpinned: Emitter; + private readonly _onEditorStateChanged: Emitter; + private readonly _onEditorsStructureChanged: Emitter; constructor( arg1: string | ISerializedEditorGroup, @@ -709,22 +709,22 @@ export class EditorStacksModel implements IEditorStacksModel { private _activeGroup: EditorGroup; private groupToIdentifier: { [id: number]: EditorGroup }; - private _onGroupOpened: Emitter; - private _onGroupClosed: Emitter; - private _onGroupMoved: Emitter; - private _onGroupActivated: Emitter; - private _onGroupDeactivated: Emitter; - private _onGroupRenamed: Emitter; + private readonly _onGroupOpened: Emitter; + private readonly _onGroupClosed: Emitter; + private readonly _onGroupMoved: Emitter; + private readonly _onGroupActivated: Emitter; + private readonly _onGroupDeactivated: Emitter; + private readonly _onGroupRenamed: Emitter; - private _onEditorDisposed: Emitter; - private _onEditorDirty: Emitter; - private _onEditorLabelChange: Emitter; - private _onEditorOpened: Emitter; + private readonly _onEditorDisposed: Emitter; + private readonly _onEditorDirty: Emitter; + private readonly _onEditorLabelChange: Emitter; + private readonly _onEditorOpened: Emitter; - private _onWillCloseEditor: Emitter; - private _onEditorClosed: Emitter; + private readonly _onWillCloseEditor: Emitter; + private readonly _onEditorClosed: Emitter; - private _onModelChanged: Emitter; + private readonly _onModelChanged: Emitter; constructor( private restoreFromStorage: boolean, diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts index 7583194d5ed..bbb9eb7b016 100644 --- a/src/vs/workbench/common/editor/untitledEditorInput.ts +++ b/src/vs/workbench/common/editor/untitledEditorInput.ts @@ -35,8 +35,8 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport private cachedModel: UntitledEditorModel; private modelResolve: TPromise; - private _onDidModelChangeContent: Emitter; - private _onDidModelChangeEncoding: Emitter; + private readonly _onDidModelChangeContent: Emitter; + private readonly _onDidModelChangeEncoding: Emitter; private toUnbind: IDisposable[]; diff --git a/src/vs/workbench/common/editor/untitledEditorModel.ts b/src/vs/workbench/common/editor/untitledEditorModel.ts index ee33d7720af..fce75433f4a 100644 --- a/src/vs/workbench/common/editor/untitledEditorModel.ts +++ b/src/vs/workbench/common/editor/untitledEditorModel.ts @@ -28,9 +28,9 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin private toDispose: IDisposable[]; private dirty: boolean; - private _onDidChangeContent: Emitter; - private _onDidChangeDirty: Emitter; - private _onDidChangeEncoding: Emitter; + private readonly _onDidChangeContent: Emitter; + private readonly _onDidChangeDirty: Emitter; + private readonly _onDidChangeEncoding: Emitter; private versionId: number; diff --git a/src/vs/workbench/common/notifications.ts b/src/vs/workbench/common/notifications.ts index 75c67116fd2..f17997ba746 100644 --- a/src/vs/workbench/common/notifications.ts +++ b/src/vs/workbench/common/notifications.ts @@ -44,7 +44,7 @@ export interface INotificationChangeEvent { } export class NotificationHandle implements INotificationHandle { - private _onDidDispose: Emitter = new Emitter(); + private readonly _onDidDispose: Emitter = new Emitter(); constructor(private item: INotificationViewItem, private disposeItem: (item: INotificationViewItem) => void) { this.registerListeners(); @@ -89,7 +89,7 @@ export class NotificationsModel implements INotificationsModel { private _notifications: INotificationViewItem[]; - private _onDidNotificationChange: Emitter; + private readonly _onDidNotificationChange: Emitter; private toDispose: IDisposable[]; constructor() { @@ -253,7 +253,7 @@ export interface INotificationViewItemProgress extends INotificationProgress { export class NotificationViewItemProgress implements INotificationViewItemProgress { private _state: INotificationViewItemProgressState; - private _onDidChange: Emitter; + private readonly _onDidChange: Emitter; private toDispose: IDisposable[]; constructor() { @@ -358,9 +358,9 @@ export class NotificationViewItem implements INotificationViewItem { private _actions: INotificationActions; private _progress: NotificationViewItemProgress; - private _onDidExpansionChange: Emitter; - private _onDidDispose: Emitter; - private _onDidLabelChange: Emitter; + private readonly _onDidExpansionChange: Emitter; + private readonly _onDidDispose: Emitter; + private readonly _onDidLabelChange: Emitter; public static create(notification: INotification): INotificationViewItem { if (!notification || !notification.message || isPromiseCanceledError(notification.message)) { diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts index d4e23d0ad9b..01e160e6239 100644 --- a/src/vs/workbench/common/views.ts +++ b/src/vs/workbench/common/views.ts @@ -79,10 +79,10 @@ export interface IViewsRegistry { export const ViewsRegistry: IViewsRegistry = new class implements IViewsRegistry { - private _onViewsRegistered: Emitter = new Emitter(); + private readonly _onViewsRegistered: Emitter = new Emitter(); readonly onViewsRegistered: Event = this._onViewsRegistered.event; - private _onViewsDeregistered: Emitter = new Emitter(); + private readonly _onViewsDeregistered: Emitter = new Emitter(); readonly onViewsDeregistered: Event = this._onViewsDeregistered.event; private _viewLocations: ViewLocation[] = []; diff --git a/src/vs/workbench/electron-browser/resources.ts b/src/vs/workbench/electron-browser/resources.ts index 38d3b8a3eca..205b9ec8cb9 100644 --- a/src/vs/workbench/electron-browser/resources.ts +++ b/src/vs/workbench/electron-browser/resources.ts @@ -19,7 +19,7 @@ export class ResourceGlobMatcher { private static readonly NO_ROOT: string = null; - private _onExpressionChange: Emitter; + private readonly _onExpressionChange: Emitter; private toUnbind: IDisposable[]; private mapRootToParsedExpression: Map; private mapRootToExpressionConfig: Map; diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 8e549daad1c..2c4555fb729 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -174,7 +174,7 @@ export class Workbench implements IPartService { private static readonly fontAliasingConfigurationKey = 'workbench.fontAliasing'; - private _onTitleBarVisibilityChange: Emitter; + private readonly _onTitleBarVisibilityChange: Emitter; public _serviceBrand: any; diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts index 4485d42cf32..fcfb89953bb 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -733,10 +733,10 @@ export class Model implements IModel { private toDispose: lifecycle.IDisposable[]; private replElements: IReplElement[]; private schedulers = new Map(); - private _onDidChangeBreakpoints: Emitter; - private _onDidChangeCallStack: Emitter; - private _onDidChangeWatchExpressions: Emitter; - private _onDidChangeREPLElements: Emitter; + private readonly _onDidChangeBreakpoints: Emitter; + private readonly _onDidChangeCallStack: Emitter; + private readonly _onDidChangeWatchExpressions: Emitter; + private readonly _onDidChangeREPLElements: Emitter; constructor( private breakpoints: Breakpoint[], diff --git a/src/vs/workbench/parts/debug/common/debugViewModel.ts b/src/vs/workbench/parts/debug/common/debugViewModel.ts index bd7933c60a1..5d53cbd9566 100644 --- a/src/vs/workbench/parts/debug/common/debugViewModel.ts +++ b/src/vs/workbench/parts/debug/common/debugViewModel.ts @@ -14,9 +14,9 @@ export class ViewModel implements IViewModel { private _focusedThread: IThread; private selectedExpression: IExpression; private selectedFunctionBreakpoint: IFunctionBreakpoint; - private _onDidFocusProcess: Emitter; - private _onDidFocusStackFrame: Emitter<{ stackFrame: IStackFrame, explicit: boolean }>; - private _onDidSelectExpression: Emitter; + private readonly _onDidFocusProcess: Emitter; + private readonly _onDidFocusStackFrame: Emitter<{ stackFrame: IStackFrame, explicit: boolean }>; + private readonly _onDidSelectExpression: Emitter; private multiProcessView: boolean; private expressionSelectedContextKey: IContextKey; private breakpointSelectedContextKey: IContextKey; diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index 1189bbe31bb..f751c8b74b1 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -68,10 +68,10 @@ export class DebugService implements debug.IDebugService { public _serviceBrand: any; private sessionStates: Map; - private _onDidChangeState: Emitter; - private _onDidNewProcess: Emitter; - private _onDidEndProcess: Emitter; - private _onDidCustomEvent: Emitter; + private readonly _onDidChangeState: Emitter; + private readonly _onDidNewProcess: Emitter; + private readonly _onDidEndProcess: Emitter; + private readonly _onDidCustomEvent: Emitter; private model: Model; private viewModel: ViewModel; private allProcesses: Map; diff --git a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts index 655271753fc..3d919ceef9d 100644 --- a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts +++ b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts @@ -54,16 +54,16 @@ export class RawDebugSession extends V8Protocol implements debug.ISession { private _capabilities: DebugProtocol.Capabilities; private allThreadsContinued: boolean; - private _onDidInitialize: Emitter; - private _onDidStop: Emitter; - private _onDidContinued: Emitter; - private _onDidTerminateDebugee: Emitter; - private _onDidExitAdapter: Emitter; - private _onDidThread: Emitter; - private _onDidOutput: Emitter; - private _onDidBreakpoint: Emitter; - private _onDidCustomEvent: Emitter; - private _onDidEvent: Emitter; + private readonly _onDidInitialize: Emitter; + private readonly _onDidStop: Emitter; + private readonly _onDidContinued: Emitter; + private readonly _onDidTerminateDebugee: Emitter; + private readonly _onDidExitAdapter: Emitter; + private readonly _onDidThread: Emitter; + private readonly _onDidOutput: Emitter; + private readonly _onDidBreakpoint: Emitter; + private readonly _onDidCustomEvent: Emitter; + private readonly _onDidEvent: Emitter; constructor( id: string, diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts index 9120c5f8326..2cba4a82185 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts @@ -358,7 +358,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { private autoUpdateDelayer: ThrottledDelayer; private disposables: IDisposable[] = []; - private _onChange: Emitter = new Emitter(); + private readonly _onChange: Emitter = new Emitter(); get onChange(): Event { return this._onChange.event; } private _extensionAllowedBadgeProviders: string[]; diff --git a/src/vs/workbench/parts/output/common/output.ts b/src/vs/workbench/parts/output/common/output.ts index a81b9c68c42..380a775301c 100644 --- a/src/vs/workbench/parts/output/common/output.ts +++ b/src/vs/workbench/parts/output/common/output.ts @@ -165,10 +165,10 @@ export interface IOutputChannelRegistry { class OutputChannelRegistry implements IOutputChannelRegistry { private channels = new Map(); - private _onDidRegisterChannel: Emitter = new Emitter(); + private readonly _onDidRegisterChannel: Emitter = new Emitter(); readonly onDidRegisterChannel: Event = this._onDidRegisterChannel.event; - private _onDidRemoveChannel: Emitter = new Emitter(); + private readonly _onDidRemoveChannel: Emitter = new Emitter(); readonly onDidRemoveChannel: Event = this._onDidRemoveChannel.event; public registerChannel(id: string, label: string, file?: URI): void { diff --git a/src/vs/workbench/parts/output/electron-browser/outputServices.ts b/src/vs/workbench/parts/output/electron-browser/outputServices.ts index 58b49b56e59..da49aa87f30 100644 --- a/src/vs/workbench/parts/output/electron-browser/outputServices.ts +++ b/src/vs/workbench/parts/output/electron-browser/outputServices.ts @@ -315,7 +315,7 @@ class OutputChannelBackedByFile extends AbstractFileOutputChannel implements Out class OutputFileListener extends Disposable { - private _onDidChange: Emitter = new Emitter(); + private readonly _onDidChange: Emitter = new Emitter(); readonly onDidContentChange: Event = this._onDidChange.event; private watching: boolean = false; @@ -423,7 +423,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo private activeChannel: IOutputChannel; private readonly outputDir: string; - private _onActiveOutputChannel: Emitter = new Emitter(); + private readonly _onActiveOutputChannel: Emitter = new Emitter(); readonly onActiveOutputChannel: Event = this._onActiveOutputChannel.event; private _outputPanel: OutputPanel; @@ -651,7 +651,7 @@ class BufferredOutputChannel extends Disposable implements OutputChannel { protected _onDidAppendedContent: Emitter = new Emitter(); readonly onDidAppendedContent: Event = this._onDidAppendedContent.event; - private _onDispose: Emitter = new Emitter(); + private readonly _onDispose: Emitter = new Emitter(); readonly onDispose: Event = this._onDispose.event; private modelUpdater: RunOnceScheduler; diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index 7c23c490cbb..331b0455d91 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -398,7 +398,7 @@ class PreferencesRenderersController extends Disposable { private _lastQuery: string; private _lastFilterResult: IFilterResult; - private _onDidFilterResultsCountChange: Emitter = this._register(new Emitter()); + private readonly _onDidFilterResultsCountChange: Emitter = this._register(new Emitter()); public readonly onDidFilterResultsCountChange: Event = this._onDidFilterResultsCountChange.event; constructor( @@ -782,10 +782,10 @@ class SideBySidePreferencesWidget extends Widget { private settingsTargetsWidget: SettingsTargetsWidget; - private _onFocus: Emitter = new Emitter(); + private readonly _onFocus: Emitter = new Emitter(); readonly onFocus: Event = this._onFocus.event; - private _onDidSettingsTargetChange: Emitter = new Emitter(); + private readonly _onDidSettingsTargetChange: Emitter = new Emitter(); readonly onDidSettingsTargetChange: Event = this._onDidSettingsTargetChange.event; private lastFocusedEditor: BaseEditor; diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts index 7414cc58673..c54d1382081 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts @@ -69,13 +69,13 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend private modelChangeDelayer: Delayer = new Delayer(200); private associatedPreferencesModel: IPreferencesEditorModel; - private _onFocusPreference: Emitter = new Emitter(); + private readonly _onFocusPreference: Emitter = new Emitter(); public readonly onFocusPreference: Event = this._onFocusPreference.event; - private _onClearFocusPreference: Emitter = new Emitter(); + private readonly _onClearFocusPreference: Emitter = new Emitter(); public readonly onClearFocusPreference: Event = this._onClearFocusPreference.event; - private _onUpdatePreference: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>(); + private readonly _onUpdatePreference: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>(); public readonly onUpdatePreference: Event<{ key: string, value: any, source: IIndexedSetting }> = this._onUpdatePreference.event; private filterResult: IFilterResult; @@ -257,13 +257,13 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR private extensionCodelensRenderer: ExtensionCodelensRenderer; private filterResult: IFilterResult; - private _onUpdatePreference: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>(); + private readonly _onUpdatePreference: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>(); public readonly onUpdatePreference: Event<{ key: string, value: any, source: IIndexedSetting }> = this._onUpdatePreference.event; - private _onFocusPreference: Emitter = new Emitter(); + private readonly _onFocusPreference: Emitter = new Emitter(); public readonly onFocusPreference: Event = this._onFocusPreference.event; - private _onClearFocusPreference: Emitter = new Emitter(); + private readonly _onClearFocusPreference: Emitter = new Emitter(); public readonly onClearFocusPreference: Event = this._onClearFocusPreference.event; constructor(protected editor: ICodeEditor, public readonly preferencesModel: DefaultSettingsEditorModel, @@ -481,7 +481,7 @@ class DefaultSettingsHeaderRenderer extends Disposable { export class SettingsGroupTitleRenderer extends Disposable implements HiddenAreasProvider { - private _onHiddenAreasChanged: Emitter = new Emitter(); + private readonly _onHiddenAreasChanged: Emitter = new Emitter(); get onHiddenAreasChanged(): Event { return this._onHiddenAreasChanged.event; } private settingsGroups: ISettingsGroup[]; @@ -1031,7 +1031,7 @@ class EditSettingRenderer extends Disposable { public associatedPreferencesModel: IPreferencesEditorModel; private toggleEditPreferencesForMouseMoveDelayer: Delayer; - private _onUpdateSetting: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>(); + private readonly _onUpdateSetting: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>(); public readonly onUpdateSetting: Event<{ key: string, value: any, source: IIndexedSetting }> = this._onUpdateSetting.event; constructor(private editor: ICodeEditor, private masterSettingsModel: ISettingsEditorModel, @@ -1295,7 +1295,7 @@ class SettingHighlighter extends Disposable { private volatileHighlighter: RangeHighlightDecorations; private highlightedSetting: ISetting; - constructor(private editor: ICodeEditor, private focusEventEmitter: Emitter, private clearFocusEventEmitter: Emitter, + constructor(private editor: ICodeEditor, private readonly focusEventEmitter: Emitter, private readonly clearFocusEventEmitter: Emitter, @IInstantiationService instantiationService: IInstantiationService ) { super(); diff --git a/src/vs/workbench/parts/preferences/browser/preferencesService.ts b/src/vs/workbench/parts/preferences/browser/preferencesService.ts index 5694d586866..c569308d4e8 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesService.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesService.ts @@ -49,7 +49,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic private lastOpenedSettingsInput: PreferencesEditorInput = null; - private _onDispose: Emitter = new Emitter(); + private readonly _onDispose: Emitter = new Emitter(); private _defaultSettingsUriCounter = 0; private _defaultSettingsContentModel: DefaultSettings; diff --git a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts index 27f5b4b6522..7c1fe5a715d 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts @@ -461,7 +461,7 @@ export class SettingsTargetsWidget extends Widget { private _settingsTarget: SettingsTarget; - private _onDidTargetChange: Emitter = new Emitter(); + private readonly _onDidTargetChange: Emitter = new Emitter(); public readonly onDidTargetChange: Event = this._onDidTargetChange.event; constructor( @@ -573,10 +573,10 @@ export class SearchWidget extends Widget { private inputBox: InputBox; private controlsDiv: HTMLElement; - private _onDidChange: Emitter = this._register(new Emitter()); + private readonly _onDidChange: Emitter = this._register(new Emitter()); public readonly onDidChange: Event = this._onDidChange.event; - private _onFocus: Emitter = this._register(new Emitter()); + private readonly _onFocus: Emitter = this._register(new Emitter()); public readonly onFocus: Event = this._onFocus.event; constructor(parent: HTMLElement, protected options: SearchOptions, @@ -705,7 +705,7 @@ export class FloatingClickWidget extends Widget implements IOverlayWidget { private _domNode: HTMLElement; - private _onClick: Emitter = this._register(new Emitter()); + private readonly _onClick: Emitter = this._register(new Emitter()); public readonly onClick: Event = this._onClick.event; constructor( @@ -766,7 +766,7 @@ export class EditPreferenceWidget extends Disposable { private _editPreferenceDecoration: string[]; - private _onClick: Emitter = new Emitter(); + private readonly _onClick: Emitter = new Emitter(); public get onClick(): Event { return this._onClick.event; } constructor(private editor: ICodeEditor diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/parts/preferences/common/preferencesModels.ts index f01c87d6a13..f848112966d 100644 --- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts +++ b/src/vs/workbench/parts/preferences/common/preferencesModels.ts @@ -119,7 +119,7 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti private _settingsGroups: ISettingsGroup[]; protected settingsModel: ITextModel; - private _onDidChangeGroups: Emitter = this._register(new Emitter()); + private readonly _onDidChangeGroups: Emitter = this._register(new Emitter()); readonly onDidChangeGroups: Event = this._onDidChangeGroups.event; constructor(reference: IReference, private _configurationTarget: ConfigurationTarget) { @@ -597,7 +597,7 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements private _model: ITextModel; - private _onDidChangeGroups: Emitter = this._register(new Emitter()); + private readonly _onDidChangeGroups: Emitter = this._register(new Emitter()); readonly onDidChangeGroups: Event = this._onDidChangeGroups.event; constructor( diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts index fde99b17e98..8e3b4bcdb6f 100644 --- a/src/vs/workbench/parts/search/browser/searchView.ts +++ b/src/vs/workbench/parts/search/browser/searchView.ts @@ -98,7 +98,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel { private currentSelectedFileMatch: FileMatch; - private selectCurrentMatchEmitter: Emitter; + private readonly selectCurrentMatchEmitter: Emitter; private delayedRefresh: Delayer; private changedWhileHidden: boolean; diff --git a/src/vs/workbench/parts/search/common/searchModel.ts b/src/vs/workbench/parts/search/common/searchModel.ts index 8b9007ddb12..18e11204175 100644 --- a/src/vs/workbench/parts/search/common/searchModel.ts +++ b/src/vs/workbench/parts/search/common/searchModel.ts @@ -682,7 +682,7 @@ export class SearchModel extends Disposable { private _replaceString: string = null; private _replacePattern: ReplacePattern = null; - private _onReplaceTermChanged: Emitter = this._register(new Emitter()); + private readonly _onReplaceTermChanged: Emitter = this._register(new Emitter()); public readonly onReplaceTermChanged: Event = this._onReplaceTermChanged.event; private currentRequest: PPromise; diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts index 3ba1fa3b679..d6095e240be 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts @@ -453,7 +453,7 @@ class TaskService implements ITaskService { private _recentlyUsedTasks: LinkedMap; private _outputChannel: IOutputChannel; - private _onDidStateChange: Emitter; + private readonly _onDidStateChange: Emitter; constructor( @IConfigurationService private configurationService: IConfigurationService, diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts index 218b9a7b82b..6ed8756586a 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts @@ -91,7 +91,7 @@ export class TerminalTaskSystem implements ITaskSystem { private idleTaskTerminals: LinkedMap; private sameTaskTerminals: IStringDictionary; - private _onDidStateChange: Emitter; + private readonly _onDidStateChange: Emitter; constructor(private terminalService: ITerminalService, private outputService: IOutputService, private markerService: IMarkerService, private modelService: IModelService, diff --git a/src/vs/workbench/parts/tasks/node/processTaskSystem.ts b/src/vs/workbench/parts/tasks/node/processTaskSystem.ts index e4d06c6c0a2..33d321b4bcd 100644 --- a/src/vs/workbench/parts/tasks/node/processTaskSystem.ts +++ b/src/vs/workbench/parts/tasks/node/processTaskSystem.ts @@ -54,7 +54,7 @@ export class ProcessTaskSystem implements ITaskSystem { private activeTask: CustomTask; private activeTaskPromise: TPromise; - private _onDidStateChange: Emitter; + private readonly _onDidStateChange: Emitter; constructor(markerService: IMarkerService, modelService: IModelService, telemetryService: ITelemetryService, outputService: IOutputService, configurationResolverService: IConfigurationResolverService, outputChannelId: string) { diff --git a/src/vs/workbench/parts/terminal/common/terminalService.ts b/src/vs/workbench/parts/terminal/common/terminalService.ts index 4c8015144a1..47e8980ab39 100644 --- a/src/vs/workbench/parts/terminal/common/terminalService.ts +++ b/src/vs/workbench/parts/terminal/common/terminalService.ts @@ -31,7 +31,7 @@ export abstract class TerminalService implements ITerminalService { protected abstract _terminalInstances: ITerminalInstance[]; private _activeTabIndex: number; - private _onActiveTabChanged: Emitter; + private readonly _onActiveTabChanged: Emitter; public get activeTabIndex(): number { return this._activeTabIndex; } public get onActiveTabChanged(): Event { return this._onActiveTabChanged.event; } diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts index ebebeeecae9..1332c5ac1fb 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts @@ -78,10 +78,10 @@ export class TerminalInstance implements ITerminalInstance { private _processState: ProcessState; private _processReady: TPromise; private _isDisposed: boolean; - private _onDisposed: Emitter; - private _onFocused: Emitter; - private _onProcessIdReady: Emitter; - private _onTitleChanged: Emitter; + private readonly _onDisposed: Emitter; + private readonly _onFocused: Emitter; + private readonly _onProcessIdReady: Emitter; + private readonly _onTitleChanged: Emitter; private _process: cp.ChildProcess; private _processId: number; private _skipTerminalCommands: string[]; diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts index 569d67778ba..4cfec8095a9 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts @@ -248,9 +248,9 @@ export class TerminalTab extends Disposable implements ITerminalTab { public get terminalInstances(): ITerminalInstance[] { return this._terminalInstances; } - private _onDisposed: Emitter; + private readonly _onDisposed: Emitter; public get onDisposed(): Event { return this._onDisposed.event; } - private _onInstancesChanged: Emitter; + private readonly _onInstancesChanged: Emitter; public get onInstancesChanged(): Event { return this._onInstancesChanged.event; } constructor( diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts index ce2d3330e42..9cecaf60a04 100644 --- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts +++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts @@ -31,7 +31,7 @@ export class WebviewEditor extends BaseWebviewEditor { private editorFrame: HTMLElement; private content: HTMLElement; private webviewContent: HTMLElement | undefined; - private _onDidFocusWebview: Emitter; + private readonly _onDidFocusWebview: Emitter; private _webviewFocusTracker?: DOM.IFocusTracker; private _webviewFocusListenerDisposable?: IDisposable; diff --git a/src/vs/workbench/services/commands/common/commandService.ts b/src/vs/workbench/services/commands/common/commandService.ts index 325c15c2304..1eb6dbd8337 100644 --- a/src/vs/workbench/services/commands/common/commandService.ts +++ b/src/vs/workbench/services/commands/common/commandService.ts @@ -18,7 +18,7 @@ export class CommandService extends Disposable implements ICommandService { private _extensionHostIsReady: boolean = false; - private _onWillExecuteCommand: Emitter = this._register(new Emitter()); + private readonly _onWillExecuteCommand: Emitter = this._register(new Emitter()); public readonly onWillExecuteCommand: Event = this._onWillExecuteCommand.event; constructor( diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts index 3a91b6124be..42f7422ccab 100644 --- a/src/vs/workbench/services/configuration/node/configuration.ts +++ b/src/vs/workbench/services/configuration/node/configuration.ts @@ -79,7 +79,7 @@ export class WorkspaceConfiguration extends Disposable { private _workspaceConfigurationWatcher: ConfigWatcher; private _workspaceConfigurationWatcherDisposables: IDisposable[] = []; - private _onDidUpdateConfiguration: Emitter = this._register(new Emitter()); + private readonly _onDidUpdateConfiguration: Emitter = this._register(new Emitter()); public readonly onDidUpdateConfiguration: Event = this._onDidUpdateConfiguration.event; private _workspaceConfigurationModelParser: WorkspaceConfigurationModelParser = new WorkspaceConfigurationModelParser(this._workspaceConfigPath ? this._workspaceConfigPath.fsPath : ''); @@ -182,7 +182,7 @@ export class FolderConfiguration extends Disposable { private _cache: ConfigurationModel = new ConfigurationModel(); private reloadConfigurationScheduler: RunOnceScheduler; - private reloadConfigurationEventEmitter: Emitter = new Emitter(); + private readonly reloadConfigurationEventEmitter: Emitter = new Emitter(); constructor(private folder: URI, private configFolderRelativePath: string, workbenchState: WorkbenchState) { super(); diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts index 5d2170bd704..a9afa456764 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts @@ -39,7 +39,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/ export class ExtensionHostProcessWorker { - private _onCrashed: Emitter<[number, string]> = new Emitter<[number, string]>(); + private readonly _onCrashed: Emitter<[number, string]> = new Emitter<[number, string]>(); public readonly onCrashed: Event<[number, string]> = this._onCrashed.event; private readonly _toDispose: IDisposable[]; diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts index 828fbbeccea..10cc935cfc2 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts @@ -113,7 +113,7 @@ const NO_OP_VOID_PROMISE = TPromise.wrap(void 0); export class ExtensionService extends Disposable implements IExtensionService { public _serviceBrand: any; - private _onDidRegisterExtensions: Emitter; + private readonly _onDidRegisterExtensions: Emitter; private _registry: ExtensionDescriptionRegistry; private readonly _installedExtensionsReady: Barrier; diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts index 65a35903839..d1ab87b2dca 100644 --- a/src/vs/workbench/services/files/node/fileService.ts +++ b/src/vs/workbench/services/files/node/fileService.ts @@ -119,8 +119,8 @@ export class FileService implements IFileService { private tmpPath: string; private options: IFileServiceOptions; - private _onFileChanges: Emitter; - private _onAfterOperation: Emitter; + private readonly _onFileChanges: Emitter; + private readonly _onAfterOperation: Emitter; private toDispose: IDisposable[]; diff --git a/src/vs/workbench/services/files/test/node/watcher.test.ts b/src/vs/workbench/services/files/test/node/watcher.test.ts index 705595868cf..0d5241d9e01 100644 --- a/src/vs/workbench/services/files/test/node/watcher.test.ts +++ b/src/vs/workbench/services/files/test/node/watcher.test.ts @@ -14,7 +14,7 @@ import { IRawFileChange, toFileChangesEvent, normalize } from 'vs/workbench/serv import Event, { Emitter } from 'vs/base/common/event'; class TestFileWatcher { - private _onFileChanges: Emitter; + private readonly _onFileChanges: Emitter; constructor() { this._onFileChanges = new Emitter(); diff --git a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts index b502f9e0b9d..46a6b69fd63 100644 --- a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts +++ b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts @@ -46,7 +46,7 @@ export class KeyboardMapperFactory { private _keyboardMapper: IKeyboardMapper; private _initialized: boolean; - private _onDidChangeKeyboardMapper: Emitter = new Emitter(); + private readonly _onDidChangeKeyboardMapper: Emitter = new Emitter(); public readonly onDidChangeKeyboardMapper: Event = this._onDidChangeKeyboardMapper.event; private constructor() { diff --git a/src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts b/src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts index b1fc901210c..37df6d23904 100644 --- a/src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts +++ b/src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts @@ -28,7 +28,7 @@ export class TMScopeRegistry { private _scopeNameToLanguageRegistration: { [scopeName: string]: TMLanguageRegistration; }; private _encounteredLanguages: boolean[]; - private _onDidEncounterLanguage: Emitter = new Emitter(); + private readonly _onDidEncounterLanguage: Emitter = new Emitter(); public readonly onDidEncounterLanguage: Event = this._onDidEncounterLanguage.event; constructor() { diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts index a7a727b008b..6b441fec287 100644 --- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts +++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts @@ -63,8 +63,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil private disposed: boolean; private lastSaveAttemptTime: number; private createTextEditorModelPromise: TPromise; - private _onDidContentChange: Emitter; - private _onDidStateChange: Emitter; + private readonly _onDidContentChange: Emitter; + private readonly _onDidStateChange: Emitter; private inConflictMode: boolean; private inOrphanMode: boolean; diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts index 9f4a1d25852..0173c3cd511 100644 --- a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts +++ b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts @@ -17,14 +17,14 @@ import { ResourceMap } from 'vs/base/common/map'; export class TextFileEditorModelManager implements ITextFileEditorModelManager { private toUnbind: IDisposable[]; - private _onModelDisposed: Emitter; - private _onModelContentChanged: Emitter; - private _onModelDirty: Emitter; - private _onModelSaveError: Emitter; - private _onModelSaved: Emitter; - private _onModelReverted: Emitter; - private _onModelEncodingChanged: Emitter; - private _onModelOrphanedChanged: Emitter; + private readonly _onModelDisposed: Emitter; + private readonly _onModelContentChanged: Emitter; + private readonly _onModelDirty: Emitter; + private readonly _onModelSaveError: Emitter; + private readonly _onModelSaved: Emitter; + private readonly _onModelReverted: Emitter; + private readonly _onModelEncodingChanged: Emitter; + private readonly _onModelOrphanedChanged: Emitter; private _onModelsDirtyEvent: Event; private _onModelsSaveError: Event; diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts index 6b73f366329..f8179a008ee 100644 --- a/src/vs/workbench/services/textfile/common/textFileService.ts +++ b/src/vs/workbench/services/textfile/common/textFileService.ts @@ -51,10 +51,10 @@ export abstract class TextFileService implements ITextFileService { private toUnbind: IDisposable[]; private _models: TextFileEditorModelManager; - private _onFilesAssociationChange: Emitter; + private readonly _onFilesAssociationChange: Emitter; private currentFilesAssociationConfig: { [key: string]: string; }; - private _onAutoSaveConfigurationChange: Emitter; + private readonly _onAutoSaveConfigurationChange: Emitter; private configuredAutoSaveDelay: number; private configuredAutoSaveOnFocusChange: boolean; private configuredAutoSaveOnWindowChange: boolean; diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts index c7062184e69..c7b8ad98b4a 100644 --- a/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts +++ b/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts @@ -47,7 +47,7 @@ let themesExtPoint = ExtensionsRegistry.registerExtensionPoint; + private readonly onDidChangeEmitter: Emitter; public get onDidChange(): Event { return this.onDidChangeEmitter.event; } diff --git a/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts b/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts index 518e23f8272..8970ada6107 100644 --- a/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts +++ b/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts @@ -41,7 +41,7 @@ let iconThemeExtPoint = ExtensionsRegistry.registerExtensionPoint; + private readonly onDidChangeEmitter: Emitter; public get onDidChange(): Event { return this.onDidChangeEmitter.event; } diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts index fe41754641a..b94f45d96a7 100644 --- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts +++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts @@ -74,11 +74,11 @@ export class WorkbenchThemeService implements IWorkbenchThemeService { private colorThemeStore: ColorThemeStore; private currentColorTheme: ColorThemeData; private container: HTMLElement; - private onColorThemeChange: Emitter; + private readonly onColorThemeChange: Emitter; private iconThemeStore: FileIconThemeStore; private currentIconTheme: IFileIconTheme; - private onFileIconThemeChange: Emitter; + private readonly onFileIconThemeChange: Emitter; private themingParticipantChangeListener: IDisposable; private _configurationWriter: ConfigurationWriter; diff --git a/src/vs/workbench/services/untitled/common/untitledEditorService.ts b/src/vs/workbench/services/untitled/common/untitledEditorService.ts index fed40daa61a..0d6bd9e89ff 100644 --- a/src/vs/workbench/services/untitled/common/untitledEditorService.ts +++ b/src/vs/workbench/services/untitled/common/untitledEditorService.ts @@ -110,10 +110,10 @@ export class UntitledEditorService implements IUntitledEditorService { private mapResourceToInput = new ResourceMap(); private mapResourceToAssociatedFilePath = new ResourceMap(); - private _onDidChangeContent: Emitter; - private _onDidChangeDirty: Emitter; - private _onDidChangeEncoding: Emitter; - private _onDidDisposeModel: Emitter; + private readonly _onDidChangeContent: Emitter; + private readonly _onDidChangeDirty: Emitter; + private readonly _onDidChangeEncoding: Emitter; + private readonly _onDidDisposeModel: Emitter; constructor( @IInstantiationService private instantiationService: IInstantiationService, diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts index bf33bed2993..8d9be41ed67 100644 --- a/src/vs/workbench/test/workbenchTestServices.ts +++ b/src/vs/workbench/test/workbenchTestServices.ts @@ -77,9 +77,9 @@ export class TestContextService implements IWorkspaceContextService { private workspace: IWorkbenchWorkspace; private options: any; - private _onDidChangeWorkspaceName: Emitter; - private _onDidChangeWorkspaceFolders: Emitter; - private _onDidChangeWorkbenchState: Emitter; + private readonly _onDidChangeWorkspaceName: Emitter; + private readonly _onDidChangeWorkspaceFolders: Emitter; + private readonly _onDidChangeWorkbenchState: Emitter; constructor(workspace: any = TestWorkspace, options: any = null) { this.workspace = workspace; @@ -475,12 +475,12 @@ export class TestEditorGroupService implements IEditorGroupService { private stacksModel: EditorStacksModel; - private _onEditorsChanged: Emitter; - private _onEditorOpening: Emitter; - private _onEditorOpenFail: Emitter; - private _onEditorsMoved: Emitter; - private _onGroupOrientationChanged: Emitter; - private _onTabOptionsChanged: Emitter; + private readonly _onEditorsChanged: Emitter; + private readonly _onEditorOpening: Emitter; + private readonly _onEditorOpenFail: Emitter; + private readonly _onEditorsMoved: Emitter; + private readonly _onGroupOrientationChanged: Emitter; + private readonly _onTabOptionsChanged: Emitter; constructor(callback?: (method: string) => void) { this._onEditorsMoved = new Emitter(); @@ -679,8 +679,8 @@ export class TestFileService implements IFileService { public _serviceBrand: any; - private _onFileChanges: Emitter; - private _onAfterOperation: Emitter; + private readonly _onFileChanges: Emitter; + private readonly _onAfterOperation: Emitter; private content = 'Hello Html';