Skip to content

Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."#77360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephentoub merged 1 commit into from
Oct 24, 2022
Merged

Revert "Override ReadAsync and WriteAsync methods on ConsoleStream." #77360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 0 additions & 88 deletions src/libraries/System.Console/src/System/IO/ConsoleStream.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;

namespace System.IO
{
Expand All@@ -30,46 +28,6 @@ public override void Write(byte[] buffer, int offset, int count)

public override void WriteByte(byte value) => Write(new ReadOnlySpan<byte>(in value));

public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
ValidateWrite(buffer, offset, count);

if (cancellationToken.IsCancellationRequested)
{
return Task.FromCanceled(cancellationToken);
}

try
{
Write(new ReadOnlySpan<byte>(buffer, offset, count));
return Task.CompletedTask;
}
catch (Exception ex)
{
return Task.FromException(ex);
}
}

public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
{
ValidateCanWrite();

if (cancellationToken.IsCancellationRequested)
{
return ValueTask.FromCanceled(cancellationToken);
}

try
{
Write(buffer.Span);
return ValueTask.CompletedTask;
}
catch (Exception ex)
{
return ValueTask.FromException(ex);
}
}

public override int Read(byte[] buffer, int offset, int count)
{
ValidateRead(buffer, offset, count);
Expand All@@ -83,44 +41,6 @@ public override int ReadByte()
return result != 0 ? b : -1;
}

public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
ValidateRead(buffer, offset, count);

if (cancellationToken.IsCancellationRequested)
{
return Task.FromCanceled<int>(cancellationToken);
}

try
{
return Task.FromResult(Read(new Span<byte>(buffer, offset, count)));
}
catch (Exception exception)
{
return Task.FromException<int>(exception);
}
}

public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
{
ValidateCanRead();

if (cancellationToken.IsCancellationRequested)
{
return ValueTask.FromCanceled<int>(cancellationToken);
}

try
{
return ValueTask.FromResult(Read(buffer.Span));
}
catch (Exception exception)
{
return ValueTask.FromException<int>(exception);
}
}

