Remove .NET 6 Console Key Parser (#77977)

adamsitnik · web-flow · commit 1b27edadda1e · 2022-11-08T15:09:54.000+01:00
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.ReadStdinUnbuffered.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.ReadStdinUnbuffered.cs
@@ -12,7 +12,7 @@ internal static partial class Sys
         internal static unsafe partial int ReadStdin(byte* buffer, int bufferSize);
 
         [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_InitializeConsoleBeforeRead")]
-        internal static partial void InitializeConsoleBeforeRead([MarshalAs(UnmanagedType.Bool)] bool distinguishNewLines, byte minChars = 1, byte decisecondsTimeout = 0);
+        internal static partial void InitializeConsoleBeforeRead(byte minChars = 1, byte decisecondsTimeout = 0);
 
         [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_UninitializeConsoleAfterRead")]
         internal static partial void UninitializeConsoleAfterRead();
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.SetSignalForBreak.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.SetSignalForBreak.cs
@@ -12,6 +12,6 @@ internal static partial class Sys
         internal static partial int GetSignalForBreak();
 
         [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_SetSignalForBreak")]
-        internal static partial int SetSignalForBreak(int signalForBreak, [MarshalAs(UnmanagedType.Bool)] bool distinguishNewLines);
+        internal static partial int SetSignalForBreak(int signalForBreak);
     }
 }
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.StdinReady.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.StdinReady.cs
@@ -9,6 +9,6 @@ internal static partial class Sys
     {
         [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_StdinReady")]
         [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool StdinReady([MarshalAs(UnmanagedType.Bool)] bool distinguishNewLines);
+        internal static partial bool StdinReady();
     }
 }
diff --git a/src/libraries/Common/src/System/Console/ConsoleUtils.cs b/src/libraries/Common/src/System/Console/ConsoleUtils.cs
@@ -1,17 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-
 namespace System
 {
     internal static partial class ConsoleUtils
     {
         /// <summary>Whether to output ansi color strings.</summary>
         private static volatile int s_emitAnsiColorCodes = -1;
 
-        private static volatile int s_useNet6KeyParser = -1;
-
         /// <summary>Get whether to emit ANSI color codes.</summary>
         public static bool EmitAnsiColorCodes
         {
@@ -51,31 +47,5 @@ public static bool EmitAnsiColorCodes
                 return enabled;
             }
         }
-
-        internal static bool UseNet6KeyParser
-        {
-            get
-            {
-                int useNet6KeyParser = s_useNet6KeyParser;
-
-                if (useNet6KeyParser == -1)
-                {
-                    useNet6KeyParser = s_useNet6KeyParser = GetNet6CompatReadKeySetting() ? 1 : 0;
-                }
-
-                return useNet6KeyParser == 1;
-
-                static bool GetNet6CompatReadKeySetting()
-                {
-                    if (AppContext.TryGetSwitch("System.Console.UseNet6CompatReadKey", out bool fileConfig))
-                    {
-                        return fileConfig;
-                    }
-
-                    string? envVar = Environment.GetEnvironmentVariable("DOTNET_SYSTEM_CONSOLE_USENET6COMPATREADKEY");
-                    return envVar is not null && (envVar == "1" || envVar.Equals("true", StringComparison.OrdinalIgnoreCase));
-                }
-            }
-        }
     }
 }
diff --git a/src/libraries/System.Console/src/System.Console.csproj b/src/libraries/System.Console/src/System.Console.csproj
@@ -169,7 +169,6 @@
     <Compile Include="System\IO\StdInReader.cs" />
     <Compile Include="System\IO\SyncTextReader.Unix.cs" />
     <Compile Include="System\IO\KeyParser.cs" />
-    <Compile Include="System\IO\Net6KeyParser.cs" />
     <Compile Include="$(CoreLibSharedDir)System\IO\PersistedFiles.Unix.cs"
              Link="Common\System\IO\PersistedFiles.Unix.cs" />
     <Compile Include="$(CoreLibSharedDir)System\IO\PersistedFiles.Names.Unix.cs"
diff --git a/src/libraries/System.Console/src/System/ConsolePal.Unix.cs b/src/libraries/System.Console/src/System/ConsolePal.Unix.cs
@@ -153,7 +153,7 @@ public static bool TreatControlCAsInput
                 if (!Console.IsInputRedirected)
                 {
                     EnsureConsoleInitialized();
-                    if (Interop.Sys.SetSignalForBreak(Convert.ToInt32(!value), distinguishNewLines: !ConsoleUtils.UseNet6KeyParser) == 0)
+                    if (Interop.Sys.SetSignalForBreak(Convert.ToInt32(!value)) == 0)
                         throw Interop.GetExceptionForIoErrno(Interop.Sys.GetLastErrorInfo());
                 }
             }
@@ -481,7 +481,7 @@ internal static bool TryGetCursorPosition(out int left, out int top, bool reinit
                 // involved in reading/writing, such as when accessing a remote system. We also extend
                 // the timeout on the very first request to 15 seconds, to account for potential latency
                 // before we know if we will receive a response.
-                Interop.Sys.InitializeConsoleBeforeRead(distinguishNewLines: !ConsoleUtils.UseNet6KeyParser, minChars: (byte)(s_everReceivedCursorPositionResponse ? 1 : 0), decisecondsTimeout: (byte)(s_firstCursorPositionRequest ? 100 : 10));
+                Interop.Sys.InitializeConsoleBeforeRead(minChars: (byte)(s_everReceivedCursorPositionResponse ? 1 : 0), decisecondsTimeout: (byte)(s_firstCursorPositionRequest ? 100 : 10));
                 try
                 {
                     // Write out the cursor position report request.
@@ -556,7 +556,7 @@ internal static bool TryGetCursorPosition(out int left, out int top, bool reinit
                 {
                     if (reinitializeForRead)
                     {
-                        Interop.Sys.InitializeConsoleBeforeRead(distinguishNewLines: !ConsoleUtils.UseNet6KeyParser);
+                        Interop.Sys.InitializeConsoleBeforeRead();
                     }
                     else
                     {
diff --git a/src/libraries/System.Console/src/System/IO/Net6KeyParser.cs b/src/libraries/System.Console/src/System/IO/Net6KeyParser.cs
diff --git a/src/libraries/System.Console/src/System/IO/StdInReader.cs b/src/libraries/System.Console/src/System/IO/StdInReader.cs
@@ -151,7 +151,7 @@ private bool ReadLineCore(bool consumeKeys)
            // Don't carry over chars from previous ReadLine call.
             _readLineSB.Clear();
 
-            Interop.Sys.InitializeConsoleBeforeRead(distinguishNewLines: !ConsoleUtils.UseNet6KeyParser);
+            Interop.Sys.InitializeConsoleBeforeRead();
             try
             {
                 // Read key-by-key until we've read a line.
@@ -327,8 +327,7 @@ private unsafe ConsoleKeyInfo ReadKey()
         {
             Debug.Assert(_availableKeys.Count == 0);
 
-            bool useNet6KeyParser = ConsoleUtils.UseNet6KeyParser;
-            Interop.Sys.InitializeConsoleBeforeRead(distinguishNewLines: !useNet6KeyParser);
+            Interop.Sys.InitializeConsoleBeforeRead();
             try
             {
                 if (IsUnprocessedBufferEmpty())
@@ -354,9 +353,7 @@ private unsafe ConsoleKeyInfo ReadKey()
                     }
                 }
 
-                return useNet6KeyParser
-                    ? Net6KeyParser.Parse(_unprocessedBufferToBeRead, ConsolePal.TerminalFormatStringsInstance, ConsolePal.s_posixDisableValue, ConsolePal.s_veraseCharacter, ref _startIndex, _endIndex)
-                    : KeyParser.Parse(_unprocessedBufferToBeRead, ConsolePal.TerminalFormatStringsInstance, ConsolePal.s_posixDisableValue, ConsolePal.s_veraseCharacter, ref _startIndex, _endIndex);
+                return KeyParser.Parse(_unprocessedBufferToBeRead, ConsolePal.TerminalFormatStringsInstance, ConsolePal.s_posixDisableValue, ConsolePal.s_veraseCharacter, ref _startIndex, _endIndex);
             }
             finally
             {
@@ -365,6 +362,6 @@ private unsafe ConsoleKeyInfo ReadKey()
         }
 
         /// <summary>Gets whether there's input waiting on stdin.</summary>
-        internal static bool StdinReady => Interop.Sys.StdinReady(distinguishNewLines: !ConsoleUtils.UseNet6KeyParser);
+        internal static bool StdinReady => Interop.Sys.StdinReady();
     }
 }
diff --git a/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/libraries/System.Console/tests/System.Console.Tests.csproj
@@ -38,7 +38,6 @@
     <Compile Include="..\src\System\TermInfo.Database.cs" Link="src\System\TermInfo.Database.cs" />
     <Compile Include="..\src\System\TerminalFormatStrings.cs" Link="src\System\TerminalFormatStrings.cs" />
     <Compile Include="..\src\System\IO\KeyParser.cs" Link="src\System\IO\KeyParser.cs" />
-    <Compile Include="..\src\System\IO\Net6KeyParser.cs" Link="src\System\IO\Net6KeyParser.cs" />
     <Compile Include="$(CommonPath)System\Text\ConsoleEncoding.cs" Link="src\System\Text\ConsoleEncoding.cs" />
     <Compile Include="KeyParserTests.cs" />
   </ItemGroup>
diff --git a/src/native/libs/System.Native/pal_console.c b/src/native/libs/System.Native/pal_console.c
diff --git a/src/native/libs/System.Native/pal_console.h b/src/native/libs/System.Native/pal_console.h

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ internal static partial class Sys`
`12`	`12`	`internal static partial int GetSignalForBreak();`
`13`	`13`
`14`	`14`	`[LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_SetSignalForBreak")]`
`15`		`- internal static partial int SetSignalForBreak(int signalForBreak, [MarshalAs(UnmanagedType.Bool)] bool distinguishNewLines);`
	`15`	`+ internal static partial int SetSignalForBreak(int signalForBreak);`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ internal static partial class Sys`
`9`	`9`	`{`
`10`	`10`	`[LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_StdinReady")]`
`11`	`11`	`[return: MarshalAs(UnmanagedType.Bool)]`
`12`		`- internal static partial bool StdinReady([MarshalAs(UnmanagedType.Bool)] bool distinguishNewLines);`
	`12`	`+ internal static partial bool StdinReady();`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public static bool TreatControlCAsInput`
`153`	`153`	`if (!Console.IsInputRedirected)`
`154`	`154`	`{`
`155`	`155`	`EnsureConsoleInitialized();`
`156`		`- if (Interop.Sys.SetSignalForBreak(Convert.ToInt32(!value), distinguishNewLines: !ConsoleUtils.UseNet6KeyParser) == 0)`
	`156`	`+ if (Interop.Sys.SetSignalForBreak(Convert.ToInt32(!value)) == 0)`
`157`	`157`	`throw Interop.GetExceptionForIoErrno(Interop.Sys.GetLastErrorInfo());`
`158`	`158`	`}`
`159`	`159`	`}`
`@@ -481,7 +481,7 @@ internal static bool TryGetCursorPosition(out int left, out int top, bool reinit`
`481`	`481`	`// involved in reading/writing, such as when accessing a remote system. We also extend`
`482`	`482`	`// the timeout on the very first request to 15 seconds, to account for potential latency`
`483`	`483`	`// before we know if we will receive a response.`
`484`		`- Interop.Sys.InitializeConsoleBeforeRead(distinguishNewLines: !ConsoleUtils.UseNet6KeyParser, minChars: (byte)(s_everReceivedCursorPositionResponse ? 1 : 0), decisecondsTimeout: (byte)(s_firstCursorPositionRequest ? 100 : 10));`
	`484`	`+ Interop.Sys.InitializeConsoleBeforeRead(minChars: (byte)(s_everReceivedCursorPositionResponse ? 1 : 0), decisecondsTimeout: (byte)(s_firstCursorPositionRequest ? 100 : 10));`
`485`	`485`	`try`
`486`	`486`	`{`
`487`	`487`	`// Write out the cursor position report request.`
`@@ -556,7 +556,7 @@ internal static bool TryGetCursorPosition(out int left, out int top, bool reinit`
`556`	`556`	`{`
`557`	`557`	`if (reinitializeForRead)`
`558`	`558`	`{`
`559`		`- Interop.Sys.InitializeConsoleBeforeRead(distinguishNewLines: !ConsoleUtils.UseNet6KeyParser);`
	`559`	`+ Interop.Sys.InitializeConsoleBeforeRead();`
`560`	`560`	`}`
`561`	`561`	`else`
`562`	`562`	`{`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ private bool ReadLineCore(bool consumeKeys)`
`151`	`151`	`// Don't carry over chars from previous ReadLine call.`
`152`	`152`	`_readLineSB.Clear();`
`153`	`153`
`154`		`- Interop.Sys.InitializeConsoleBeforeRead(distinguishNewLines: !ConsoleUtils.UseNet6KeyParser);`
	`154`	`+ Interop.Sys.InitializeConsoleBeforeRead();`
`155`	`155`	`try`
`156`	`156`	`{`
`157`	`157`	`// Read key-by-key until we've read a line.`
`@@ -327,8 +327,7 @@ private unsafe ConsoleKeyInfo ReadKey()`
`327`	`327`	`{`
`328`	`328`	`Debug.Assert(_availableKeys.Count == 0);`
`329`	`329`
`330`		`- bool useNet6KeyParser = ConsoleUtils.UseNet6KeyParser;`
`331`		`- Interop.Sys.InitializeConsoleBeforeRead(distinguishNewLines: !useNet6KeyParser);`
	`330`	`+ Interop.Sys.InitializeConsoleBeforeRead();`
`332`	`331`	`try`
`333`	`332`	`{`
`334`	`333`	`if (IsUnprocessedBufferEmpty())`
`@@ -354,9 +353,7 @@ private unsafe ConsoleKeyInfo ReadKey()`
`354`	`353`	`}`
`355`	`354`	`}`
`356`	`355`
`357`		`- return useNet6KeyParser`
`358`		`- ? Net6KeyParser.Parse(_unprocessedBufferToBeRead, ConsolePal.TerminalFormatStringsInstance, ConsolePal.s_posixDisableValue, ConsolePal.s_veraseCharacter, ref _startIndex, _endIndex)`
`359`		`- : KeyParser.Parse(_unprocessedBufferToBeRead, ConsolePal.TerminalFormatStringsInstance, ConsolePal.s_posixDisableValue, ConsolePal.s_veraseCharacter, ref _startIndex, _endIndex);`
	`356`	`+ return KeyParser.Parse(_unprocessedBufferToBeRead, ConsolePal.TerminalFormatStringsInstance, ConsolePal.s_posixDisableValue, ConsolePal.s_veraseCharacter, ref _startIndex, _endIndex);`
`360`	`357`	`}`
`361`	`358`	`finally`
`362`	`359`	`{`
`@@ -365,6 +362,6 @@ private unsafe ConsoleKeyInfo ReadKey()`
`365`	`362`	`}`
`366`	`363`
`367`	`364`	`/// <summary>Gets whether there's input waiting on stdin.</summary>`
`368`		`- internal static bool StdinReady => Interop.Sys.StdinReady(distinguishNewLines: !ConsoleUtils.UseNet6KeyParser);`
	`365`	`+ internal static bool StdinReady => Interop.Sys.StdinReady();`
`369`	`366`	`}`
`370`	`367`	`}`