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 a regression in Format-Table when header label is empty (#21156)

Browse Source
This commit is contained in:
Steve Lee
2024-02-26 11:44:30 -08:00
committed by GitHub
parent 8921a7dcad
commit a880377d8a
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
+4 -1
View File
@@ -173,7 +173,10 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
ci.alignment = colHeader.alignment;
if (colHeader.label != null)
{
ci.HeaderMatchesProperty = so.Properties[colHeader.label.text] is not null;
if (colHeader.label.text != string.Empty)
{
ci.HeaderMatchesProperty = so.Properties[colHeader.label.text] is not null;
}
ci.label = this.dataBaseInfo.db.displayResourceManagerCache.GetTextTokenString(colHeader.label);
}
test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1
+49
View File
@@ -879,6 +879,55 @@ A Name B
$numDecimals | Should -Be $expectedDecimals -Because $num
}
}
It 'Works for empty column header label' {
$ps1xml = @'
<Configuration>
<ViewDefinitions>
<View>
<Name>Test.Header.Empty</Name>
<ViewSelectedBy>
<TypeName>Test.Format</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Label></Label>
<Width>4</Width>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<TableColumnItems>
<TableColumnItem>
<PropertyName>Prop</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
</ViewDefinitions>
</Configuration>
'@
$ps1xmlPath = Join-Path -Path $TestDrive -ChildPath 'empty.format.ps1xml'
Set-Content -Path $ps1xmlPath -Value $ps1xml
$object = [pscustomobject]@{Prop = '123'}
# run in own runspace so not affect global sessionstate
$ps = [powershell]::Create()
$ps.AddScript( {
param($ps1xmlPath, $object)
Update-FormatData -AppendPath $ps1xmlPath
$object.PSObject.TypeNames.Insert(0, 'Test.Format')
$object | Format-Table | Out-String
} ).AddArgument($ps1xmlPath).AddArgument($object) | Out-Null
$output = $ps.Invoke()
$expected = @"
Prop----123
"@
$output.Replace("`n","").Replace("`r","") | Should -BeExactly $expected
}
}
Describe 'Table color tests' -Tag 'CI' {