From 213ff96e6d04d296f38eead18d82b1bb2d94809d Mon Sep 17 00:00:00 2001 From: Ilya Date: Fri, 19 Apr 2019 05:29:36 +0500 Subject: [PATCH] Use `Environment.NewLine` for new lines in `ConsoleHost` code (#9392) --- .../host/msh/CommandLineParameterParser.cs | 2 +- .../host/msh/ConsoleControl.cs | 4 ++-- .../host/msh/ConsoleHostUserInterface.cs | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs index c6deb0e0d..a55de1757 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs +++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs @@ -1043,7 +1043,7 @@ namespace Microsoft.PowerShell foreach (string s in Enum.GetNames(typeof(Serialization.DataFormat))) { sb.Append(s); - sb.Append(ConsoleHostUserInterface.Crlf); + sb.Append(Environment.NewLine); } ++i; diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs index f925dbd7f..6ae6eea1e 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs +++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs @@ -2562,7 +2562,7 @@ namespace Microsoft.PowerShell { if (newLine) { - WriteConsole(consoleHandle, ConsoleHostUserInterface.Crlf); + WriteConsole(consoleHandle, Environment.NewLine); } return; @@ -2591,7 +2591,7 @@ namespace Microsoft.PowerShell if (newLine) { - var endOfLine = ConsoleHostUserInterface.Crlf.AsSpan(); + var endOfLine = Environment.NewLine.AsSpan(); var endOfLineLength = endOfLine.Length; Span outBufferLine = stackalloc char[outBuffer.Length + endOfLineLength]; outBuffer.CopyTo(outBufferLine); diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs index 53431f42d..4a575da7f 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs +++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs @@ -712,7 +712,7 @@ namespace Microsoft.PowerShell if (newLine) { - _parent.OutputSerializer.Serialize(Crlf); + _parent.OutputSerializer.Serialize(Environment.NewLine); } } else @@ -1152,7 +1152,7 @@ namespace Microsoft.PowerShell sb.Append(s); if (++count != lines.Count) { - sb.Append(Crlf); + sb.Append(Environment.NewLine); } } @@ -1344,7 +1344,7 @@ namespace Microsoft.PowerShell { Dbg.Assert(writer == _parent.ErrorSerializer.textWriter, "writers should be the same"); - _parent.ErrorSerializer.Serialize(value + Crlf); + _parent.ErrorSerializer.Serialize(value + Environment.NewLine); } else { @@ -1612,7 +1612,7 @@ namespace Microsoft.PowerShell #if UNIX if (keyInfo.Key == ConsoleKey.Enter) #else - if (s.EndsWith(Crlf, StringComparison.Ordinal)) + if (s.EndsWith(Environment.NewLine, StringComparison.Ordinal)) #endif { result = ReadLineResult.endedOnEnter; @@ -1620,7 +1620,7 @@ namespace Microsoft.PowerShell // We're intercepting characters, so we need to echo the newline Console.Out.WriteLine(); #else - s = s.Remove(s.Length - Crlf.Length); + s = s.Remove(s.Length - Environment.NewLine.Length); #endif break; }