Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Part of #211878 #212902

Merged
merged 1 commit into from
May 24, 2024
Merged

Part of #211878 #212902

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/vs/workbench/contrib/files/browser/explorerService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'
import { IBulkEditService, ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService';
import { UndoRedoSource } from 'vs/platform/undoRedo/common/undoRedo';
import { IExplorerView, IExplorerService } from 'vs/workbench/contrib/files/browser/files';
import { IProgressService, ProgressLocation, IProgressNotificationOptions, IProgressCompositeOptions } from 'vs/platform/progress/common/progress';
import { IProgressService, ProgressLocation, IProgressCompositeOptions, IProgressOptions } from 'vs/platform/progress/common/progress';
import { CancellationTokenSource } from 'vs/base/common/cancellation';
import { RunOnceScheduler } from 'vs/base/common/async';
import { IHostService } from 'vs/workbench/services/host/browser/host';
Expand Down Expand Up @@ -184,12 +184,23 @@ export class ExplorerService implements IExplorerService {

async applyBulkEdit(edit: ResourceFileEdit[], options: { undoLabel: string; progressLabel: string; confirmBeforeUndo?: boolean; progressLocation?: ProgressLocation.Explorer | ProgressLocation.Window }): Promise<void> {
const cancellationTokenSource = new CancellationTokenSource();
const promise = this.progressService.withProgress(<IProgressNotificationOptions | IProgressCompositeOptions>{
location: options.progressLocation || ProgressLocation.Window,
title: options.progressLabel,
cancellable: edit.length > 1, // Only allow cancellation when there is more than one edit. Since cancelling will not actually stop the current edit that is in progress.
delay: 500,
}, async progress => {
const location = options.progressLocation ?? ProgressLocation.Window;
let progressOptions;
if (location === ProgressLocation.Window) {
progressOptions = {
location: location,
title: options.progressLabel,
cancellable: edit.length > 1,
} satisfies IProgressOptions;
} else {
progressOptions = {
location: location,
title: options.progressLabel,
cancellable: edit.length > 1,
delay: 500,
} satisfies IProgressCompositeOptions;
}
const promise = this.progressService.withProgress(progressOptions, async progress => {
await this.bulkEditService.apply(edit, {
undoRedoSource: UNDO_REDO_SOURCE,
label: options.undoLabel,
Expand Down