diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts index 96036bd6ad451b3aa913b000634815854e09e05a..b2840faac3c28cdf7fac0a43dd3419ef1894817a 100644 --- a/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts +++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts @@ -164,7 +164,7 @@ class DeleteOperation implements IFileOperation { } let contents: VSBuffer | undefined; - if (!this._undoesCreateOperation) { + if (!this._undoesCreateOperation && !this.options.folder) { try { contents = (await this._fileService.readFile(this.oldUri)).value; } catch (err) { diff --git a/src/vs/workbench/contrib/files/browser/fileActions.ts b/src/vs/workbench/contrib/files/browser/fileActions.ts index cf72ca8e11c643826abf4cd570d4e69c528c2e92..ae951190e2b0048b3c2b1e93039c98f42a63bee1 100644 --- a/src/vs/workbench/contrib/files/browser/fileActions.ts +++ b/src/vs/workbench/contrib/files/browser/fileActions.ts @@ -226,7 +226,7 @@ async function deleteFiles(explorerService: IExplorerService, bulkEditService: I // Call function try { - const resourceFileEdits = distinctElements.map(e => new ResourceFileEdit(e.resource, undefined, { recursive: true })); + const resourceFileEdits = distinctElements.map(e => new ResourceFileEdit(e.resource, undefined, { recursive: true, folder: e.isDirectory })); // TODO@Isidor respect the useTrash parameter await bulkEditService.apply(resourceFileEdits, { undoRedoSource: explorerService.undoRedoSource,