Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-12 20:12:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #144890 from pjknkda/main

Browse Source
This commit is contained in:
Johannes Rieken
2022-03-16 09:13:34 +01:00
committed by GitHub
parent 4b5350f96b 5883696c82
commit dc0e0baa8f
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
+8 -5
View File
@@ -5,7 +5,7 @@
import { WorkspaceFileEditOptions } from 'vs/editor/common/languages';
import { IFileService, FileSystemProviderCapabilities, IFileContent } from 'vs/platform/files/common/files';
import { IFileService, FileSystemProviderCapabilities, IFileContent, IFileStatWithMetadata } from 'vs/platform/files/common/files';
import { IProgress } from 'vs/platform/progress/common/progress';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IWorkingCopyFileService, IFileOperationUndoRedoInfo, IMoveOperation, ICopyOperation, IDeleteOperation, ICreateOperation, ICreateFileOperation } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
@@ -233,7 +233,10 @@ class DeleteOperation implements IFileOperation {
const undoes: CreateEdit[] = [];
for (const edit of this._edits) {
if (!await this._fileService.exists(edit.oldUri)) {
let fileStat: IFileStatWithMetadata | undefined;
try {
fileStat = await this._fileService.resolve(edit.oldUri, { resolveMetadata: true });
} catch (err) {
if (!edit.options.ignoreIfNotExists) {
throw new Error(`${edit.oldUri} does not exist and can not be deleted`);
}
@@ -249,15 +252,15 @@ class DeleteOperation implements IFileOperation {
// read file contents for undo operation. when a file is too large it won't be restored
let fileContent: IFileContent | undefined;
if (!edit.undoesCreate && !edit.options.folder) {
if (!edit.undoesCreate && !edit.options.folder && !(typeof edit.options.maxSize === 'number' && fileStat.size > edit.options.maxSize)) {
try {
fileContent = await this._fileService.readFile(edit.oldUri);
} catch (err) {
this._logService.critical(err);
}
}
if (!(typeof edit.options.maxSize === 'number' && fileContent && (fileContent?.size > edit.options.maxSize))) {
undoes.push(new CreateEdit(edit.oldUri, edit.options, fileContent?.value));
if (fileContent !== undefined) {
undoes.push(new CreateEdit(edit.oldUri, edit.options, fileContent.value));
}
}