Better experience for replacing folders in web upload (microsoft#99601)

jeanp413 · Benjamin Pasero · web-flow · commit 64dbafe1d374 · 2020-06-09T11:08:48.000+02:00
* Fixes microsoft#99074 * properly await Co-authored-by: Benjamin Pasero <benjpas@microsoft.com>
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -984,6 +984,18 @@ export class FileDragAndDrop implements ITreeDragAndDrop<ExplorerItem> {
 			title: localize('uploadingFiles', "Uploading")
 		}, async progress => {
 			for (let entry of entries) {
+
+				// Confirm overwrite as needed
+				if (target && entry.name && target.getChild(entry.name)) {
+					const { confirmed } = await this.dialogService.confirm(getFileOverwriteConfirm(entry.name));
+					if (!confirmed) {
+						continue;
+					}
+
+					await this.workingCopyFileService.delete(joinPath(target.resource, entry.name), { recursive: true });
+				}
+
+				// Upload entry
 				const result = await this.doUploadWebFileEntry(entry, target.resource, target, progress, operation, cts.token);
 				if (result) {
 					results.push(result);
@@ -1008,20 +1020,6 @@ export class FileDragAndDrop implements ITreeDragAndDrop<ExplorerItem> {
 			return undefined;
 		}
 
-		const resource = joinPath(parentResource, entry.name);
-
-		// Confirm overwrite as needed
-		if (target && target.getChild(entry.name)) {
-			const { confirmed } = await this.dialogService.confirm(getFileOverwriteConfirm(resource.path));
-			if (!confirmed) {
-				return undefined;
-			}
-		}
-
-		if (token.isCancellationRequested) {
-			return undefined;
-		}
-
 		// Report progress
 		let totalBytesUploaded = 0;
 		const reportProgress = (fileSize: number, bytesUploaded: number): void => {
@@ -1044,6 +1042,7 @@ export class FileDragAndDrop implements ITreeDragAndDrop<ExplorerItem> {
 		reportProgress(0, 0);
 
 		// Handle file upload
+		const resource = joinPath(parentResource, entry.name);
 		if (entry.isFile) {
 			const file = await new Promise<File>((resolve, reject) => entry.file(resolve, reject));
 
