From 799d4ab2499ff4d70361e77a1bfde4388114a79b Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 19 Jan 2022 13:28:21 +0100
Subject: [PATCH] Update tree drag and drop sample

---
 tree-view-sample/src/testViewDragAndDrop.ts               | 6 ++----
 tree-view-sample/vscode.proposed.treeViewDragAndDrop.d.ts | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/tree-view-sample/src/testViewDragAndDrop.ts b/tree-view-sample/src/testViewDragAndDrop.ts
index 1e14ec9e..318cb80d 100644
--- a/tree-view-sample/src/testViewDragAndDrop.ts
+++ b/tree-view-sample/src/testViewDragAndDrop.ts
@@ -91,10 +91,8 @@ export class TestViewDragAndDrop implements vscode.TreeDataProvider<Node>, vscod
 		}
 	}
 
-	public async handleDrag(source: Node[]): Promise<vscode.TreeDataTransfer> {
-		const dataTransfer = new vscode.TreeDataTransfer<TestViewObjectTransferItem>();
-		dataTransfer.set('text/treeitems', new TestViewObjectTransferItem(source));
-		return dataTransfer;
+	public async handleDrag(source: Node[], treeDataTransfer: vscode.TreeDataTransfer): Promise<void> {
+		treeDataTransfer.set('text/treeitems', new TestViewObjectTransferItem(source));
 	}
 
 	// Helper methods
diff --git a/tree-view-sample/vscode.proposed.treeViewDragAndDrop.d.ts b/tree-view-sample/vscode.proposed.treeViewDragAndDrop.d.ts
index 7f0cea46..f135fa73 100644
--- a/tree-view-sample/vscode.proposed.treeViewDragAndDrop.d.ts
+++ b/tree-view-sample/vscode.proposed.treeViewDragAndDrop.d.ts
@@ -102,11 +102,10 @@ declare module 'vscode' {
 		 * When the items are dropped on **another tree item** in **the same tree**, your `TreeDataTransferItem` objects
 		 * will be preserved. See the documentation for `TreeDataTransferItem` for how best to take advantage of this.
 		 *
-		 * The returned `TreeDataTransfer` will be merged with the original`TreeDataTransfer` for the operation.
-		 *
 		 * @param source The source items for the drag and drop operation.
+		 * @param treeDataTransfer The data transfer associated with this drag.
 		 */
-		handleDrag?(source: T[]): Thenable<TreeDataTransfer>;
+		handleDrag?(source: T[], treeDataTransfer: TreeDataTransfer): Thenable<void> | void;
 
 		/**
 		 * Called when a drag and drop action results in a drop on the tree that this `DragAndDropController` belongs too.