From 89d112ef917b7de665e9ebe98764a206e53635a9 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Fri, 5 Aug 2016 12:32:27 +0300
Subject: [PATCH] delete file action: show name of file/directory to delete,
 not just 'the selected directory' (IDEA-159125)

---
 .../fileChooser/actions/VirtualFileDeleteProvider.java |  8 ++++----
 .../src/messages/UIBundle.properties                   | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/VirtualFileDeleteProvider.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/VirtualFileDeleteProvider.java
index 662e6f1790ef..2d8f884649de 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/VirtualFileDeleteProvider.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/VirtualFileDeleteProvider.java
@@ -104,7 +104,7 @@ public final class VirtualFileDeleteProvider implements DeleteProvider {
   private static String createConfirmationMessage(VirtualFile[] filesToDelete) {
     if (filesToDelete.length == 1) {
       if (filesToDelete[0].isDirectory()) {
-        return UIBundle.message("are.you.sure.you.want.to.delete.selected.folder.confirmation.message");
+        return UIBundle.message("are.you.sure.you.want.to.delete.selected.folder.confirmation.message", filesToDelete[0].getName());
       }
       else {
         return UIBundle.message("are.you.sure.you.want.to.delete.selected.file.confirmation.message", filesToDelete[0].getName());
@@ -120,13 +120,13 @@ public final class VirtualFileDeleteProvider implements DeleteProvider {
       }
       LOG.assertTrue(hasFiles || hasFolders);
       if (hasFiles && hasFolders) {
-        return UIBundle.message("are.you.sure.you.want.to.delete.selected.files.and.directories.confirmation.message");
+        return UIBundle.message("are.you.sure.you.want.to.delete.selected.files.and.directories.confirmation.message", filesToDelete.length);
       }
       else if (hasFolders) {
-        return UIBundle.message("are.you.sure.you.want.to.delete.selected.folders.confirmation.message");
+        return UIBundle.message("are.you.sure.you.want.to.delete.selected.folders.confirmation.message", filesToDelete.length);
       }
       else {
-        return UIBundle.message("are.you.sure.you.want.to.delete.selected.files.and.files.confirmation.message");
+        return UIBundle.message("are.you.sure.you.want.to.delete.selected.files.and.files.confirmation.message", filesToDelete.length);
       }
     }
   }
diff --git a/platform/platform-resources-en/src/messages/UIBundle.properties b/platform/platform-resources-en/src/messages/UIBundle.properties
index 09989fbea912..3a0fee95167d 100644
--- a/platform/platform-resources-en/src/messages/UIBundle.properties
+++ b/platform/platform-resources-en/src/messages/UIBundle.properties
@@ -99,11 +99,11 @@ file.chooser.save.dialog.default.title=Select File to Save
 file.chooser.save.dialog.confirmation={0} already exists.\nDo you want to replace it?
 file.chooser.save.dialog.confirmation.title=Confirm Save as
 delete.dialog.title=Delete
-are.you.sure.you.want.to.delete.selected.folder.confirmation.message=Are you sure you want to delete selected folder?
-are.you.sure.you.want.to.delete.selected.file.confirmation.message=Delete {0}?
-are.you.sure.you.want.to.delete.selected.files.and.directories.confirmation.message=Are you sure you want to delete selected files and directories?
-are.you.sure.you.want.to.delete.selected.folders.confirmation.message=Are you sure you want to delete selected directories?
-are.you.sure.you.want.to.delete.selected.files.and.files.confirmation.message=Are you sure you want to delete selected files?
+are.you.sure.you.want.to.delete.selected.folder.confirmation.message=Are you sure you want to delete folder ''{0}''?
+are.you.sure.you.want.to.delete.selected.file.confirmation.message=Delete ''{0}''?
+are.you.sure.you.want.to.delete.selected.files.and.directories.confirmation.message=Are you sure you want to delete {0} selected files and directories?
+are.you.sure.you.want.to.delete.selected.folders.confirmation.message=Are you sure you want to delete {0} selected directories?
+are.you.sure.you.want.to.delete.selected.files.and.files.confirmation.message=Are you sure you want to delete {0} selected files?
 create.new.folder.enter.new.folder.name.prompt.text=Enter a new folder name:
 create.new.folder.folder.name.cannot.be.empty.error.message=Folder name cannot be empty
 create.new.folder.could.not.create.folder.error.message=Could not create folder ''{0}''