Move dialog details to description row in custom dialog

fixes microsoft#85057

Author: isidorn

src/vs/platform/dialogs/common/dialogs.ts

@@ -257,9 +257,8 @@ export const enum ConfirmResult {
 }
 
 const MAX_CONFIRM_FILES = 10;
-export function getConfirmMessage(start: string, fileNamesOrResources: readonly (string | URI)[]): string {
-	const message = [start];
-	message.push('');
+export function getFileNamesMessage(fileNamesOrResources: readonly (string | URI)[]): string {
+	const message: string[] = [];
 	message.push(...fileNamesOrResources.slice(0, MAX_CONFIRM_FILES).map(fileNameOrResource => typeof fileNameOrResource === 'string' ? fileNameOrResource : basename(fileNameOrResource)));
 
 	if (fileNamesOrResources.length > MAX_CONFIRM_FILES) {

src/vs/workbench/contrib/files/browser/fileActions.ts

@@ -33,7 +33,7 @@ import { IModelService } from 'vs/editor/common/services/modelService';
 import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { Schemas } from 'vs/base/common/network';
-import { IDialogService, IConfirmationResult, getConfirmMessage, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { IDialogService, IConfirmationResult, getFileNamesMessage, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { Constants } from 'vs/base/common/uint';
@@ -199,11 +199,17 @@ async function deleteFiles(textFileService: ITextFileService, dialogService: IDi
 
 	// Confirm for moving to trash
 	else if (useTrash) {
-		const message = getMoveToTrashMessage(distinctElements);
+		let { message, detail } = getMoveToTrashMessage(distinctElements);
+		detail += detail ? '\n' : '';
+		if (isWindows) {
+			detail += nls.localize('undoBin', "You can restore from the Recycle Bin.");
+		} else {
+			detail += nls.localize('undoTrash', "You can restore from the Trash.");
+		}
 
 		confirmDeletePromise = dialogService.confirm({
 			message,
-			detail: isWindows ? nls.localize('undoBin', "You can restore from the Recycle Bin.") : nls.localize('undoTrash', "You can restore from the Trash."),
+			detail,
 			primaryButton,
 			checkbox: {
 				label: nls.localize('doNotAskAgain', "Do not ask me again")
@@ -214,10 +220,12 @@ async function deleteFiles(textFileService: ITextFileService, dialogService: IDi
 
 	// Confirm for deleting permanently
 	else {
-		const message = getDeleteMessage(distinctElements);
+		let { message, detail } = getDeleteMessage(distinctElements);
+		detail += detail ? '\n' : '';
+		detail += nls.localize('irreversible', "This action is irreversible!");
 		confirmDeletePromise = dialogService.confirm({
 			message,
-			detail: nls.localize('irreversible', "This action is irreversible!"),
+			detail,
 			primaryButton,
 			type: 'warning'
 		});
@@ -280,44 +288,62 @@ async function deleteFiles(textFileService: ITextFileService, dialogService: IDi
 	});
 }
 
-function getMoveToTrashMessage(distinctElements: ExplorerItem[]): string {
+function getMoveToTrashMessage(distinctElements: ExplorerItem[]): { message: string, detail: string } {
 	if (containsBothDirectoryAndFile(distinctElements)) {
-		return getConfirmMessage(nls.localize('confirmMoveTrashMessageFilesAndDirectories', "Are you sure you want to delete the following {0} files/directories and their contents?", distinctElements.length), distinctElements.map(e => e.resource));
+		return {
+			message: nls.localize('confirmMoveTrashMessageFilesAndDirectories', "Are you sure you want to delete the following {0} files/directories and their contents?", distinctElements.length),
+			detail: getFileNamesMessage(distinctElements.map(e => e.resource))
+		};
 	}
 
 	if (distinctElements.length > 1) {
 		if (distinctElements[0].isDirectory) {
-			return getConfirmMessage(nls.localize('confirmMoveTrashMessageMultipleDirectories', "Are you sure you want to delete the following {0} directories and their contents?", distinctElements.length), distinctElements.map(e => e.resource));
+			return {
+				message: nls.localize('confirmMoveTrashMessageMultipleDirectories', "Are you sure you want to delete the following {0} directories and their contents?", distinctElements.length),
+				detail: getFileNamesMessage(distinctElements.map(e => e.resource))
+			};
 		}
 
-		return getConfirmMessage(nls.localize('confirmMoveTrashMessageMultiple', "Are you sure you want to delete the following {0} files?", distinctElements.length), distinctElements.map(e => e.resource));
+		return {
+			message: nls.localize('confirmMoveTrashMessageMultiple', "Are you sure you want to delete the following {0} files?", distinctElements.length),
+			detail: getFileNamesMessage(distinctElements.map(e => e.resource))
+		};
 	}
 
 	if (distinctElements[0].isDirectory) {
-		return nls.localize('confirmMoveTrashMessageFolder', "Are you sure you want to delete '{0}' and its contents?", distinctElements[0].name);
+		return { message: nls.localize('confirmMoveTrashMessageFolder', "Are you sure you want to delete '{0}' and its contents?", distinctElements[0].name), detail: '' };
 	}
 
-	return nls.localize('confirmMoveTrashMessageFile', "Are you sure you want to delete '{0}'?", distinctElements[0].name);
+	return { message: nls.localize('confirmMoveTrashMessageFile', "Are you sure you want to delete '{0}'?", distinctElements[0].name), detail: '' };
 }
 
-function getDeleteMessage(distinctElements: ExplorerItem[]): string {
+function getDeleteMessage(distinctElements: ExplorerItem[]): { message: string, detail: string } {
 	if (containsBothDirectoryAndFile(distinctElements)) {
-		return getConfirmMessage(nls.localize('confirmDeleteMessageFilesAndDirectories', "Are you sure you want to permanently delete the following {0} files/directories and their contents?", distinctElements.length), distinctElements.map(e => e.resource));
+		return {
+			message: nls.localize('confirmDeleteMessageFilesAndDirectories', "Are you sure you want to permanently delete the following {0} files/directories and their contents?", distinctElements.length),
+			detail: getFileNamesMessage(distinctElements.map(e => e.resource))
+		};
 	}
 
 	if (distinctElements.length > 1) {
 		if (distinctElements[0].isDirectory) {
-			return getConfirmMessage(nls.localize('confirmDeleteMessageMultipleDirectories', "Are you sure you want to permanently delete the following {0} directories and their contents?", distinctElements.length), distinctElements.map(e => e.resource));
+			return {
+				message: nls.localize('confirmDeleteMessageMultipleDirectories', "Are you sure you want to permanently delete the following {0} directories and their contents?", distinctElements.length),
+				detail: getFileNamesMessage(distinctElements.map(e => e.resource))
+			};
 		}
 
-		return getConfirmMessage(nls.localize('confirmDeleteMessageMultiple', "Are you sure you want to permanently delete the following {0} files?", distinctElements.length), distinctElements.map(e => e.resource));
+		return {
+			message: nls.localize('confirmDeleteMessageMultiple', "Are you sure you want to permanently delete the following {0} files?", distinctElements.length),
+			detail: getFileNamesMessage(distinctElements.map(e => e.resource))
+		};
 	}
 
 	if (distinctElements[0].isDirectory) {
-		return nls.localize('confirmDeleteMessageFolder', "Are you sure you want to permanently delete '{0}' and its contents?", distinctElements[0].name);
+		return { message: nls.localize('confirmDeleteMessageFolder', "Are you sure you want to permanently delete '{0}' and its contents?", distinctElements[0].name), detail: '' };
 	}
 
-	return nls.localize('confirmDeleteMessageFile', "Are you sure you want to permanently delete '{0}'?", distinctElements[0].name);
+	return { message: nls.localize('confirmDeleteMessageFile', "Are you sure you want to permanently delete '{0}'?", distinctElements[0].name), detail: '' };
 }
 
 function containsBothDirectoryAndFile(distinctElements: ExplorerItem[]): boolean {

src/vs/workbench/contrib/files/browser/views/explorerViewer.ts

@@ -36,7 +36,7 @@ import { IDragAndDropData, DataTransfers } from 'vs/base/browser/dnd';
 import { Schemas } from 'vs/base/common/network';
 import { DesktopDragAndDropData, ExternalElementsDragAndDropData, ElementsDragAndDropData } from 'vs/base/browser/ui/list/listView';
 import { isMacintosh, isWeb } from 'vs/base/common/platform';
-import { IDialogService, IConfirmation, getConfirmMessage } from 'vs/platform/dialogs/common/dialogs';
+import { IDialogService, IConfirmation, getFileNamesMessage } from 'vs/platform/dialogs/common/dialogs';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
@@ -971,11 +971,15 @@ export class FileDragAndDrop implements ITreeDragAndDrop<ExplorerItem> {
 		// Handle confirm setting
 		const confirmDragAndDrop = !isCopy && this.configurationService.getValue<boolean>(FileDragAndDrop.CONFIRM_DND_SETTING_KEY);
 		if (confirmDragAndDrop) {
+			const message = items.length > 1 && items.every(s => s.isRoot) ? localize('confirmRootsMove', "Are you sure you want to change the order of multiple root folders in your workspace?")
+				: items.length > 1 ? localize('confirmMultiMove', "Are you sure you want to move the following {0} files into '{1}'?", items.length, target.name)
+					: items[0].isRoot ? localize('confirmRootMove', "Are you sure you want to change the order of root folder '{0}' in your workspace?", items[0].name)
+						: localize('confirmMove', "Are you sure you want to move '{0}' into '{1}'?", items[0].name, target.name);
+			const detail = items.length > 1 && !items.every(s => s.isRoot) ? getFileNamesMessage(items.map(i => i.resource)) : undefined;
+
 			const confirmation = await this.dialogService.confirm({
-				message: items.length > 1 && items.every(s => s.isRoot) ? localize('confirmRootsMove', "Are you sure you want to change the order of multiple root folders in your workspace?")
-					: items.length > 1 ? getConfirmMessage(localize('confirmMultiMove', "Are you sure you want to move the following {0} files into '{1}'?", items.length, target.name), items.map(s => s.resource))
-						: items[0].isRoot ? localize('confirmRootMove', "Are you sure you want to change the order of root folder '{0}' in your workspace?", items[0].name)
-							: localize('confirmMove', "Are you sure you want to move '{0}' into '{1}'?", items[0].name, target.name),
+				message,
+				detail,
 				checkbox: {
 					label: localize('doNotAskAgain', "Do not ask me again")
 				},

src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts

@@ -5,7 +5,7 @@
 
 import * as nls from 'vs/nls';
 import { IWindowOpenable } from 'vs/platform/windows/common/windows';
-import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, FileFilter, IFileDialogService, IDialogService, ConfirmResult, getConfirmMessage } from 'vs/platform/dialogs/common/dialogs';
+import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, FileFilter, IFileDialogService, IDialogService, ConfirmResult, getFileNamesMessage } from 'vs/platform/dialogs/common/dialogs';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
@@ -90,10 +90,12 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 		}
 
 		let message: string;
+		let detail = nls.localize('saveChangesDetail', "Your changes will be lost if you don't save them.");
 		if (fileNamesOrResources.length === 1) {
 			message = nls.localize('saveChangesMessage', "Do you want to save the changes you made to {0}?", typeof fileNamesOrResources[0] === 'string' ? fileNamesOrResources[0] : resources.basename(fileNamesOrResources[0]));
 		} else {
-			message = getConfirmMessage(nls.localize('saveChangesMessages', "Do you want to save the changes to the following {0} files?", fileNamesOrResources.length), fileNamesOrResources);
+			message = nls.localize('saveChangesMessages', "Do you want to save the changes to the following {0} files?", fileNamesOrResources.length);
+			detail = getFileNamesMessage(fileNamesOrResources) + '\n' + detail;
 		}
 
 		const buttons: string[] = [
@@ -104,7 +106,7 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 
 		const { choice } = await this.dialogService.show(Severity.Warning, message, buttons, {
 			cancelId: 2,
-			detail: nls.localize('saveChangesDetail', "Your changes will be lost if you don't save them.")
+			detail
 		});
 
 		switch (choice) {