sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert old behaviour of ReadToEnd

Browse Source
This commit is contained in:
Dean Herbert
2022-07-06 19:53:19 +09:00
parent 12d396a513
commit 01bc6e5cb7
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/IO/LineBufferedReader.cs
View File

@ -46,14 +46,21 @@ namespace osu.Game.IO
/// <summary>
/// Reads the stream to its end and returns the text read.
/// Not compatible with calls to <see cref="PeekLine"/>.
/// This includes any peeked but unconsumed lines.
/// </summary>
public string ReadToEnd()
{
if (peekedLine != null)
throw new InvalidOperationException($"Do not use {nameof(ReadToEnd)} when also peeking for lines.");
string remainingText = streamReader.ReadToEnd();
if (peekedLine == null)
return remainingText;
return streamReader.ReadToEnd();
var builder = new StringBuilder();
// this might not be completely correct due to varying platform line endings
builder.AppendLine(peekedLine);
builder.Append(remainingText);
return builder.ToString();
}
public void Dispose()