protected override void Dispose(bool disposing)
{
_canRead = false;
Expand DownExpand Up@@ -151,11 +71,7 @@ public override void Flush() { }
protected void ValidateRead(byte[] buffer, int offset, int count)
{
ValidateBufferArguments(buffer, offset, count);
ValidateCanRead();
}

private void ValidateCanRead()
{
if (!_canRead)
{
throw Error.GetReadNotSupported();
Expand All@@ -165,11 +81,7 @@ private void ValidateCanRead()
protected void ValidateWrite(byte[] buffer, int offset, int count)
{
ValidateBufferArguments(buffer, offset, count);
ValidateCanWrite();
}

private void ValidateCanWrite()
{
if (!_canWrite)
{
throw Error.GetWriteNotSupported();
Expand Down
99 changes: 0 additions & 99 deletions src/libraries/System.Console/tests/ConsoleStreamTests.cs
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions src/libraries/System.Console/tests/Helpers.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,8 @@
using System.Text;
using Xunit;

static class Helpers
class Helpers
{
public static bool IsConsoleInSupported =>
!PlatformDetection.IsAndroid && !PlatformDetection.IsiOS && !PlatformDetection.IsMacCatalyst && !PlatformDetection.IstvOS && !PlatformDetection.IsBrowser;

public static void SetAndReadHelper(Action<TextWriter> setHelper, Func<TextWriter> getHelper, Func<StreamReader, string> readHelper)
{
const string TestString = "Test";
Expand Down
7 changes: 7 additions & 0 deletions src/libraries/System.Console/tests/ReadAndWrite.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,13 @@ public static void WriteOverloads()
}
}

[Fact]
public static void WriteToOutputStream_EmptyArray()
{
Stream outStream = Console.OpenStandardOutput();
outStream.Write(new byte[] { }, 0, 0);
}

[Fact]
[OuterLoop]
public static void WriteOverloadsToRealConsole()
Expand Down
6 changes: 4 additions & 2 deletions src/libraries/System.Console/tests/SetIn.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,8 @@
//
public class SetIn
{
[ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
[Fact]
[SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
public static void SetInThrowsOnNull()
{
TextReader savedIn = Console.In;
Expand All@@ -24,7 +25,8 @@ public static void SetInThrowsOnNull()
}
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
[Fact]
[SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
public static void SetInReadLine()
{
const string TextStringFormat = "Test {0}";
Expand Down
5 changes: 2 additions & 3 deletions src/libraries/System.Console/tests/System.Console.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="CancelKeyPress.cs" />
<Compile Include="ConsoleStreamTests.cs" />
<Compile Include="Helpers.cs" />
<Compile Include="ReadAndWrite.cs" />
<Compile Include="ConsoleKeyInfoTests.cs" />
Expand DownExpand Up@@ -44,8 +43,8 @@
</ItemGroup>
<ItemGroup>
<Content Include="$(MSBuildThisFileDirectory)TestData\**\*"
Link="%(RecursiveDir)%(Filename)%(Extension)"
CopyToOutputDirectory="PreserveNewest" />
Link="%(RecursiveDir)%(Filename)%(Extension)"
CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
<Compile Include="ConsoleEncoding.Windows.cs" />
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Revert "Override ReadAsync and WriteAsync methods on ConsoleStream." by stephentoub · Pull Request #77360 · dotnet/runtime · GitHub
Skip to content
Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."#77360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 1 commit into

from

Oct 24, 2022
 Merged


Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."
#77360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 0 additions & 88 deletions
src/libraries/System.Console/src/System/IO/ConsoleStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;

namespace System.IO
{
Expand All@@ -30,46 +28,6 @@ public override void Write(byte[] buffer, int offset, int count)

 public override void WriteByte(byte value) => Write(new ReadOnlySpan<byte>(in value));

 public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
 {
 ValidateWrite(buffer, offset, count);

 if (cancellationToken.IsCancellationRequested)
 {
 return Task.FromCanceled(cancellationToken);
 }

 try
 {
 Write(new ReadOnlySpan<byte>(buffer, offset, count));
 return Task.CompletedTask;
 }
 catch (Exception ex)
 {
 return Task.FromException(ex);
 }
 }

 public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
 {
 ValidateCanWrite();

 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 try
 {
 Write(buffer.Span);
 return ValueTask.CompletedTask;
 }
 catch (Exception ex)
 {
 return ValueTask.FromException(ex);
 }
 }

 public override int Read(byte[] buffer, int offset, int count)
 {
 ValidateRead(buffer, offset, count);
Expand All@@ -83,44 +41,6 @@ public override int ReadByte()
 return result != 0 ? b : -1;
 }

 public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
 {
 ValidateRead(buffer, offset, count);

 if (cancellationToken.IsCancellationRequested)
 {
 return Task.FromCanceled<int>(cancellationToken);
 }

 try
 {
 return Task.FromResult(Read(new Span<byte>(buffer, offset, count)));
 }
 catch (Exception exception)
 {
 return Task.FromException<int>(exception);
 }
 }

 public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
 {
 ValidateCanRead();

 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled<int>(cancellationToken);
 }

 try
 {
 return ValueTask.FromResult(Read(buffer.Span));
 }
 catch (Exception exception)
 {
 return ValueTask.FromException<int>(exception);
 }
 }

 protected override void Dispose(bool disposing)
 {
 _canRead = false;
Expand DownExpand Up@@ -151,11 +71,7 @@ public override void Flush() { }
 protected void ValidateRead(byte[] buffer, int offset, int count)
 {
 ValidateBufferArguments(buffer, offset, count);
 ValidateCanRead();
 }

 private void ValidateCanRead()
 {
 if (!_canRead)
 {
 throw Error.GetReadNotSupported();
Expand All@@ -165,11 +81,7 @@ private void ValidateCanRead()
 protected void ValidateWrite(byte[] buffer, int offset, int count)
 {
 ValidateBufferArguments(buffer, offset, count);
 ValidateCanWrite();
 }

 private void ValidateCanWrite()
 {
 if (!_canWrite)
 {
 throw Error.GetWriteNotSupported();
Expand Down

99 changes: 0 additions & 99 deletions
src/libraries/System.Console/tests/ConsoleStreamTests.cs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
src/libraries/System.Console/tests/Helpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,8 @@
using System.Text;
using Xunit;

static class Helpers
class Helpers
{
 public static bool IsConsoleInSupported =>
 !PlatformDetection.IsAndroid && !PlatformDetection.IsiOS && !PlatformDetection.IsMacCatalyst && !PlatformDetection.IstvOS && !PlatformDetection.IsBrowser;

 public static void SetAndReadHelper(Action<TextWriter> setHelper, Func<TextWriter> getHelper, Func<StreamReader, string> readHelper)
 {
 const string TestString = "Test";
Expand Down

7 changes: 7 additions & 0 deletions
src/libraries/System.Console/tests/ReadAndWrite.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,13 @@ public static void WriteOverloads()
 }
 }

 [Fact]
 public static void WriteToOutputStream_EmptyArray()
 {
 Stream outStream = Console.OpenStandardOutput();
 outStream.Write(new byte[] { }, 0, 0);
 }

 [Fact]
 [OuterLoop]
 public static void WriteOverloadsToRealConsole()
Expand Down

6 changes: 4 additions & 2 deletions
src/libraries/System.Console/tests/SetIn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,8 @@
//
public class SetIn
{
 [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
 [Fact]
 [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
 public static void SetInThrowsOnNull()
 {
 TextReader savedIn = Console.In;
Expand All@@ -24,7 +25,8 @@ public static void SetInThrowsOnNull()
 }
 }

 [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
 [Fact]
 [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
 public static void SetInReadLine()
 {
 const string TextStringFormat = "Test {0}";
Expand Down

5 changes: 2 additions & 3 deletions
src/libraries/System.Console/tests/System.Console.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="CancelKeyPress.cs" />
 <Compile Include="ConsoleStreamTests.cs" />
 <Compile Include="Helpers.cs" />
 <Compile Include="ReadAndWrite.cs" />
 <Compile Include="ConsoleKeyInfoTests.cs" />
Expand DownExpand Up@@ -44,8 +43,8 @@
 </ItemGroup>
 <ItemGroup>
 <Content Include="$(MSBuildThisFileDirectory)TestData\**\*"
Link="%(RecursiveDir)%(Filename)%(Extension)"
CopyToOutputDirectory="PreserveNewest" />
 Link="%(RecursiveDir)%(Filename)%(Extension)"
 CopyToOutputDirectory="PreserveNewest" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="ConsoleEncoding.Windows.cs" />
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Revert "Override ReadAsync and WriteAsync methods on ConsoleStream." by stephentoub · Pull Request #77360 · dotnet/runtime · GitHub
Skip to content
Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."#77360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 1 commit into

from

Oct 24, 2022
 Merged


Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."
#77360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 0 additions & 88 deletions
src/libraries/System.Console/src/System/IO/ConsoleStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;

namespace System.IO
{
Expand All@@ -30,46 +28,6 @@ public override void Write(byte[] buffer, int offset, int count)

 public override void WriteByte(byte value) => Write(new ReadOnlySpan<byte>(in value));

 public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
 {
 ValidateWrite(buffer, offset, count);

 if (cancellationToken.IsCancellationRequested)
 {
 return Task.FromCanceled(cancellationToken);
 }

 try
 {
 Write(new ReadOnlySpan<byte>(buffer, offset, count));
 return Task.CompletedTask;
 }
 catch (Exception ex)
 {
 return Task.FromException(ex);
 }
 }

 public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
 {
 ValidateCanWrite();

 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 try
 {
 Write(buffer.Span);
 return ValueTask.CompletedTask;
 }
 catch (Exception ex)
 {
 return ValueTask.FromException(ex);
 }
 }

 public override int Read(byte[] buffer, int offset, int count)
 {
 ValidateRead(buffer, offset, count);
Expand All@@ -83,44 +41,6 @@ public override int ReadByte()
 return result != 0 ? b : -1;
 }

 public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
 {
 ValidateRead(buffer, offset, count);

 if (cancellationToken.IsCancellationRequested)
 {
 return Task.FromCanceled<int>(cancellationToken);
 }

 try
 {
 return Task.FromResult(Read(new Span<byte>(buffer, offset, count)));
 }
 catch (Exception exception)
 {
 return Task.FromException<int>(exception);
 }
 }

 public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
 {
 ValidateCanRead();

 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled<int>(cancellationToken);
 }

 try
 {
 return ValueTask.FromResult(Read(buffer.Span));
 }
 catch (Exception exception)
 {
 return ValueTask.FromException<int>(exception);
 }
 }

 protected override void Dispose(bool disposing)
 {
 _canRead = false;
Expand DownExpand Up@@ -151,11 +71,7 @@ public override void Flush() { }
 protected void ValidateRead(byte[] buffer, int offset, int count)
 {
 ValidateBufferArguments(buffer, offset, count);
 ValidateCanRead();
 }

 private void ValidateCanRead()
 {
 if (!_canRead)
 {
 throw Error.GetReadNotSupported();
Expand All@@ -165,11 +81,7 @@ private void ValidateCanRead()
 protected void ValidateWrite(byte[] buffer, int offset, int count)
 {
 ValidateBufferArguments(buffer, offset, count);
 ValidateCanWrite();
 }

 private void ValidateCanWrite()
 {
 if (!_canWrite)
 {
 throw Error.GetWriteNotSupported();
Expand Down

99 changes: 0 additions & 99 deletions
src/libraries/System.Console/tests/ConsoleStreamTests.cs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
src/libraries/System.Console/tests/Helpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,8 @@
using System.Text;
using Xunit;

static class Helpers
class Helpers
{
 public static bool IsConsoleInSupported =>
 !PlatformDetection.IsAndroid && !PlatformDetection.IsiOS && !PlatformDetection.IsMacCatalyst && !PlatformDetection.IstvOS && !PlatformDetection.IsBrowser;

 public static void SetAndReadHelper(Action<TextWriter> setHelper, Func<TextWriter> getHelper, Func<StreamReader, string> readHelper)
 {
 const string TestString = "Test";
Expand Down

7 changes: 7 additions & 0 deletions
src/libraries/System.Console/tests/ReadAndWrite.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,13 @@ public static void WriteOverloads()
 }
 }

 [Fact]
 public static void WriteToOutputStream_EmptyArray()
 {
 Stream outStream = Console.OpenStandardOutput();
 outStream.Write(new byte[] { }, 0, 0);
 }

 [Fact]
 [OuterLoop]
 public static void WriteOverloadsToRealConsole()
Expand Down

6 changes: 4 additions & 2 deletions
src/libraries/System.Console/tests/SetIn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,8 @@
//
public class SetIn
{
 [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
 [Fact]
 [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
 public static void SetInThrowsOnNull()
 {
 TextReader savedIn = Console.In;
Expand All@@ -24,7 +25,8 @@ public static void SetInThrowsOnNull()
 }
 }

 [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
 [Fact]
 [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
 public static void SetInReadLine()
 {
 const string TextStringFormat = "Test {0}";
Expand Down

5 changes: 2 additions & 3 deletions
src/libraries/System.Console/tests/System.Console.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="CancelKeyPress.cs" />
 <Compile Include="ConsoleStreamTests.cs" />
 <Compile Include="Helpers.cs" />
 <Compile Include="ReadAndWrite.cs" />
 <Compile Include="ConsoleKeyInfoTests.cs" />
Expand DownExpand Up@@ -44,8 +43,8 @@
 </ItemGroup>
 <ItemGroup>
 <Content Include="$(MSBuildThisFileDirectory)TestData\**\*"
Link="%(RecursiveDir)%(Filename)%(Extension)"
CopyToOutputDirectory="PreserveNewest" />
 Link="%(RecursiveDir)%(Filename)%(Extension)"
 CopyToOutputDirectory="PreserveNewest" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="ConsoleEncoding.Windows.cs" />
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Revert "Override ReadAsync and WriteAsync methods on ConsoleStream." by stephentoub · Pull Request #77360 · dotnet/runtime · GitHub
Skip to content
Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."#77360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 1 commit into

from

Oct 24, 2022
 Merged


Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."
#77360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 0 additions & 88 deletions
src/libraries/System.Console/src/System/IO/ConsoleStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;

namespace System.IO
{
Expand All@@ -30,46 +28,6 @@ public override void Write(byte[] buffer, int offset, int count)

 public override void WriteByte(byte value) => Write(new ReadOnlySpan<byte>(in value));

 public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
 {
 ValidateWrite(buffer, offset, count);

 if (cancellationToken.IsCancellationRequested)
 {
 return Task.FromCanceled(cancellationToken);
 }

 try
 {
 Write(new ReadOnlySpan<byte>(buffer, offset, count));
 return Task.CompletedTask;
 }
 catch (Exception ex)
 {
 return Task.FromException(ex);
 }
 }

 public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
 {
 ValidateCanWrite();

 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 try
 {
 Write(buffer.Span);
 return ValueTask.CompletedTask;
 }
 catch (Exception ex)
 {
 return ValueTask.FromException(ex);
 }
 }

 public override int Read(byte[] buffer, int offset, int count)
 {
 ValidateRead(buffer, offset, count);
Expand All@@ -83,44 +41,6 @@ public override int ReadByte()
 return result != 0 ? b : -1;
 }

 public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
 {
 ValidateRead(buffer, offset, count);

 if (cancellationToken.IsCancellationRequested)
 {
 return Task.FromCanceled<int>(cancellationToken);
 }

 try
 {
 return Task.FromResult(Read(new Span<byte>(buffer, offset, count)));
 }
 catch (Exception exception)
 {
 return Task.FromException<int>(exception);
 }
 }

 public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
 {
 ValidateCanRead();

 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled<int>(cancellationToken);
 }

 try
 {
 return ValueTask.FromResult(Read(buffer.Span));
 }
 catch (Exception exception)
 {
 return ValueTask.FromException<int>(exception);
 }
 }

 protected override void Dispose(bool disposing)
 {
 _canRead = false;
Expand DownExpand Up@@ -151,11 +71,7 @@ public override void Flush() { }
 protected void ValidateRead(byte[] buffer, int offset, int count)
 {
 ValidateBufferArguments(buffer, offset, count);
 ValidateCanRead();
 }

 private void ValidateCanRead()
 {
 if (!_canRead)
 {
 throw Error.GetReadNotSupported();
Expand All@@ -165,11 +81,7 @@ private void ValidateCanRead()
 protected void ValidateWrite(byte[] buffer, int offset, int count)
 {
 ValidateBufferArguments(buffer, offset, count);
 ValidateCanWrite();
 }

 private void ValidateCanWrite()
 {
 if (!_canWrite)
 {
 throw Error.GetWriteNotSupported();
Expand Down

99 changes: 0 additions & 99 deletions
src/libraries/System.Console/tests/ConsoleStreamTests.cs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
src/libraries/System.Console/tests/Helpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,8 @@
using System.Text;
using Xunit;

static class Helpers
class Helpers
{
 public static bool IsConsoleInSupported =>
 !PlatformDetection.IsAndroid && !PlatformDetection.IsiOS && !PlatformDetection.IsMacCatalyst && !PlatformDetection.IstvOS && !PlatformDetection.IsBrowser;

 public static void SetAndReadHelper(Action<TextWriter> setHelper, Func<TextWriter> getHelper, Func<StreamReader, string> readHelper)
 {
 const string TestString = "Test";
Expand Down

7 changes: 7 additions & 0 deletions
src/libraries/System.Console/tests/ReadAndWrite.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,13 @@ public static void WriteOverloads()
 }
 }

 [Fact]
 public static void WriteToOutputStream_EmptyArray()
 {
 Stream outStream = Console.OpenStandardOutput();
 outStream.Write(new byte[] { }, 0, 0);
 }

 [Fact]
 [OuterLoop]
 public static void WriteOverloadsToRealConsole()
Expand Down

6 changes: 4 additions & 2 deletions
src/libraries/System.Console/tests/SetIn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,8 @@
//
public class SetIn
{
 [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
 [Fact]
 [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
 public static void SetInThrowsOnNull()
 {
 TextReader savedIn = Console.In;
Expand All@@ -24,7 +25,8 @@ public static void SetInThrowsOnNull()
 }
 }

 [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
 [Fact]
 [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
 public static void SetInReadLine()
 {
 const string TextStringFormat = "Test {0}";
Expand Down

5 changes: 2 additions & 3 deletions
src/libraries/System.Console/tests/System.Console.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="CancelKeyPress.cs" />
 <Compile Include="ConsoleStreamTests.cs" />
 <Compile Include="Helpers.cs" />
 <Compile Include="ReadAndWrite.cs" />
 <Compile Include="ConsoleKeyInfoTests.cs" />
Expand DownExpand Up@@ -44,8 +43,8 @@
 </ItemGroup>
 <ItemGroup>
 <Content Include="$(MSBuildThisFileDirectory)TestData\**\*"
Link="%(RecursiveDir)%(Filename)%(Extension)"
CopyToOutputDirectory="PreserveNewest" />
 Link="%(RecursiveDir)%(Filename)%(Extension)"
 CopyToOutputDirectory="PreserveNewest" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="ConsoleEncoding.Windows.cs" />
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Revert "Override ReadAsync and WriteAsync methods on ConsoleStream." by stephentoub · Pull Request #77360 · dotnet/runtime · GitHub
Skip to content
Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."#77360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 1 commit into

from

Oct 24, 2022
 Merged


Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."
#77360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 0 additions & 88 deletions
src/libraries/System.Console/src/System/IO/ConsoleStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;

namespace System.IO
{
Expand All@@ -30,46 +28,6 @@ public override void Write(byte[] buffer, int offset, int count)

 public override void WriteByte(byte value) => Write(new ReadOnlySpan<byte>(in value));

 public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
 {
 ValidateWrite(buffer, offset, count);

 if (cancellationToken.IsCancellationRequested)
 {
 return Task.FromCanceled(cancellationToken);
 }

 try
 {
 Write(new ReadOnlySpan<byte>(buffer, offset, count));
 return Task.CompletedTask;
 }
 catch (Exception ex)
 {
 return Task.FromException(ex);
 }
 }

 public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
 {
 ValidateCanWrite();

 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 try
 {
 Write(buffer.Span);
 return ValueTask.CompletedTask;
 }
 catch (Exception ex)
 {
 return ValueTask.FromException(ex);
 }
 }

 public override int Read(byte[] buffer, int offset, int count)
 {
 ValidateRead(buffer, offset, count);
Expand All@@ -83,44 +41,6 @@ public override int ReadByte()
 return result != 0 ? b : -1;
 }

 public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
 {
 ValidateRead(buffer, offset, count);

 if (cancellationToken.IsCancellationRequested)
 {
 return Task.FromCanceled<int>(cancellationToken);
 }

 try
 {
 return Task.FromResult(Read(new Span<byte>(buffer, offset, count)));
 }
 catch (Exception exception)
 {
 return Task.FromException<int>(exception);
 }
 }

 public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
 {
 ValidateCanRead();

 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled<int>(cancellationToken);
 }

 try
 {
 return ValueTask.FromResult(Read(buffer.Span));
 }
 catch (Exception exception)
 {
 return ValueTask.FromException<int>(exception);
 }
 }

 protected override void Dispose(bool disposing)
 {
 _canRead = false;
Expand DownExpand Up@@ -151,11 +71,7 @@ public override void Flush() { }
 protected void ValidateRead(byte[] buffer, int offset, int count)
 {
 ValidateBufferArguments(buffer, offset, count);
 ValidateCanRead();
 }

 private void ValidateCanRead()
 {
 if (!_canRead)
 {
 throw Error.GetReadNotSupported();
Expand All@@ -165,11 +81,7 @@ private void ValidateCanRead()
 protected void ValidateWrite(byte[] buffer, int offset, int count)
 {
 ValidateBufferArguments(buffer, offset, count);
 ValidateCanWrite();
 }

 private void ValidateCanWrite()
 {
 if (!_canWrite)
 {
 throw Error.GetWriteNotSupported();
Expand Down

99 changes: 0 additions & 99 deletions
src/libraries/System.Console/tests/ConsoleStreamTests.cs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
src/libraries/System.Console/tests/Helpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,8 @@
using System.Text;
using Xunit;

static class Helpers
class Helpers
{
 public static bool IsConsoleInSupported =>
 !PlatformDetection.IsAndroid && !PlatformDetection.IsiOS && !PlatformDetection.IsMacCatalyst && !PlatformDetection.IstvOS && !PlatformDetection.IsBrowser;

 public static void SetAndReadHelper(Action<TextWriter> setHelper, Func<TextWriter> getHelper, Func<StreamReader, string> readHelper)
 {
 const string TestString = "Test";
Expand Down

7 changes: 7 additions & 0 deletions
src/libraries/System.Console/tests/ReadAndWrite.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,13 @@ public static void WriteOverloads()
 }
 }

 [Fact]
 public static void WriteToOutputStream_EmptyArray()
 {
 Stream outStream = Console.OpenStandardOutput();
 outStream.Write(new byte[] { }, 0, 0);
 }

 [Fact]
 [OuterLoop]
 public static void WriteOverloadsToRealConsole()
Expand Down

6 changes: 4 additions & 2 deletions
src/libraries/System.Console/tests/SetIn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,8 @@
//
public class SetIn
{
 [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
 [Fact]
 [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
 public static void SetInThrowsOnNull()
 {
 TextReader savedIn = Console.In;
Expand All@@ -24,7 +25,8 @@ public static void SetInThrowsOnNull()
 }
 }

 [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
 [Fact]
 [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
 public static void SetInReadLine()
 {
 const string TextStringFormat = "Test {0}";
Expand Down

5 changes: 2 additions & 3 deletions
src/libraries/System.Console/tests/System.Console.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="CancelKeyPress.cs" />
 <Compile Include="ConsoleStreamTests.cs" />
 <Compile Include="Helpers.cs" />
 <Compile Include="ReadAndWrite.cs" />
 <Compile Include="ConsoleKeyInfoTests.cs" />
Expand DownExpand Up@@ -44,8 +43,8 @@
 </ItemGroup>
 <ItemGroup>
 <Content Include="$(MSBuildThisFileDirectory)TestData\**\*"
Link="%(RecursiveDir)%(Filename)%(Extension)"
CopyToOutputDirectory="PreserveNewest" />
 Link="%(RecursiveDir)%(Filename)%(Extension)"
 CopyToOutputDirectory="PreserveNewest" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="ConsoleEncoding.Windows.cs" />
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Revert "Override ReadAsync and WriteAsync methods on ConsoleStream." by stephentoub · Pull Request #77360 · dotnet/runtime · GitHub
Skip to content
Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."#77360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 1 commit into

from

Oct 24, 2022
 Merged


Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."
#77360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 0 additions & 88 deletions
src/libraries/System.Console/src/System/IO/ConsoleStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;

namespace System.IO
{
Expand All@@ -30,46 +28,6 @@ public override void Write(byte[] buffer, int offset, int count)

 public override void WriteByte(byte value) => Write(new ReadOnlySpan<byte>(in value));

 public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
 {
 ValidateWrite(buffer, offset, count);

 if (cancellationToken.IsCancellationRequested)
 {
 return Task.FromCanceled(cancellationToken);
 }

 try
 {
 Write(new ReadOnlySpan<byte>(buffer, offset, count));
 return Task.CompletedTask;
 }
 catch (Exception ex)
 {
 return Task.FromException(ex);
 }
 }

 public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
 {
 ValidateCanWrite();

 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 try
 {
 Write(buffer.Span);
 return ValueTask.CompletedTask;
 }
 catch (Exception ex)
 {
 return ValueTask.FromException(ex);
 }
 }

 public override int Read(byte[] buffer, int offset, int count)
 {
 ValidateRead(buffer, offset, count);
Expand All@@ -83,44 +41,6 @@ public override int ReadByte()
 return result != 0 ? b : -1;
 }

 public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
 {
 ValidateRead(buffer, offset, count);

 if (cancellationToken.IsCancellationRequested)
 {
 return Task.FromCanceled<int>(cancellationToken);
 }

 try
 {
 return Task.FromResult(Read(new Span<byte>(buffer, offset, count)));
 }
 catch (Exception exception)
 {
 return Task.FromException<int>(exception);
 }
 }

 public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
 {
 ValidateCanRead();

 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled<int>(cancellationToken);
 }

 try
 {
 return ValueTask.FromResult(Read(buffer.Span));
 }
 catch (Exception exception)
 {
 return ValueTask.FromException<int>(exception);
 }
 }

 protected override void Dispose(bool disposing)
 {
 _canRead = false;
Expand DownExpand Up@@ -151,11 +71,7 @@ public override void Flush() { }
 protected void ValidateRead(byte[] buffer, int offset, int count)
 {
 ValidateBufferArguments(buffer, offset, count);
 ValidateCanRead();
 }

 private void ValidateCanRead()
 {
 if (!_canRead)
 {
 throw Error.GetReadNotSupported();
Expand All@@ -165,11 +81,7 @@ private void ValidateCanRead()
 protected void ValidateWrite(byte[] buffer, int offset, int count)
 {
 ValidateBufferArguments(buffer, offset, count);
 ValidateCanWrite();
 }

 private void ValidateCanWrite()
 {
 if (!_canWrite)
 {
 throw Error.GetWriteNotSupported();
Expand Down

99 changes: 0 additions & 99 deletions
src/libraries/System.Console/tests/ConsoleStreamTests.cs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
src/libraries/System.Console/tests/Helpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,8 @@
using System.Text;
using Xunit;

static class Helpers
class Helpers
{
 public static bool IsConsoleInSupported =>
 !PlatformDetection.IsAndroid && !PlatformDetection.IsiOS && !PlatformDetection.IsMacCatalyst && !PlatformDetection.IstvOS && !PlatformDetection.IsBrowser;

 public static void SetAndReadHelper(Action<TextWriter> setHelper, Func<TextWriter> getHelper, Func<StreamReader, string> readHelper)
 {
 const string TestString = "Test";
Expand Down

7 changes: 7 additions & 0 deletions
src/libraries/System.Console/tests/ReadAndWrite.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,13 @@ public static void WriteOverloads()
 }
 }

 [Fact]
 public static void WriteToOutputStream_EmptyArray()
 {
 Stream outStream = Console.OpenStandardOutput();
 outStream.Write(new byte[] { }, 0, 0);
 }

 [Fact]
 [OuterLoop]
 public static void WriteOverloadsToRealConsole()
Expand Down

6 changes: 4 additions & 2 deletions
src/libraries/System.Console/tests/SetIn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,8 @@
//
public class SetIn
{
 [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
 [Fact]
 [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
 public static void SetInThrowsOnNull()
 {
 TextReader savedIn = Console.In;
Expand All@@ -24,7 +25,8 @@ public static void SetInThrowsOnNull()
 }
 }

 [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
 [Fact]
 [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
 public static void SetInReadLine()
 {
 const string TextStringFormat = "Test {0}";
Expand Down

5 changes: 2 additions & 3 deletions
src/libraries/System.Console/tests/System.Console.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="CancelKeyPress.cs" />
 <Compile Include="ConsoleStreamTests.cs" />
 <Compile Include="Helpers.cs" />
 <Compile Include="ReadAndWrite.cs" />
 <Compile Include="ConsoleKeyInfoTests.cs" />
Expand DownExpand Up@@ -44,8 +43,8 @@
 </ItemGroup>
 <ItemGroup>
 <Content Include="$(MSBuildThisFileDirectory)TestData\**\*"
Link="%(RecursiveDir)%(Filename)%(Extension)"
CopyToOutputDirectory="PreserveNewest" />
 Link="%(RecursiveDir)%(Filename)%(Extension)"
 CopyToOutputDirectory="PreserveNewest" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="ConsoleEncoding.Windows.cs" />
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Revert "Override ReadAsync and WriteAsync methods on ConsoleStream." by stephentoub · Pull Request #77360 · dotnet/runtime · GitHub
Skip to content
Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."#77360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 1 commit into

from

Oct 24, 2022
 Merged


Revert "Override ReadAsync and WriteAsync methods on ConsoleStream."
#77360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 0 additions & 88 deletions
src/libraries/System.Console/src/System/IO/ConsoleStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;

namespace System.IO
{
Expand All@@ -30,46 +28,6 @@ public override void Write(byte[] buffer, int offset, int count)

 public override void WriteByte(byte value) => Write(new ReadOnlySpan<byte>(in value));

 public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
 {
 ValidateWrite(buffer, offset, count);

 if (cancellationToken.IsCancellationRequested)
 {
 return Task.FromCanceled(cancellationToken);
 }

 try
 {
 Write(new ReadOnlySpan<byte>(buffer, offset, count));
 return Task.CompletedTask;
 }
 catch (Exception ex)
 {
 return Task.FromException(ex);
 }
 }

 public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
 {
 ValidateCanWrite();

 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled(cancellationToken);
 }

 try
 {
 Write(buffer.Span);
 return ValueTask.CompletedTask;
 }
 catch (Exception ex)
 {
 return ValueTask.FromException(ex);
 }
 }

 public override int Read(byte[] buffer, int offset, int count)
 {
 ValidateRead(buffer, offset, count);
Expand All@@ -83,44 +41,6 @@ public override int ReadByte()
 return result != 0 ? b : -1;
 }

 public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
 {
 ValidateRead(buffer, offset, count);

 if (cancellationToken.IsCancellationRequested)
 {
 return Task.FromCanceled<int>(cancellationToken);
 }

 try
 {
 return Task.FromResult(Read(new Span<byte>(buffer, offset, count)));
 }
 catch (Exception exception)
 {
 return Task.FromException<int>(exception);
 }
 }

 public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
 {
 ValidateCanRead();

 if (cancellationToken.IsCancellationRequested)
 {
 return ValueTask.FromCanceled<int>(cancellationToken);
 }

 try
 {
 return ValueTask.FromResult(Read(buffer.Span));
 }
 catch (Exception exception)
 {
 return ValueTask.FromException<int>(exception);
 }
 }

 protected override void Dispose(bool disposing)
 {
 _canRead = false;
Expand DownExpand Up@@ -151,11 +71,7 @@ public override void Flush() { }
 protected void ValidateRead(byte[] buffer, int offset, int count)
 {
 ValidateBufferArguments(buffer, offset, count);
 ValidateCanRead();
 }

 private void ValidateCanRead()
 {
 if (!_canRead)
 {
 throw Error.GetReadNotSupported();
Expand All@@ -165,11 +81,7 @@ private void ValidateCanRead()
 protected void ValidateWrite(byte[] buffer, int offset, int count)
 {
 ValidateBufferArguments(buffer, offset, count);
 ValidateCanWrite();
 }

 private void ValidateCanWrite()
 {
 if (!_canWrite)
 {
 throw Error.GetWriteNotSupported();
Expand Down

99 changes: 0 additions & 99 deletions
src/libraries/System.Console/tests/ConsoleStreamTests.cs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
src/libraries/System.Console/tests/Helpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,8 @@
using System.Text;
using Xunit;

static class Helpers
class Helpers
{
 public static bool IsConsoleInSupported =>
 !PlatformDetection.IsAndroid && !PlatformDetection.IsiOS && !PlatformDetection.IsMacCatalyst && !PlatformDetection.IstvOS && !PlatformDetection.IsBrowser;

 public static void SetAndReadHelper(Action<TextWriter> setHelper, Func<TextWriter> getHelper, Func<StreamReader, string> readHelper)
 {
 const string TestString = "Test";
Expand Down

7 changes: 7 additions & 0 deletions
src/libraries/System.Console/tests/ReadAndWrite.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,13 @@ public static void WriteOverloads()
 }
 }

 [Fact]
 public static void WriteToOutputStream_EmptyArray()
 {
 Stream outStream = Console.OpenStandardOutput();
 outStream.Write(new byte[] { }, 0, 0);
 }

 [Fact]
 [OuterLoop]
 public static void WriteOverloadsToRealConsole()
Expand Down

6 changes: 4 additions & 2 deletions
src/libraries/System.Console/tests/SetIn.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,8 @@
//
public class SetIn
{
 [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
 [Fact]
 [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
 public static void SetInThrowsOnNull()
 {
 TextReader savedIn = Console.In;
Expand All@@ -24,7 +25,8 @@ public static void SetInThrowsOnNull()
 }
 }

 [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
 [Fact]
 [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
 public static void SetInReadLine()
 {
 const string TextStringFormat = "Test {0}";
Expand Down

5 changes: 2 additions & 3 deletions
src/libraries/System.Console/tests/System.Console.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="CancelKeyPress.cs" />
 <Compile Include="ConsoleStreamTests.cs" />
 <Compile Include="Helpers.cs" />
 <Compile Include="ReadAndWrite.cs" />
 <Compile Include="ConsoleKeyInfoTests.cs" />
Expand DownExpand Up@@ -44,8 +43,8 @@
 </ItemGroup>
 <ItemGroup>
 <Content Include="$(MSBuildThisFileDirectory)TestData\**\*"
Link="%(RecursiveDir)%(Filename)%(Extension)"
CopyToOutputDirectory="PreserveNewest" />
 Link="%(RecursiveDir)%(Filename)%(Extension)"
 CopyToOutputDirectory="PreserveNewest" />
 </ItemGroup>
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="ConsoleEncoding.Windows.cs" />
Expand Down