admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix redundant iteration while splitting lines (#14851)

Browse Source
This commit is contained in:
Steve
2021-04-12 10:23:12 -07:00
committed by GitHub
parent fafc38fe5c
commit 8f5ae72f5d
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
+9 -7
View File
@@ -416,10 +416,12 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
for (int k = 0; k < lines.Length; k++)
{
if (lines[k] == null || displayCells.Length(lines[k]) <= firstLineLen)
string currentLine = lines[k];
if (currentLine == null || displayCells.Length(currentLine) <= firstLineLen)
{
// we do not need to split further, just add
retVal.Add(lines[k]);
retVal.Add(currentLine);
continue;
}
@@ -432,7 +434,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
int offset = 0; // offset into the line we are splitting
while (true)
while (offset < currentLine.Length)
{
// acquire the current active display line length (it can very from call to call)
int currentDisplayLen = accumulator.ActiveLen;
@@ -440,7 +442,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
// determine if the current tail would fit or not
// for the remaining part of the string, determine its display cell count
int currentCellsToFit = displayCells.Length(lines[k], offset);
int currentCellsToFit = displayCells.Length(currentLine, offset);
// determine if we fit into the line
int excessCells = currentCellsToFit - currentDisplayLen;
@@ -449,7 +451,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
{
// we are not at the end of the string, select a sub string
// that would fit in the remaining display length
int charactersToAdd = displayCells.GetHeadSplitLength(lines[k], offset, currentDisplayLen);
int charactersToAdd = displayCells.GetHeadSplitLength(currentLine, offset, currentDisplayLen);
if (charactersToAdd <= 0)
{
@@ -463,7 +465,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
else
{
// of the given length, add it to the accumulator
accumulator.AddLine(lines[k].Substring(offset, charactersToAdd));
accumulator.AddLine(currentLine.Substring(offset, charactersToAdd));
}
// increase the offset by the # of characters added
@@ -472,7 +474,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
else
{
// we reached the last (partial) line, we add it all
accumulator.AddLine(lines[k].Substring(offset));
accumulator.AddLine(currentLine.Substring(offset));
break;
}
}
src/System.Management.Automation/FormatAndOutput/out-console/ConsoleLineOutput.cs
+10 -3
View File
@@ -87,8 +87,15 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
internal override int Length(string str, int offset)
{
Dbg.Assert(offset >= 0, "offset >= 0");
Dbg.Assert(string.IsNullOrEmpty(str) || (offset < str.Length), "offset < str.Length");
if (string.IsNullOrEmpty(str))
{
return 0;
}
if (offset < 0 || offset >= str.Length)
{
throw PSTraceSource.NewArgumentException(nameof(offset));
}
try
{
@@ -100,7 +107,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
// we will fallback to the default value.
}
return string.IsNullOrEmpty(str) ? 0 : str.Length - offset;
return str.Length - offset;
}
internal override int Length(string str)