diff --git a/src/vs/base/browser/ui/list/listPaging.ts b/src/vs/base/browser/ui/list/listPaging.ts index 88868fa4865..51129e1bd97 100644 --- a/src/vs/base/browser/ui/list/listPaging.ts +++ b/src/vs/base/browser/ui/list/listPaging.ts @@ -118,7 +118,7 @@ export class PagedList implements IDisposable { } get onOpen(): Event> { - return Event.map(this.list.onOpen, ({ elements, indexes, browserEvent }) => ({ elements: elements.map(e => this._model.get(e)), indexes, browserEvent })); + return Event.map(this.list.onDidOpen, ({ elements, indexes, browserEvent }) => ({ elements: elements.map(e => this._model.get(e)), indexes, browserEvent })); } get onSelectionChange(): Event> { diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts index 2a434533de8..8f913980a8b 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -949,8 +949,8 @@ export class List implements ISpliceable, IDisposable { return Event.map(this.eventBufferer.wrapEvent(this.selection.onChange), e => this.toListEvent(e)); } - private _onOpen = new Emitter>(); - readonly onOpen: Event> = this._onOpen.event; + private _onDidOpen = new Emitter>(); + readonly onDidOpen: Event> = this._onDidOpen.event; private _onPin = new Emitter(); @memoize get onPin(): Event> { @@ -1315,7 +1315,7 @@ export class List implements ISpliceable, IDisposable { } } - this._onOpen.fire({ indexes, elements: indexes.map(i => this.view.element(i)), browserEvent }); + this._onDidOpen.fire({ indexes, elements: indexes.map(i => this.view.element(i)), browserEvent }); } pin(indexes: number[]): void { @@ -1361,7 +1361,7 @@ export class List implements ISpliceable, IDisposable { this._onDidDispose.fire(); this.disposables = dispose(this.disposables); - this._onOpen.dispose(); + this._onDidOpen.dispose(); this._onPin.dispose(); this._onDidDispose.dispose(); } diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts index 3b258194d0b..4d6bf592852 100644 --- a/src/vs/base/browser/ui/tree/abstractTree.ts +++ b/src/vs/base/browser/ui/tree/abstractTree.ts @@ -190,6 +190,7 @@ export abstract class AbstractTree implements IDisposable get onDidChangeFocus(): Event> { return Event.map(this.view.onFocusChange, asTreeEvent); } get onDidChangeSelection(): Event> { return Event.map(this.view.onSelectionChange, asTreeEvent); } + get onDidOpen(): Event> { return Event.map(this.view.onDidOpen, asTreeEvent); } get onMouseClick(): Event> { return Event.map(this.view.onMouseClick, asTreeMouseEvent); } get onMouseDblClick(): Event> { return Event.map(this.view.onMouseDblClick, asTreeMouseEvent); } diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts index f176c74a8a5..1660d433644 100644 --- a/src/vs/base/browser/ui/tree/asyncDataTree.ts +++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts @@ -186,6 +186,7 @@ export class AsyncDataTree, TFilterData = void> imple get onDidChangeFocus(): Event> { return Event.map(this.tree.onDidChangeFocus, asTreeEvent); } get onDidChangeSelection(): Event> { return Event.map(this.tree.onDidChangeSelection, asTreeEvent); } + get onDidOpen(): Event> { return Event.map(this.tree.onDidOpen, asTreeEvent); } get onDidChangeCollapseState(): Event { return Event.map(this.tree.onDidChangeCollapseState, e => e.element!.element!); } private readonly _onDidResolveChildren = new Emitter>(); diff --git a/src/vs/workbench/parts/debug/browser/breakpointsView.ts b/src/vs/workbench/parts/debug/browser/breakpointsView.ts index eb0b589dde0..44614a05825 100644 --- a/src/vs/workbench/parts/debug/browser/breakpointsView.ts +++ b/src/vs/workbench/parts/debug/browser/breakpointsView.ts @@ -83,7 +83,7 @@ export class BreakpointsView extends ViewletPanel { this.list.onContextMenu(this.onListContextMenu, this, this.disposables); - this.disposables.push(this.list.onOpen(e => { + this.disposables.push(this.list.onDidOpen(e => { let isSingleClick = false; let isDoubleClick = false; let isMiddleClick = false; diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index f289aff9e74..400f005c7d4 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -256,7 +256,7 @@ export class OpenEditorsView extends ViewletPanel { e.element.group.closeEditor(e.element.editor); } })); - this.disposables.push(this.list.onOpen(e => { + this.disposables.push(this.list.onDidOpen(e => { const browserEvent = e.browserEvent; let openToSide = false; diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts index 50363bab399..0c9e2165219 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts @@ -879,7 +879,7 @@ export class RepositoryPanel extends ViewletPanel { keyboardNavigationLabelProvider: scmKeyboardNavigationLabelProvider }) as WorkbenchList; - Event.chain(this.list.onOpen) + Event.chain(this.list.onDidOpen) .map(e => e.elements[0]) .filter(e => !!e && isSCMResource(e)) .on(this.open, this, this.disposables);