Skip to content

Fix static method invocation type inference #8018

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 8 commits into from
Oct 23, 2018
Merged

Fix static method invocation type inference #8018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4da3964
Add handling for PSMethod in TryGetTypeFromMember
SeeminglyScience Oct 13, 2018
22988e5
Add tests for member completion
SeeminglyScience Oct 13, 2018
135c432
Add missing period in static property test
SeeminglyScience Oct 13, 2018
f7d2e17
Add missed maybeWantDefaultCtor setting
SeeminglyScience Oct 13, 2018
24d86a7
Move the PSMethod check to other PSMemberInfo checks
SeeminglyScience Oct 13, 2018
21c2b1f
Remove extra whitespace in return
SeeminglyScience Oct 13, 2018
5711239
Fix constructor inference and move tests
SeeminglyScience Oct 13, 2018
388cd6a
Fix Select-Object test and add origin issue test
SeeminglyScience Oct 15, 2018
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
48 changes: 33 additions & 15 deletions 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 @@ -1603,21 +1603,7 @@ private bool TryGetTypeFromMember(
if (methodCacheEntry[0].method.Name.Equals(memberName, StringComparison.OrdinalIgnoreCase))
{
maybeWantDefaultCtor = false;
if (isInvokeMemberExpressionAst)
{
foreach (var method in methodCacheEntry.methodInformationStructures)
{
if (method.method is MethodInfo methodInfo && !methodInfo.ReturnType.ContainsGenericParameters)
{
result.Add(new PSTypeName(methodInfo.ReturnType));
}
}

return true;
}

// Accessing a method as a property, we'd return a wrapper over the method.
result.Add(new PSTypeName(typeof(PSMethod)));
AddTypesFromMethodCacheEntry(methodCacheEntry, result, isInvokeMemberExpressionAst);
return true;
}

Expand Down Expand Up @@ -1667,6 +1653,16 @@ private bool TryGetTypeFromMember(
ScriptBlock scriptBlock = null;
switch (memberInfo)
{
case PSMethod m:
{
if (m.adapterData is DotNetAdapter.MethodCacheEntry methodCacheEntry)
{
AddTypesFromMethodCacheEntry(methodCacheEntry, result, isInvokeMemberExpressionAst);
return true;
}

return false;
}
case PSProperty p:
{
result.Add(new PSTypeName(p.Value.GetType()));
Expand Down Expand Up @@ -1739,6 +1735,28 @@ private bool TryGetTypeFromMember(
return false;
}

private void AddTypesFromMethodCacheEntry(
DotNetAdapter.MethodCacheEntry methodCacheEntry,
List<PSTypeName> result,
bool isInvokeMemberExpressionAst)
{
if (isInvokeMemberExpressionAst)
{
foreach (var method in methodCacheEntry.methodInformationStructures)
{
if (method.method is MethodInfo methodInfo && !methodInfo.ReturnType.ContainsGenericParameters)
{
result.Add(new PSTypeName(methodInfo.ReturnType));
}
}

return;
}

// Accessing a method as a property, we'd return a wrapper over the method.
result.Add(new PSTypeName(typeof(PSMethod)));
}

private PSTypeName[] GetExpressionType(ExpressionAst expression, bool isStatic)
{
PSTypeName[] exprType;
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 @@ -644,6 +644,13 @@ dir -Recurse `
$res.CompletionMatches | Should -HaveCount 1
$res.CompletionMatches[0].CompletionText | Should -BeExactly "-LiteralPath"
}

It "Test member completion of a static method invocation" {
$inputStr = '[powershell]::Create().'
$res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
$res.CompletionMatches | Should -HaveCount 31
$res.CompletionMatches[0].CompletionText | Should -BeExactly "Commands"
}
}

Context "Module completion for 'using module'" {
Expand Down
8 changes: 7 additions & 1 deletion test/powershell/engine/Api/TypeInference.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,12 @@ Describe "Type inference Tests" -tags "CI" {
$res.Name | Should -Be 'System.Type'
}

It "Infers type from static member method" {
$res = [AstTypeInference]::InferTypeOf( { [powershell]::Create() }.Ast)
$res.Count | Should -Be 1
$res.Name | Should -Be 'System.Management.Automation.PowerShell'
}

It "Infers type from integer * stringliteral" {
$res = [AstTypeInference]::InferTypeOf( { 5 * "5" }.Ast)
$res.Count | Should -Be 1
Expand Down Expand Up @@ -412,7 +418,7 @@ Describe "Type inference Tests" -tags "CI" {
It "Infers typeof Select-Object when Parameter is ExcludeProperty" {
$res = [AstTypeInference]::InferTypeOf( { [io.fileinfo]::new("file") | Select-Object -ExcludeProperty *Time*, E* }.Ast)
$res.Count | Should -Be 1
$res[0].Name | Should -Be "System.Management.Automation.PSObject#Attributes:BaseName:Directory:DirectoryName:FullName:IsReadOnly:Length:LinkType:Mode:Name:Target"
$res[0].Name | Should -Be "System.Management.Automation.PSObject#Attributes:BaseName:Directory:DirectoryName:FullName:IsReadOnly:Length:LinkType:Mode:Name:Target:VersionInfo"
$names = $res[0].Members.Name
$names -contains "BaseName" | Should -BeTrue
$names -contains "Name" | Should -BeTrue
Expand Down