Skip to content

Commit 4bfd9eb

Browse files
authored
* Fix conflicting changes count warning when resuming edit session * Don't use custom dialog
1 parent a1b0e0e commit 4bfd9eb

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -414,13 +414,12 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
414414

415415
const result = await this.dialogService.show(
416416
Severity.Warning,
417-
changes.length > 1 ?
418-
localize('resume edit session warning many', 'Resuming your edit session will overwrite the following {0} files. Do you want to proceed?', changes.length) :
419-
localize('resume edit session warning 1', 'Resuming your edit session will overwrite {0}. Do you want to proceed?', basename(changes[0].uri)),
417+
conflictingChanges.length > 1 ?
418+
localize('resume edit session warning many', 'Resuming your edit session will overwrite the following {0} files. Do you want to proceed?', conflictingChanges.length) :
419+
localize('resume edit session warning 1', 'Resuming your edit session will overwrite {0}. Do you want to proceed?', basename(conflictingChanges[0].uri)),
420420
[cancel, yes],
421421
{
422-
custom: true,
423-
detail: changes.length > 1 ? getFileNamesMessage(conflictingChanges.map((c) => c.uri)) : undefined,
422+
detail: conflictingChanges.length > 1 ? getFileNamesMessage(conflictingChanges.map((c) => c.uri)) : undefined,
424423
cancelId: 0
425424
});
426425

0 commit comments

Comments
 (0)