Skip to content

Fix completion for PSCustomObject variable properties #18682

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
daxian-dbw merged 4 commits into from
Mar 14, 2023
Merged

Fix completion for PSCustomObject variable properties #18682

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
26015fc
Fix completion for PSCustomObject variables
MartinGC94 Nov 30, 2022
7deed87
Use PSObject cast.
MartinGC94 Dec 20, 2022
c6e7f25
Use StringComparison.Ordinal
MartinGC94 Dec 21, 2022
df197ef
Merge branch 'PowerShell:master' into FixCompletionForPsObjectVarProp…
MartinGC94 Mar 1, 2023
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
24 changes: 23 additions & 1 deletion src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,29 @@ private static bool TryGetRepresentativeTypeNameFromValue(object value, out PSTy
value = PSObject.Base(value);
if (value != null)
{
type = new PSTypeName(value.GetType());
var typeObject = value.GetType();

if (typeObject.FullName.Equals("System.Management.Automation.PSObject", StringComparison.Ordinal))
{
var psobjectPropertyList = new List<PSMemberNameAndType>();
foreach (var property in ((PSObject)value).Properties)
{
if (property.IsHidden)
{
continue;
}

var propertyTypeName = new PSTypeName(property.TypeNameOfValue);
psobjectPropertyList.Add(new PSMemberNameAndType(property.Name, propertyTypeName, property.Value));
}

type = PSSyntheticTypeName.Create(typeObject, psobjectPropertyList);
}
else
{
type = new PSTypeName(typeObject);
}

return true;
}
}
Expand Down
7 changes: 7 additions & 0 deletions test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,13 @@ ConstructorTestClass(int i, bool b)
$res.CompletionMatches[0].CompletionText | Should -BeExactly 'Length'
}

It 'Should complete psobject members for variable' {
$TestVar = Get-Command Get-Command | Select-Object CommandType
$res = TabExpansion2 -inputScript '$TestVar | ForEach-Object {$_.commandtype'
$res | Should -HaveCount 1
$res.CompletionMatches[0].CompletionText | Should -BeExactly 'CommandType'
}

Context "Format cmdlet's View paramter completion" {
BeforeAll {
$viewDefinition = @'
Expand Down