diff options
| author | Sandy Armstrong <sandy@xamarin.com> | 2019-11-08 02:27:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 02:27:11 +0300 |
| commit | 5454f45ce224ea74cdb5152de7e6e70150088068 (patch) | |
| tree | 2e5f70b7eaf25d0c2659fa369912b183a04f4da9 | |
| parent | 9f335aabc4752e9442345f8295241ae7152377be (diff) | |
| parent | cf3e82f84a09dd2039ec4e33f13de483c668fa50 (diff) | |
Merge pull request #9154 from mono/backport-pr-9151-to-release-8.4
[release-8.4] Bump Roslyn to 3.4.0-beta3-19525-13
3 files changed, 3 insertions, 3 deletions
diff --git a/main/msbuild/RoslynVersion.props b/main/msbuild/RoslynVersion.props index ed342702ac..cec5cf70cb 100644 --- a/main/msbuild/RoslynVersion.props +++ b/main/msbuild/RoslynVersion.props @@ -1,5 +1,5 @@ <Project> <PropertyGroup> - <NuGetVersionRoslyn>3.4.0-beta3-19518-02</NuGetVersionRoslyn> + <NuGetVersionRoslyn>3.4.0-beta3-19525-13</NuGetVersionRoslyn> </PropertyGroup> </Project> diff --git a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Document/TextDocument.cs b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Document/TextDocument.cs index 9351121911..98c9ce593e 100644 --- a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Document/TextDocument.cs +++ b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Document/TextDocument.cs @@ -343,7 +343,7 @@ namespace Mono.TextEditor this.mimeType = mimeType;
var doc = PlatformCatalog.Instance.TextDocumentFactoryService.CreateTextDocument (
PlatformCatalog.Instance.TextBufferFactoryService.CreateTextBuffer (
- text ?? string.Empty,
+ new StringReader(text ?? string.Empty), GetContentTypeFromMimeType (fileName, mimeType)
),
fileName ?? string.Empty
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Documents/TextBufferFileModel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Documents/TextBufferFileModel.cs index 2941b70049..f2e496e342 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Documents/TextBufferFileModel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Documents/TextBufferFileModel.cs @@ -80,7 +80,7 @@ namespace MonoDevelop.Ide.Gui.Documents ThawChangeEvent (); } } else { - var buffer = PlatformCatalog.Instance.TextBufferFactoryService.CreateTextBuffer (text.Text, contentType); + var buffer = PlatformCatalog.Instance.TextBufferFactoryService.CreateTextBuffer (new System.IO.StringReader (text.Text), contentType); var doc = PlatformCatalog.Instance.TextDocumentFactoryService.CreateTextDocument (buffer, FilePath); doc.Encoding = text.Encoding; SetTextDocument (doc); |