From af35040758425ffb783ab59a92ecbf4e79a0315c Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 3 Jan 2019 15:44:55 -0800 Subject: [PATCH] Always require an explicit argument for Emitter.fire Calling `fire` with zero arguments results in the emitter firing with `undefined`. This is often not expected or desired. It should be explicit that the emitter is fired with undefined --- src/vs/base/browser/ui/grid/gridview.ts | 12 +++++----- src/vs/base/browser/ui/splitview/panelview.ts | 6 ++--- src/vs/base/common/event.ts | 14 +++++------ src/vs/base/parts/ipc/node/ipc.net.ts | 2 +- src/vs/base/test/browser/ui/grid/util.ts | 10 ++++---- .../browser/ui/splitview/splitview.test.ts | 4 ++-- src/vs/base/test/common/event.test.ts | 10 ++++---- src/vs/editor/contrib/gotoError/gotoError.ts | 2 +- src/vs/monaco.d.ts | 2 +- src/vs/platform/actions/common/actions.ts | 4 ++-- src/vs/platform/actions/common/menuService.ts | 6 ++--- src/vs/platform/download/node/downloadIpc.ts | 2 +- .../browser/parts/editor/editorControl.ts | 2 +- .../browser/parts/editor/editorPart.ts | 2 +- .../browser/parts/editor/sideBySideEditor.ts | 2 +- .../browser/parts/quickinput/quickInput.ts | 8 +++---- .../electron-browser/suggestEnabledInput.ts | 2 +- .../electron-browser/commentThreadWidget.ts | 2 +- .../parts/debug/common/debugModel.ts | 16 ++++++------- .../node/extensionsWorkbenchService.ts | 6 ++--- .../electron-browser/markersTreeViewer.ts | 2 +- .../preferences/browser/preferencesEditor.ts | 2 +- .../search/browser/patternInputWidget.ts | 4 ++-- .../parts/search/browser/searchView.ts | 4 ++-- .../parts/search/browser/searchWidget.ts | 4 ++-- .../parts/terminal/common/terminal.ts | 2 +- .../parts/terminal/common/terminalService.ts | 4 ++-- .../parts/terminal/node/windowsShellHelper.ts | 6 ++--- .../api/extHostTreeViews.test.ts | 24 +++++++++---------- 29 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/vs/base/browser/ui/grid/gridview.ts b/src/vs/base/browser/ui/grid/gridview.ts index 275d9a118a7..02f8ae90a05 100644 --- a/src/vs/base/browser/ui/grid/gridview.ts +++ b/src/vs/base/browser/ui/grid/gridview.ts @@ -21,7 +21,7 @@ export interface IView { readonly maximumWidth: number; readonly minimumHeight: number; readonly maximumHeight: number; - readonly onDidChange: Event<{ width: number; height: number; }>; + readonly onDidChange: Event<{ width: number; height: number; } | undefined>; readonly priority?: LayoutPriority; readonly snapSize?: number; layout(width: number, height: number): void; @@ -308,7 +308,7 @@ class BranchNode implements ISplitView, IDisposable { this.childrenSashResetDisposable.dispose(); this.childrenSashResetDisposable = onDidChildrenSashReset(this._onDidSashReset.fire, this._onDidSashReset); - this._onDidChange.fire(); + this._onDidChange.fire(undefined); } trySet2x2(other: BranchNode): IDisposable { @@ -348,8 +348,8 @@ class BranchNode implements ISplitView, IDisposable { mySash.linkedSash = otherSash; otherSash.linkedSash = mySash; - this._onDidChange.fire(); - other._onDidChange.fire(); + this._onDidChange.fire(undefined); + other._onDidChange.fire(undefined); return toDisposable(() => { mySash.linkedSash = otherSash.linkedSash = undefined; @@ -391,7 +391,7 @@ class LeafNode implements ISplitView, IDisposable { set linkedWidthNode(node: LeafNode | undefined) { this._onDidLinkedWidthNodeChange.input = node ? node._onDidViewChange : Event.None; this._linkedWidthNode = node; - this._onDidSetLinkedNode.fire(); + this._onDidSetLinkedNode.fire(undefined); } private _onDidLinkedHeightNodeChange = new Relay(); @@ -400,7 +400,7 @@ class LeafNode implements ISplitView, IDisposable { set linkedHeightNode(node: LeafNode | undefined) { this._onDidLinkedHeightNodeChange.input = node ? node._onDidViewChange : Event.None; this._linkedHeightNode = node; - this._onDidSetLinkedNode.fire(); + this._onDidSetLinkedNode.fire(undefined); } private _onDidSetLinkedNode = new Emitter(); diff --git a/src/vs/base/browser/ui/splitview/panelview.ts b/src/vs/base/browser/ui/splitview/panelview.ts index 0e19843ff3c..a78bb77de5e 100644 --- a/src/vs/base/browser/ui/splitview/panelview.ts +++ b/src/vs/base/browser/ui/splitview/panelview.ts @@ -77,7 +77,7 @@ export abstract class Panel implements IView { set minimumBodySize(size: number) { this._minimumBodySize = size; - this._onDidChange.fire(); + this._onDidChange.fire(undefined); } get maximumBodySize(): number { @@ -86,7 +86,7 @@ export abstract class Panel implements IView { set maximumBodySize(size: number) { this._maximumBodySize = size; - this._onDidChange.fire(); + this._onDidChange.fire(undefined); } private get headerSize(): number { @@ -145,7 +145,7 @@ export abstract class Panel implements IView { this._headerVisible = !!visible; this.updateHeader(); - this._onDidChange.fire(); + this._onDidChange.fire(undefined); } render(): void { diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts index a32498be856..c38d38816ee 100644 --- a/src/vs/base/common/event.ts +++ b/src/vs/base/common/event.ts @@ -137,7 +137,7 @@ export namespace Event { output = undefined; handle = undefined; if (!leading || numDebouncedCalls > 1) { - emitter.fire(_output); + emitter.fire(_output!); } numDebouncedCalls = 0; @@ -332,17 +332,17 @@ export namespace Event { return result.event; } - export function fromPromise(promise: Promise): Event { - const emitter = new Emitter(); + export function fromPromise(promise: Promise): Event { + const emitter = new Emitter(); let shouldEmit = false; promise .then(undefined, () => null) .then(() => { if (!shouldEmit) { - setTimeout(() => emitter.fire(), 0); + setTimeout(() => emitter.fire(undefined), 0); } else { - emitter.fire(); + emitter.fire(undefined); } }); @@ -466,7 +466,7 @@ export class Emitter { private readonly _leakageMon: LeakageMonitor | undefined; private _disposed: boolean = false; private _event: Event | undefined; - private _deliveryQueue: [Listener, (T | undefined)][] | undefined; + private _deliveryQueue: [Listener, T][] | undefined; protected _listeners: LinkedList | undefined; constructor(options?: EmitterOptions) { @@ -541,7 +541,7 @@ export class Emitter { * To be kept private to fire an event to * subscribers */ - fire(event?: T): any { + fire(event: T): any { if (this._listeners) { // put all [listener,event]-pairs into delivery queue // then emit all event. an inner/nested event might be diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts index 6065b5134c7..40ddff4c22d 100644 --- a/src/vs/base/parts/ipc/node/ipc.net.ts +++ b/src/vs/base/parts/ipc/node/ipc.net.ts @@ -292,7 +292,7 @@ function createBufferedEvent(source: Event): Event { } isDeliveringMessages = true; while (hasListeners && bufferedMessages.length > 0) { - emitter.fire(bufferedMessages.shift()); + emitter.fire(bufferedMessages.shift()!); } isDeliveringMessages = false; }; diff --git a/src/vs/base/test/browser/ui/grid/util.ts b/src/vs/base/test/browser/ui/grid/util.ts index 7c4912b3101..0efdc44851a 100644 --- a/src/vs/base/test/browser/ui/grid/util.ts +++ b/src/vs/base/test/browser/ui/grid/util.ts @@ -9,20 +9,20 @@ import { IView, GridNode, isGridBranchNode, } from 'vs/base/browser/ui/grid/grid export class TestView implements IView { - private _onDidChange = new Emitter<{ width: number; height: number; }>(); + private _onDidChange = new Emitter<{ width: number; height: number; } | undefined>(); readonly onDidChange = this._onDidChange.event; get minimumWidth(): number { return this._minimumWidth; } - set minimumWidth(size: number) { this._minimumWidth = size; this._onDidChange.fire(); } + set minimumWidth(size: number) { this._minimumWidth = size; this._onDidChange.fire(undefined); } get maximumWidth(): number { return this._maximumWidth; } - set maximumWidth(size: number) { this._maximumWidth = size; this._onDidChange.fire(); } + set maximumWidth(size: number) { this._maximumWidth = size; this._onDidChange.fire(undefined); } get minimumHeight(): number { return this._minimumHeight; } - set minimumHeight(size: number) { this._minimumHeight = size; this._onDidChange.fire(); } + set minimumHeight(size: number) { this._minimumHeight = size; this._onDidChange.fire(undefined); } get maximumHeight(): number { return this._maximumHeight; } - set maximumHeight(size: number) { this._maximumHeight = size; this._onDidChange.fire(); } + set maximumHeight(size: number) { this._maximumHeight = size; this._onDidChange.fire(undefined); } private _element: HTMLElement = document.createElement('div'); get element(): HTMLElement { this._onDidGetElement.fire(); return this._element; } diff --git a/src/vs/base/test/browser/ui/splitview/splitview.test.ts b/src/vs/base/test/browser/ui/splitview/splitview.test.ts index 7f25e55619d..674eb8ece90 100644 --- a/src/vs/base/test/browser/ui/splitview/splitview.test.ts +++ b/src/vs/base/test/browser/ui/splitview/splitview.test.ts @@ -14,10 +14,10 @@ class TestView implements IView { readonly onDidChange = this._onDidChange.event; get minimumSize(): number { return this._minimumSize; } - set minimumSize(size: number) { this._minimumSize = size; this._onDidChange.fire(); } + set minimumSize(size: number) { this._minimumSize = size; this._onDidChange.fire(undefined); } get maximumSize(): number { return this._maximumSize; } - set maximumSize(size: number) { this._maximumSize = size; this._onDidChange.fire(); } + set maximumSize(size: number) { this._maximumSize = size; this._onDidChange.fire(undefined); } private _element: HTMLElement = document.createElement('div'); get element(): HTMLElement { this._onDidGetElement.fire(); return this._element; } diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts index bb2618bc423..a08f0aa538c 100644 --- a/src/vs/base/test/common/event.test.ts +++ b/src/vs/base/test/common/event.test.ts @@ -111,7 +111,7 @@ suite('Event', function () { Errors.setUnexpectedErrorHandler(() => null); try { - let a = new Emitter(); + let a = new Emitter(); let hit = false; a.event(function () { throw 9; @@ -134,19 +134,19 @@ suite('Event', function () { } const context = {}; - let emitter = new Emitter(); + let emitter = new Emitter(); let reg1 = emitter.event(listener, context); let reg2 = emitter.event(listener, context); - emitter.fire(); + emitter.fire(undefined); assert.equal(counter, 2); reg1.dispose(); - emitter.fire(); + emitter.fire(undefined); assert.equal(counter, 3); reg2.dispose(); - emitter.fire(); + emitter.fire(undefined); assert.equal(counter, 3); }); diff --git a/src/vs/editor/contrib/gotoError/gotoError.ts b/src/vs/editor/contrib/gotoError/gotoError.ts index 997d3ab7607..e8db7961ddb 100644 --- a/src/vs/editor/contrib/gotoError/gotoError.ts +++ b/src/vs/editor/contrib/gotoError/gotoError.ts @@ -31,7 +31,7 @@ class MarkerModel { private _nextIdx: number; private _toUnbind: IDisposable[]; private _ignoreSelectionChange: boolean; - private readonly _onCurrentMarkerChanged: Emitter; + private readonly _onCurrentMarkerChanged: Emitter; private readonly _onMarkerSetChanged: Emitter; constructor(editor: ICodeEditor, markers: IMarker[]) { diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 8224e78e7f8..c8d38d4bbd2 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -21,7 +21,7 @@ declare namespace monaco { export class Emitter { constructor(); readonly event: IEvent; - fire(event?: T): void; + fire(event: T): void; dispose(): void; } diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts index 30efbaa4eb6..6632fd1841a 100644 --- a/src/vs/platform/actions/common/actions.ts +++ b/src/vs/platform/actions/common/actions.ts @@ -104,7 +104,7 @@ export interface IMenuActionOptions { } export interface IMenu extends IDisposable { - onDidChange: Event; + readonly onDidChange: Event; getActions(options?: IMenuActionOptions): [string, Array][]; } @@ -123,7 +123,7 @@ export interface IMenuRegistry { getCommands(): ICommandsMap; appendMenuItem(menu: MenuId, item: IMenuItem | ISubmenuItem): IDisposable; getMenuItems(loc: MenuId): Array; - onDidChangeMenu: Event; + readonly onDidChangeMenu: Event; } export interface ICommandsMap { diff --git a/src/vs/platform/actions/common/menuService.ts b/src/vs/platform/actions/common/menuService.ts index e75485c4770..f39cefee65e 100644 --- a/src/vs/platform/actions/common/menuService.ts +++ b/src/vs/platform/actions/common/menuService.ts @@ -29,7 +29,7 @@ type MenuItemGroup = [string, Array]; class Menu implements IMenu { - private readonly _onDidChange = new Emitter(); + private readonly _onDidChange = new Emitter(); private readonly _disposables: IDisposable[] = []; private _menuGroups: MenuItemGroup[]; @@ -56,7 +56,7 @@ class Menu implements IMenu { this._contextKeyService.onDidChangeContext, (last, event) => last || event.affectsSome(this._contextKeys), 50 - )(e => e && this._onDidChange.fire(), this, this._disposables); + )(e => e && this._onDidChange.fire(undefined), this, this._disposables); } private _build(): void { @@ -100,7 +100,7 @@ class Menu implements IMenu { this._onDidChange.dispose(); } - get onDidChange(): Event { + get onDidChange(): Event { return this._onDidChange.event; } diff --git a/src/vs/platform/download/node/downloadIpc.ts b/src/vs/platform/download/node/downloadIpc.ts index 09781ffb3c3..03369f885ca 100644 --- a/src/vs/platform/download/node/downloadIpc.ts +++ b/src/vs/platform/download/node/downloadIpc.ts @@ -19,7 +19,7 @@ export function upload(uri: URI): Event { const readstream = fs.createReadStream(uri.fsPath); readstream.on('data', data => stream.fire(data)); readstream.on('error', error => stream.fire(error.toString())); - readstream.on('close', () => stream.fire()); + readstream.on('close', () => stream.fire(undefined)); return stream.event; } diff --git a/src/vs/workbench/browser/parts/editor/editorControl.ts b/src/vs/workbench/browser/parts/editor/editorControl.ts index c2545617136..304b65c42d3 100644 --- a/src/vs/workbench/browser/parts/editor/editorControl.ts +++ b/src/vs/workbench/browser/parts/editor/editorControl.ts @@ -142,7 +142,7 @@ export class EditorControl extends Disposable { } // Indicate that size constraints could have changed due to new editor - this._onDidSizeConstraintsChange.fire(); + this._onDidSizeConstraintsChange.fire(undefined); } private doSetInput(control: BaseEditor, editor: EditorInput, options: EditorOptions): Promise { diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 3bf1629abf4..ef170a13346 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -920,7 +920,7 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor this._onDidSizeConstraintsChange.input = gridWidget.onDidChange; } - this.onDidSetGridWidget.fire(); + this.onDidSetGridWidget.fire(undefined); } private updateContainer(): void { diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts index 072458eec9b..896c0d66c44 100644 --- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts +++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts @@ -198,7 +198,7 @@ export class SideBySideEditor extends BaseEditor { Event.map(master.onDidSizeConstraintsChange, () => undefined) ); - this.onDidCreateEditors.fire(); + this.onDidCreateEditors.fire(undefined); return Promise.all([this.detailsEditor.setInput(detailsInput, null, token), this.masterEditor.setInput(masterInput, options, token)]).then(() => this.focus()); } diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts index 029666b0cef..675ea229fb8 100644 --- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts +++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts @@ -482,7 +482,7 @@ class QuickPick extends QuickInput implements IQuickPi this._selectedItems = [this.activeItems[0]]; this.onDidChangeSelectionEmitter.fire(this.selectedItems); } - this.onDidAcceptEmitter.fire(); + this.onDidAcceptEmitter.fire(undefined); }), this.ui.list.onDidChangeFocus(focusedItems => { if (this.activeItemsUpdated) { @@ -507,7 +507,7 @@ class QuickPick extends QuickInput implements IQuickPi this._selectedItems = selectedItems as T[]; this.onDidChangeSelectionEmitter.fire(selectedItems as T[]); if (selectedItems.length) { - this.onDidAcceptEmitter.fire(); + this.onDidAcceptEmitter.fire(undefined); } }), this.ui.list.onChangedCheckedElements(checkedItems => { @@ -570,7 +570,7 @@ class QuickPick extends QuickInput implements IQuickPi if (wasTriggerKeyPressed && this.activeItems[0]) { this._selectedItems = [this.activeItems[0]]; this.onDidChangeSelectionEmitter.fire(this.selectedItems); - this.onDidAcceptEmitter.fire(); + this.onDidAcceptEmitter.fire(undefined); } }); } @@ -723,7 +723,7 @@ class InputBox extends QuickInput implements IInputBox { this._value = value; this.onDidValueChangeEmitter.fire(value); }), - this.ui.onDidAccept(() => this.onDidAcceptEmitter.fire()), + this.ui.onDidAccept(() => this.onDidAcceptEmitter.fire(undefined)), ); this.valueSelectionUpdated = true; } diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/suggestEnabledInput.ts b/src/vs/workbench/parts/codeEditor/electron-browser/suggestEnabledInput.ts index 5eb4f96c265..4008ca8b595 100644 --- a/src/vs/workbench/parts/codeEditor/electron-browser/suggestEnabledInput.ts +++ b/src/vs/workbench/parts/codeEditor/electron-browser/suggestEnabledInput.ts @@ -156,7 +156,7 @@ export class SuggestEnabledInput extends Widget implements IThemable { let content = this.getValue(); this.placeholderText.style.visibility = content ? 'hidden' : 'visible'; if (preexistingContent.trim() === content.trim()) { return; } - this._onInputDidChange.fire(); + this._onInputDidChange.fire(undefined); preexistingContent = content; })); diff --git a/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts b/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts index 1b2a173272d..b91ed5bed3a 100644 --- a/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts +++ b/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts @@ -798,6 +798,6 @@ export class ReviewZoneWidget extends ZoneWidget { this._globalToDispose.forEach(global => global.dispose()); this._localToDispose.forEach(local => local.dispose()); - this._onDidClose.fire(); + this._onDidClose.fire(undefined); } } \ No newline at end of file diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts index 7dbea2981a9..e040e103468 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -786,7 +786,7 @@ export class DebugModel implements IDebugModel { return true; }); this.sessions.push(session); - this._onDidChangeCallStack.fire(); + this._onDidChangeCallStack.fire(undefined); } get onDidChangeBreakpoints(): Event { @@ -805,7 +805,7 @@ export class DebugModel implements IDebugModel { let session = this.sessions.filter(p => p.getId() === data.sessionId).pop(); if (session) { session.rawUpdate(data); - this._onDidChangeCallStack.fire(); + this._onDidChangeCallStack.fire(undefined); } } @@ -816,7 +816,7 @@ export class DebugModel implements IDebugModel { if (session) { session.clearThreads(removeThreads, reference); - this._onDidChangeCallStack.fire(); + this._onDidChangeCallStack.fire(undefined); } } @@ -881,7 +881,7 @@ export class DebugModel implements IDebugModel { const ebp = this.exceptionBreakpoints.filter(ebp => ebp.filter === d.filter).pop(); return new ExceptionBreakpoint(d.filter, d.label, ebp ? ebp.enabled : d.default); }); - this._onDidChangeBreakpoints.fire(); + this._onDidChangeBreakpoints.fire(undefined); } } @@ -891,7 +891,7 @@ export class DebugModel implements IDebugModel { setBreakpointsActivated(activated: boolean): void { this.breakpointsActivated = activated; - this._onDidChangeBreakpoints.fire(); + this._onDidChangeBreakpoints.fire(undefined); } addBreakpoints(uri: uri, rawData: IBreakpointData[], fireEvent = true): IBreakpoint[] { @@ -1052,7 +1052,7 @@ export class DebugModel implements IDebugModel { removeWatchExpressions(id: string | null = null): void { this.watchExpressions = id ? this.watchExpressions.filter(we => we.getId() !== id) : []; - this._onDidChangeWatchExpressions.fire(); + this._onDidChangeWatchExpressions.fire(undefined); } moveWatchExpression(id: string, position: number): void { @@ -1060,7 +1060,7 @@ export class DebugModel implements IDebugModel { this.watchExpressions = this.watchExpressions.filter(we => we.getId() !== id); this.watchExpressions = this.watchExpressions.slice(0, position).concat(we, this.watchExpressions.slice(position)); - this._onDidChangeWatchExpressions.fire(); + this._onDidChangeWatchExpressions.fire(undefined); } sourceIsNotAvailable(uri: uri): void { @@ -1070,7 +1070,7 @@ export class DebugModel implements IDebugModel { source.available = false; } }); - this._onDidChangeCallStack.fire(); + this._onDidChangeCallStack.fire(undefined); } dispose(): void { diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts index 168a1a1c351..b56c8f7da9c 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts @@ -449,7 +449,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService, return extension; }); - this._onChange.fire(); + this._onChange.fire(undefined); return this.local; })); } @@ -971,7 +971,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService, const uninstalling = this.uninstalling.filter(e => e.local.identifier.id === id)[0] || extension; this.uninstalling = [uninstalling, ...this.uninstalling.filter(e => e.local.identifier.id !== id)]; - this._onChange.fire(); + this._onChange.fire(undefined); } private onDidUninstallExtension({ identifier, error }: DidUninstallExtensionEvent): void { @@ -986,7 +986,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService, return; } - this._onChange.fire(); + this._onChange.fire(undefined); } private onEnablementChanged(identifier: IExtensionIdentifier) { diff --git a/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts b/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts index 0919da43160..c492f4a30df 100644 --- a/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts +++ b/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts @@ -549,7 +549,7 @@ export class MarkersViewState extends Disposable { }); this.bulkUpdate = false; if (changed) { - this._onDidChangeViewState.fire(); + this._onDidChangeViewState.fire(undefined); } } diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index 97b15e1c5e7..a940fd32e4f 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -123,7 +123,7 @@ export class PreferencesEditor extends BaseEditor { const editorsContainer = DOM.append(parent, DOM.$('.preferences-editors-container')); this.sideBySidePreferencesWidget = this._register(this.instantiationService.createInstance(SideBySidePreferencesWidget, editorsContainer)); - this._onDidCreateWidget.fire(); + this._onDidCreateWidget.fire(undefined); this._register(this.sideBySidePreferencesWidget.onFocus(() => this.lastFocusedWidget = this.sideBySidePreferencesWidget)); this._register(this.sideBySidePreferencesWidget.onDidSettingsTargetChange(target => this.switchSettings(target))); diff --git a/src/vs/workbench/parts/search/browser/patternInputWidget.ts b/src/vs/workbench/parts/search/browser/patternInputWidget.ts index 8db5a6a3244..7d7e8138cac 100644 --- a/src/vs/workbench/parts/search/browser/patternInputWidget.ts +++ b/src/vs/workbench/parts/search/browser/patternInputWidget.ts @@ -154,10 +154,10 @@ export class PatternInputWidget extends Widget { private onInputKeyUp(keyboardEvent: IKeyboardEvent) { switch (keyboardEvent.keyCode) { case KeyCode.Enter: - this._onSubmit.fire(); + this._onSubmit.fire(false); return; case KeyCode.Escape: - this._onCancel.fire(); + this._onCancel.fire(false); return; default: return; diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts index 3335fb15462..6aba7d71867 100644 --- a/src/vs/workbench/parts/search/browser/searchView.ts +++ b/src/vs/workbench/parts/search/browser/searchView.ts @@ -733,7 +733,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel { this.tree.setFocus([next]); this.tree.setSelection([next]); this.tree.reveal(next); - this.selectCurrentMatchEmitter.fire(); + this.selectCurrentMatchEmitter.fire(undefined); } } @@ -774,7 +774,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel { this.tree.setFocus([prev]); this.tree.setSelection([prev]); this.tree.reveal(prev); - this.selectCurrentMatchEmitter.fire(); + this.selectCurrentMatchEmitter.fire(undefined); } } diff --git a/src/vs/workbench/parts/search/browser/searchWidget.ts b/src/vs/workbench/parts/search/browser/searchWidget.ts index 830eb477d91..264d282b505 100644 --- a/src/vs/workbench/parts/search/browser/searchWidget.ts +++ b/src/vs/workbench/parts/search/browser/searchWidget.ts @@ -114,7 +114,7 @@ export class SearchWidget extends Widget { private _onReplaceStateChange = this._register(new Emitter()); readonly onReplaceStateChange: Event = this._onReplaceStateChange.event; - private _onReplaceValueChanged = this._register(new Emitter()); + private _onReplaceValueChanged = this._register(new Emitter()); readonly onReplaceValueChanged: Event = this._onReplaceValueChanged.event; private _onReplaceAll = this._register(new Emitter()); @@ -343,7 +343,7 @@ export class SearchWidget extends Widget { this._register(attachInputBoxStyler(this.replaceInput, this.themeService)); this.onkeydown(this.replaceInput.inputElement, (keyboardEvent) => this.onReplaceInputKeyDown(keyboardEvent)); this.replaceInput.value = options.replaceValue || ''; - this._register(this.replaceInput.onDidChange(() => this._onReplaceValueChanged.fire())); + this._register(this.replaceInput.onDidChange(() => this._onReplaceValueChanged.fire(undefined))); this._register(this.replaceInput.onDidHeightChange(() => this._onDidHeightChange.fire())); this.replaceAllAction = ReplaceAllAction.INSTANCE; diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts index acd483519bf..a987b6ab08e 100644 --- a/src/vs/workbench/parts/terminal/common/terminal.ts +++ b/src/vs/workbench/parts/terminal/common/terminal.ts @@ -197,7 +197,7 @@ export interface ITerminalService { onInstanceRequestExtHostProcess: Event; onInstancesChanged: Event; onInstanceTitleChanged: Event; - onActiveInstanceChanged: Event; + onActiveInstanceChanged: Event; terminalInstances: ITerminalInstance[]; terminalTabs: ITerminalTab[]; diff --git a/src/vs/workbench/parts/terminal/common/terminalService.ts b/src/vs/workbench/parts/terminal/common/terminalService.ts index ef3daa0244b..1cc9d1380b4 100644 --- a/src/vs/workbench/parts/terminal/common/terminalService.ts +++ b/src/vs/workbench/parts/terminal/common/terminalService.ts @@ -46,8 +46,8 @@ export abstract class TerminalService implements ITerminalService { public get onInstancesChanged(): Event { return this._onInstancesChanged.event; } protected readonly _onInstanceTitleChanged = new Emitter(); public get onInstanceTitleChanged(): Event { return this._onInstanceTitleChanged.event; } - protected readonly _onActiveInstanceChanged = new Emitter(); - public get onActiveInstanceChanged(): Event { return this._onActiveInstanceChanged.event; } + protected readonly _onActiveInstanceChanged = new Emitter(); + public get onActiveInstanceChanged(): Event { return this._onActiveInstanceChanged.event; } protected readonly _onTabDisposed = new Emitter(); public get onTabDisposed(): Event { return this._onTabDisposed.event; } diff --git a/src/vs/workbench/parts/terminal/node/windowsShellHelper.ts b/src/vs/workbench/parts/terminal/node/windowsShellHelper.ts index 09b1fd8ce46..3365163c107 100644 --- a/src/vs/workbench/parts/terminal/node/windowsShellHelper.ts +++ b/src/vs/workbench/parts/terminal/node/windowsShellHelper.ts @@ -25,7 +25,7 @@ const SHELL_EXECUTABLES = [ let windowsProcessTree: typeof WindowsProcessTreeType; export class WindowsShellHelper { - private _onCheckShell: Emitter>; + private _onCheckShell: Emitter | undefined>; private _isDisposed: boolean; private _currentRequest: Promise | null; private _newLineFeed: boolean; @@ -64,12 +64,12 @@ export class WindowsShellHelper { this._xterm.on('linefeed', () => this._newLineFeed = true); this._xterm.on('cursormove', () => { if (this._newLineFeed) { - this._onCheckShell.fire(); + this._onCheckShell.fire(undefined); } }); // Fire a new check for the shell when any key is pressed. - this._xterm.on('keypress', () => this._onCheckShell.fire()); + this._xterm.on('keypress', () => this._onCheckShell.fire(undefined)); }); } diff --git a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts index b2ac27c3bc8..f371dd2f5d9 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts @@ -41,7 +41,7 @@ suite('ExtHostTreeView', function () { let testObject: ExtHostTreeViews; let target: RecordingShape; - let onDidChangeTreeNode: Emitter<{ key: string }>; + let onDidChangeTreeNode: Emitter<{ key: string } | undefined>; let onDidChangeTreeNodeWithId: Emitter<{ key: string }>; let tree, labels, nodes; @@ -199,7 +199,7 @@ suite('ExtHostTreeView', function () { .then(() => { assert.fail('Should fail with duplicate id'); done(); }, () => done()); }); }); - onDidChangeTreeNode.fire(); + onDidChangeTreeNode.fire(undefined); }); test('refresh root', function (done) { @@ -207,7 +207,7 @@ suite('ExtHostTreeView', function () { assert.equal(undefined, actuals); done(); }); - onDidChangeTreeNode.fire(); + onDidChangeTreeNode.fire(undefined); }); test('refresh a parent node', () => { @@ -300,10 +300,10 @@ suite('ExtHostTreeView', function () { assert.equal(undefined, actuals); done(); }); - onDidChangeTreeNode.fire(); - onDidChangeTreeNode.fire(); - onDidChangeTreeNode.fire(); - onDidChangeTreeNode.fire(); + onDidChangeTreeNode.fire(undefined); + onDidChangeTreeNode.fire(undefined); + onDidChangeTreeNode.fire(undefined); + onDidChangeTreeNode.fire(undefined); }); test('refresh calls are throttled on elements', function (done) { @@ -339,7 +339,7 @@ suite('ExtHostTreeView', function () { onDidChangeTreeNode.fire(getNode('a')); onDidChangeTreeNode.fire(getNode('b')); onDidChangeTreeNode.fire(getNode('g')); - onDidChangeTreeNode.fire(); + onDidChangeTreeNode.fire(undefined); }); test('refresh calls are throttled on elements and root', function (done) { @@ -350,7 +350,7 @@ suite('ExtHostTreeView', function () { onDidChangeTreeNode.fire(getNode('a')); onDidChangeTreeNode.fire(getNode('b')); - onDidChangeTreeNode.fire(); + onDidChangeTreeNode.fire(undefined); onDidChangeTreeNode.fire(getNode('a')); }); @@ -366,7 +366,7 @@ suite('ExtHostTreeView', function () { done(); }); }); - onDidChangeTreeNode.fire(); + onDidChangeTreeNode.fire(undefined); }); test('tree with duplicate labels', (done) => { @@ -415,7 +415,7 @@ suite('ExtHostTreeView', function () { }); }); - onDidChangeTreeNode.fire(); + onDidChangeTreeNode.fire(undefined); }); test('getChildren is not returned from cache if refreshed', (done) => { @@ -431,7 +431,7 @@ suite('ExtHostTreeView', function () { }); }); - onDidChangeTreeNode.fire(); + onDidChangeTreeNode.fire(undefined); }); test('getChildren is returned from cache if not refreshed', () => { -- GitLab