diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2017-03-31 10:49:21 +0300 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2017-03-31 10:49:21 +0300 |
commit | 97dbce38b0afd1d5e154a844ec6e8166324e20fd (patch) | |
tree | 73b7799e0ba2d083d8c5bf4d7b64a99a65cb6497 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles | |
parent | f8986e9094911fef528996eed70b8b6767ded561 (diff) |
Fixed 'Bug 53380 - [Webtools] Editor inserts BOMs sometimes'
In old versions we used a bool to determine if a BOM could be written.
The new editor structure just uses the encoding which can control if a
bom is emitted or not. The text file utility for auto detection now
correctly gives back the right encoding. The bool for the BOM was
removed - it's no longer in the text interfaces as well. Doesn't make
sense to have that on the low level API.
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles')
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs index f16c75d214..0c57a7c40e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs @@ -107,7 +107,7 @@ namespace MonoDevelop.Ide.FindInFiles return null; if (!readBinaryFiles && TextFileUtility.IsBinary (FileName)) return null; - return TextFileUtility.OpenStream (FileName, out hadBom); + return TextFileUtility.OpenStream (FileName); } catch (Exception e) { LoggingService.LogError ("Error while opening " + FileName, e); return null; @@ -124,7 +124,6 @@ namespace MonoDevelop.Ide.FindInFiles StringBuilder buffer = null; bool somethingReplaced; IDisposable undoGroup; - bool hadBom; Encoding encoding; public async void BeginReplace (string content) @@ -167,7 +166,7 @@ namespace MonoDevelop.Ide.FindInFiles } if (buffer != null && somethingReplaced) { object attributes = DesktopService.GetFileAttributes (FileName); - TextFileUtility.WriteText (FileName, buffer.ToString (), encoding ?? Encoding.UTF8, hadBom); + TextFileUtility.WriteText (FileName, buffer.ToString (), encoding ?? Encoding.UTF8); DesktopService.SetFileAttributes (FileName, attributes); } FileService.NotifyFileChanged (FileName); |