mirrors/PowerShell
0
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell.git synced 2024-11-23 09:43:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Treat lone CR as a line ending.

Browse Source
This commit is contained in:
MartinGC94 2023-08-13 23:17:29 +02:00
parent c62c0fb340
commit 66f7b6c9b5
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/System.Management.Automation/engine/parser/tokenizer.cs
View File

@ -2625,9 +2625,9 @@ namespace System.Management.Automation.Language
}
// Return early if the required line break after the header is missing.
if (currentChar == '\r' && PeekChar() == '\n')
if (currentChar == '\r')
{
SkipChar();
NormalizeCRLF(currentChar);
}
else if (currentChar != '\n')
{
@ -2699,7 +2699,7 @@ namespace System.Management.Automation.Language
int whitespaceCount = sb.Length - lineStartIndex;
int scriptLineIndex = _currentIndex - whitespaceCount - 1;
bool whitespaceOnly = currentChar == '\n' || (currentChar == '\r' && PeekChar() == '\n');
bool whitespaceOnly = currentChar is '\n' or '\r';
lineInfoList.Add(new LineInfo(lineStartIndex, scriptLineIndex, whitespaceCount, whitespaceOnly));
if (expandableString)
{
@ -2754,18 +2754,17 @@ namespace System.Management.Automation.Language
}
}
if (currentChar == '\r' && PeekChar() == '\n')
{
SkipChar();
newLineCharCount = 2;
AppendCharToHereStringBuilders(expandableString, currentChar, sb, formatSb);
AppendCharToHereStringBuilders(expandableString, '\n', sb, formatSb);
ProcessStartOfNewLine();
}
else if (currentChar == '\n')
if (currentChar is '\r' or '\n')
{
newLineCharCount = 1;
AppendCharToHereStringBuilders(expandableString, currentChar, sb, formatSb);
if (currentChar == '\r' && PeekChar() == '\n')
{
newLineCharCount = 2;
SkipChar();
AppendCharToHereStringBuilders(expandableString, '\n', sb, formatSb);
}
ProcessStartOfNewLine();
}
else if ((expandableString && currentChar.IsDoubleQuote())