From 0929ea86cd39b834bf5ea6626b0a6c00d737fd5b Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 17 Dec 2020 10:18:23 +0100
Subject: [PATCH] don't suppress preview when handling onWill-events anymore,
 https://github.com/microsoft/vscode/issues/111878

---
 src/vs/editor/browser/services/bulkEditService.ts          | 1 -
 .../api/browser/mainThreadFileSystemEventService.ts        | 7 +------
 .../workbench/contrib/bulkEdit/browser/bulkEditService.ts  | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/vs/editor/browser/services/bulkEditService.ts b/src/vs/editor/browser/services/bulkEditService.ts
index a9e8b99dc6f..6b0867d496c 100644
--- a/src/vs/editor/browser/services/bulkEditService.ts
+++ b/src/vs/editor/browser/services/bulkEditService.ts
@@ -69,7 +69,6 @@ export interface IBulkEditOptions {
 	progress?: IProgress<IProgressStep>;
 	token?: CancellationToken;
 	showPreview?: boolean;
-	suppressPreview?: boolean;
 	label?: string;
 	quotableLabel?: string;
 	undoRedoSource?: UndoRedoSource;
diff --git a/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts b/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
index fc119e251bd..3f84fa0ee3b 100644
--- a/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
+++ b/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
@@ -93,12 +93,7 @@ export class MainThreadFileSystemEventService {
 				}
 
 				const edit = reviveWorkspaceEditDto2(data);
-				await bulkEditService.apply(edit, {
-					undoRedoGroupId,
-					// this is a nested workspace edit, e.g one from a onWill-handler and for now we need to forcefully suppress
-					// refactor previewing, see: https://github.com/microsoft/vscode/issues/111873#issuecomment-738739852
-					suppressPreview: true
-				});
+				await bulkEditService.apply(edit, { undoRedoGroupId });
 			}
 			private _progressLabel(operation: FileOperation): string {
 				switch (operation) {
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts
index ffc54667e07..ca55a105790 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts
@@ -139,7 +139,7 @@ export class BulkEditService implements IBulkEditService {
 			return { ariaSummary: localize('nothing', "Made no edits") };
 		}
 
-		if (this._previewHandler && !options?.suppressPreview && (options?.showPreview || edits.some(value => value.metadata?.needsConfirmation))) {
+		if (this._previewHandler && (options?.showPreview || edits.some(value => value.metadata?.needsConfirmation))) {
 			edits = await this._previewHandler(edits, options);
 		}