Fix #50663

microsoft · May 30, 2018 · 6978d9e · 6978d9e
1 parent 471e431
commit 6978d9e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
@@ -6055,6 +6055,18 @@ declare module 'vscode' {
  export function createTreeView<T>(viewId: string, options: { treeDataProvider: TreeDataProvider<T> }): TreeView<T>;
  }
 
+ /**
+ * The event that is fired when an element in the [TreeView](#TreeView) is expanded or collapsed
+ */
+ export interface TreeViewExpansionEvent<T> {
+
+ /**
+ * Element that is expanded or collapsed.
+ */
+ element: T;
+
+ }
+
  /**
  * Represents a Tree view
  */
@@ -6063,12 +6075,12 @@ declare module 'vscode' {
  /**
  * Event that is fired when an element is expanded
  */
- readonly onDidExpandElement: Event<T>;
+ readonly onDidExpandElement: Event<TreeViewExpansionEvent<T>>;
 
  /**
  * Event that is fired when an element is collapsed
  */
- readonly onDidCollapseElement: Event<T>;
+ readonly onDidCollapseElement: Event<TreeViewExpansionEvent<T>>;
 
  /**
  * Currently selected elements.

diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts
@@ -116,11 +116,11 @@ class ExtHostTreeView<T> extends Disposable {
  private _selectedElements: T[] = [];
  get selectedElements(): T[] { return this._selectedElements; }
 
- private _onDidExpandElement: Emitter<T> = this._register(new Emitter<T>());
- readonly onDidExpandElement: Event<T> = this._onDidExpandElement.event;
+ private _onDidExpandElement: Emitter<vscode.TreeViewExpansionEvent<T>> = this._register(new Emitter<vscode.TreeViewExpansionEvent<T>>());
+ readonly onDidExpandElement: Event<vscode.TreeViewExpansionEvent<T>> = this._onDidExpandElement.event;
 
- private _onDidCollapseElement: Emitter<T> = this._register(new Emitter<T>());
- readonly onDidCollapseElement: Event<T> = this._onDidCollapseElement.event;
+ private _onDidCollapseElement: Emitter<vscode.TreeViewExpansionEvent<T>> = this._register(new Emitter<vscode.TreeViewExpansionEvent<T>>());
+ readonly onDidCollapseElement: Event<vscode.TreeViewExpansionEvent<T>> = this._onDidCollapseElement.event;
 
  private refreshPromise: TPromise<void> = TPromise.as(null);
 
@@ -174,9 +174,9 @@ class ExtHostTreeView<T> extends Disposable {
  const element = this.getExtensionElement(treeItemHandle);
  if (element) {
  if (expanded) {
- this._onDidExpandElement.fire(element);
+ this._onDidExpandElement.fire({ element });
  } else {
- this._onDidCollapseElement.fire(element);
+ this._onDidCollapseElement.fire({ element });
  }
  }
  }