[Ide] Allow changing the case of folder names

Fixes bug #4186 - Cannot change the Case of folder names in OS-X

1 files changed, 15 insertions, 5 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
index 88b8be8058..74fe723cbb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
@@ -159,13 +159,23 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 				try {
 					if (!FileService.IsValidPath (newFoldername)) {
 						MessageService.ShowWarning (GettextCatalog.GetString ("The name you have chosen contains illegal characters. Please choose a different name."));
-					} else if (File.Exists (newFoldername) || Directory.Exists (newFoldername)) {
+						return;
+					} 
+					if (File.Exists (newFoldername)) {
 						MessageService.ShowWarning (GettextCatalog.GetString ("File or directory name is already in use. Please choose a different one."));
-					} else {
-						FileService.RenameDirectory (oldFoldername, newName);
-						if (folder.Project != null)
-							IdeApp.ProjectOperations.Save (folder.Project);
+						return;
 					}
+					// Don't use Directory.Exists because we want to check for the exact case in case-insensitive file systems
+					var di = Directory.GetDirectories (Path.GetDirectoryName (newFoldername), Path.GetFileName (newFoldername)).FirstOrDefault ();
+					if (di != null) {
+						MessageService.ShowWarning (GettextCatalog.GetString ("File or directory name is already in use. Please choose a different one."));
+						return;
+					}
+
+					FileService.RenameDirectory (oldFoldername, newName);
+					if (folder.Project != null)
+						IdeApp.ProjectOperations.Save (folder.Project);
+
 				} catch (System.ArgumentException) { // new file name with wildcard (*, ?) characters in it
 					MessageService.ShowWarning (GettextCatalog.GetString ("The name you have chosen contains illegal characters. Please choose a different name."));
 				} catch (System.IO.IOException ex) {