[TextEditor] Text file utility save function now works when the file

to write is accessible, but path isn't.

1 files changed, 11 insertions, 2 deletions

diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/TextFileUtility.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/TextFileUtility.cs
index 5b9a577a2a..fe08149dd1 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/TextFileUtility.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/TextFileUtility.cs
@@ -202,7 +202,7 @@ namespace Mono.TextEditor.Utils
 			if (encoding == null)
 				throw new ArgumentNullException ("encoding");
 
-			string tmpPath = Path.Combine (Path.GetDirectoryName (fileName), ".#" + Path.GetFileName (fileName));
+			string tmpPath = Path.GetTempFileName ();
 			using (var stream = new FileStream (tmpPath, FileMode.Create, FileAccess.Write, FileShare.Write)) {
 				if (hadBom) {
 					var bom = encoding.GetPreamble ();
@@ -212,7 +212,16 @@ namespace Mono.TextEditor.Utils
 				byte[] bytes = encoding.GetBytes (text);
 				stream.Write (bytes, 0, bytes.Length);
 			}
-			SystemRename (tmpPath, fileName);
+			try {
+				SystemRename (tmpPath, fileName);
+			} catch (Exception) {
+				try {
+					System.IO.File.Delete (tmpPath);
+				} catch {
+					// nothing
+				}
+				throw;
+			}
 		}
 
 		/// <summary>