From ea989da383e8bcaf17afb73123e7fbfd50b1ef6f Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Mon, 23 Nov 2020 15:36:06 +0100
Subject: [PATCH] Feedback from resolveTreeItem API proposal review Part of
 #100741

---
 src/vs/vscode.proposed.d.ts                     | 2 +-
 src/vs/workbench/api/common/extHostTreeViews.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index c595e1876e8..7de4a986580 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -1028,7 +1028,7 @@ declare module 'vscode' {
 		 * @param element
 		 * @param item Undefined properties of `item` should be set then `item` should be returned.
 		 */
-		resolveTreeItem?(element: T, item: TreeItem2): TreeItem2 | Thenable<TreeItem2>;
+		resolveTreeItem?(item: TreeItem2, element: T): ProviderResult<TreeItem2>;
 	}
 
 	export class TreeItem2 extends TreeItem {
diff --git a/src/vs/workbench/api/common/extHostTreeViews.ts b/src/vs/workbench/api/common/extHostTreeViews.ts
index dfbc29ebbdc..af3a31890f2 100644
--- a/src/vs/workbench/api/common/extHostTreeViews.ts
+++ b/src/vs/workbench/api/common/extHostTreeViews.ts
@@ -379,7 +379,7 @@ class ExtHostTreeView<T> extends Disposable {
 		if (element) {
 			const node = this.nodes.get(element);
 			if (node) {
-				const resolve = await this.dataProvider.resolveTreeItem(element, node.extensionItem);
+				const resolve = await this.dataProvider.resolveTreeItem(node.extensionItem, element) ?? node.extensionItem;
 				// Resolvable elements. Currently only tooltip.
 				node.item.tooltip = this.getTooltip(resolve.tooltip);
 				return node.item;