Skip to content

Add back newline for grouping with Format-Table and -Property #10653

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
anmenaga merged 2 commits into from
Oct 2, 2019
Merged

Add back newline for grouping with Format-Table and -Property #10653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d10c583
add back newline for format-table
SteveL-MSFT Sep 30, 2019
ed907a1
remove extra newline for default formatting with grouping
SteveL-MSFT Sep 30, 2019
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
3 changes: 1 addition & 2 deletions ...stem.Management.Automation/FormatAndOutput/DefaultFormatters/Certificate_format_ps1xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ internal static IEnumerable<ExtendedTypeDefinition> GetFormatData()
{
var SignatureTypes_GroupingFormat = CustomControl.Create()
.StartEntry()
.StartFrame(leftIndent: 4)
.StartFrame()
.AddText(FileSystemProviderStrings.DirectoryDisplayGrouping)
.AddScriptBlockExpressionBinding(@"split-path $_.Path")
.AddNewline()
.EndFrame()
.EndEntry()
.EndControl();
Expand Down
3 changes: 1 addition & 2 deletions ...ystem.Management.Automation/FormatAndOutput/DefaultFormatters/FileSystem_format_ps1xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ internal static IEnumerable<ExtendedTypeDefinition> GetFormatData()
{
var FileSystemTypes_GroupingFormat = CustomControl.Create()
.StartEntry()
.StartFrame(leftIndent: 4)
.StartFrame()
.AddText(FileSystemProviderStrings.DirectoryDisplayGrouping)
.AddScriptBlockExpressionBinding(@"
$_.PSParentPath.Replace(""Microsoft.PowerShell.Core\FileSystem::"", """")
")
.AddNewline()
.EndFrame()
.EndEntry()
.EndControl();
Expand Down
3 changes: 1 addition & 2 deletions ...m.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ internal static IEnumerable<ExtendedTypeDefinition> GetFormatData()
{
var AvailableModules_GroupingFormat = CustomControl.Create()
.StartEntry()
.StartFrame(leftIndent: 4)
.StartFrame()
.AddText(FileSystemProviderStrings.DirectoryDisplayGrouping)
.AddScriptBlockExpressionBinding(@"Split-Path -Parent $_.Path | ForEach-Object { if([Version]::TryParse((Split-Path $_ -Leaf), [ref]$null)) { Split-Path -Parent $_} else {$_} } | Split-Path -Parent")
.AddNewline()
.EndFrame()
.EndEntry()
.EndControl();
Expand Down
5 changes: 2 additions & 3 deletions src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Registry_format_ps1xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ internal static IEnumerable<ExtendedTypeDefinition> GetFormatData()
{
var Registry_GroupingFormat = CustomControl.Create()
.StartEntry()
.StartFrame(leftIndent: 4)
.AddText("Hive: ")
.StartFrame()
.AddText(" Hive: ")
.AddScriptBlockExpressionBinding(@"$_.PSParentPath.Replace(""Microsoft.PowerShell.Core\Registry::"", """")")
.AddNewline()
.EndFrame()
.EndEntry()
.EndControl();
Expand Down
1 change: 1 addition & 0 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 @@ -481,6 +481,7 @@ private void ProcessGroupStart(FormatMessagesContextManager.OutputContext c)
ComplexWriter writer = new ComplexWriter();
writer.Initialize(_lo, _lo.ColumnNumber);
writer.WriteObject(goc.Data.groupingEntry.formatValueList);
_lo.WriteLine(string.Empty);
}

goc.GroupStart();
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/resources/FileSystemProviderStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
<value>Cannot process the file because the file {0} was not found.</value>
</data>
<data name="DirectoryDisplayGrouping" xml:space="preserve">
<value>Directory: </value>
<value> Directory: </value>
</data>
<data name="ReadBackward_Encoding_NotSupport" xml:space="preserve">
<value>Cannot detect the encoding of the file. The specified encoding {0} is not supported when the content is read in reverse.</value>
Expand Down
2 changes: 2 additions & 0 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 @@ -399,6 +399,7 @@ Describe "Format-Custom with expression based EntrySelectedBy in a CustomControl


Entry selected by property

Name
----
testing
Expand All @@ -425,6 +426,7 @@ testing


Entry selected by ScriptBlock

Name
----
SelectScriptBlock
Expand Down