Skip to content

Remove extra line before formatting group #12163

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
Travis Plunk (TravisEz13) merged 4 commits into from
May 28, 2020
Merged

Remove extra line before formatting group #12163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7938b24
Remove extra line before formatting group
iSazonov Mar 20, 2020
cb68726
Remove commented code
iSazonov Mar 20, 2020
71355f4
Fix CodeFactor issue
iSazonov Mar 20, 2020
76b436b
Modify tests
iSazonov Mar 20, 2020
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
20 changes: 20 additions & 0 deletions src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,9 @@ private void ProcessObject(PSObject so)
}
Comment thread
iSazonov marked this conversation as resolved.
Outdated
Comment thread
iSazonov marked this conversation as resolved.
Outdated
Comment thread
iSazonov marked this conversation as resolved.
Outdated
Comment thread
iSazonov marked this conversation as resolved.
Outdated
else if (transition == GroupTransition.startNew)
{
// Add newline before each group except first
WriteNewLineObject();

// double transition
PopGroup(); // exit the current one
PushGroup(so); // start a sibling group
Expand All @@ -273,6 +276,23 @@ private void ProcessObject(PSObject so)
}
}

private void WriteNewLineObject()
{
FormatEntryData fed = new FormatEntryData();
fed.outOfBand = true;
Comment thread
SteveL-MSFT marked this conversation as resolved.

ComplexViewEntry cve = new ComplexViewEntry();
FormatEntry fe = new FormatEntry();
cve.formatValueList.Add(fe);

// Formating system writes newline before each object
// so no need to add newline here like:
// fe.formatValueList.Add(new FormatNewLine());
fed.formatEntryInfo = cve;

this.WriteObject(fed);
}

private bool ShouldProcessOutOfBand
{
get
Expand Down
2 changes: 0 additions & 2 deletions src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,6 @@ private void ProcessGroupStart(FormatMessagesContextManager.OutputContext c)

if (goc.Data.groupingEntry != null)
{
_lo.WriteLine(string.Empty);

ComplexWriter writer = new ComplexWriter();
writer.Initialize(_lo, _lo.ColumnNumber);
writer.WriteObject(goc.Data.groupingEntry.formatValueList);
Expand Down
2 changes: 0 additions & 2 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Custom.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,6 @@ Describe "Format-Custom with expression based EntrySelectedBy in a CustomControl
$ps.Streams.Error.Clear()
$expectedOutput = @'


Entry selected by property

Name
Expand All @@ -424,7 +423,6 @@ testing
$ps.Streams.Error.Clear()
$expectedOutput = @'


Entry selected by ScriptBlock

Name
Expand Down