Skip to content

Add custom 'Selected.*' type to PSCustomObject in Select-Object only once #11548

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
iSazonov merged 2 commits into from
Jan 25, 2020
Merged

Add custom 'Selected.*' type to PSCustomObject in Select-Object only once #11548

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
d028fc8
Add custom 'Selected.*' type to PSCustomObject in Select-Object only …
iSazonov Jan 10, 2020
559ebdf
Use named argument
iSazonov Jan 10, 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
14 changes: 10 additions & 4 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/Select-Object.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ private void FilteredWriteObject(PSObject obj, List<PSNoteProperty> addedNotePro
{
if (obj != AutomationNull.Value)
{
SetPSCustomObject(obj);
SetPSCustomObject(obj, newPSObject: addedNoteProperties.Count > 0);
WriteObject(obj);
}

Expand Down Expand Up @@ -648,16 +648,22 @@ private void FilteredWriteObject(PSObject obj, List<PSNoteProperty> addedNotePro

if (isObjUnique)
{
SetPSCustomObject(obj);
SetPSCustomObject(obj, newPSObject: addedNoteProperties.Count > 0);
_uniques.Add(new UniquePSObjectHelper(obj, addedNoteProperties.Count));
}
}
}

private void SetPSCustomObject(PSObject psObj)
private void SetPSCustomObject(PSObject psObj, bool newPSObject)
{
if (psObj.ImmediateBaseObject is PSCustomObject)
psObj.TypeNames.Insert(0, "Selected." + InputObject.BaseObject.GetType().ToString());
{
var typeName = "Selected." + InputObject.BaseObject.GetType().ToString();
if (newPSObject || !psObj.TypeNames.Contains(typeName))
{
psObj.TypeNames.Insert(0, typeName);
}
}
}

private void ProcessObjectAndHandleErrors(PSObject pso)
Expand Down
22 changes: 22 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Select-Object.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.

. (Join-Path -Path $PSScriptRoot -ChildPath Test-Mocks.ps1)
Add-TestDynamicType

Expand Down Expand Up @@ -349,4 +350,25 @@ Describe "Select-Object with Property = '*'" -Tags "CI" {
$p = Get-Process -Id $pid | Select-Object -Property Process* -ExcludeProperty ProcessorAffinity -ExpandProperty Modules
$p[0].psobject.Properties.Item("ProcessorAffinity") | Should -BeNullOrEmpty
}

It "Select-Object add 'Selected.*' type only once" {
$obj = [PSCustomObject]@{ Name = 1 }

$obj.psobject.TypeNames.Count | Should -Be 2
$obj.psobject.TypeNames | Should -Not -BeLike "Selected*"

$obj = $obj | Select-Object

$obj.psobject.TypeNames.Count | Should -Be 3
$obj.psobject.TypeNames[0] | Should -BeLike "Selected*"
$obj.psobject.TypeNames[1] | Should -Not -BeLike "Selected*"
$obj.psobject.TypeNames[2] | Should -Not -BeLike "Selected*"

$obj = $obj | Select-Object

$obj.psobject.TypeNames.Count | Should -Be 3
$obj.psobject.TypeNames[0] | Should -BeLike "Selected*"
$obj.psobject.TypeNames[1] | Should -Not -BeLike "Selected*"
$obj.psobject.TypeNames[2] | Should -Not -BeLike "Selected*"
}
}