Skip to content

Conditionally mark getter/setter implementations virtual in generated classes #8303

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
Nov 30, 2018
Merged

Conditionally mark getter/setter implementations virtual in generated classes #8303

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
0d9837a
Conditionally mark getter/setter implementations virtual
IISResetMe Nov 17, 2018
4c6b908
Fix codefactor issues in ShouldImplementProperty
IISResetMe Nov 21, 2018
9edab80
Add inheritance test for interface properties
IISResetMe Nov 21, 2018
eda8595
Rename interface in interface property test
IISResetMe Nov 21, 2018
da79ff9
Avoid reserved keyword in variable name interface
IISResetMe Nov 21, 2018
699f56c
Emit test class during interface inheritance test
IISResetMe Nov 21, 2018
84cfe9c
Fix type check in interface inheritance test
IISResetMe Nov 21, 2018
f8e9e68
Fix interface inheritance test (again)
IISResetMe Nov 21, 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
18 changes: 18 additions & 0 deletions src/System.Management.Automation/engine/parser/PSType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,19 @@ private Type GetBaseTypes(Parser parser, TypeDefinitionAst typeDefinitionAst, ou
return baseClass ?? typeof(object);
}

private bool ShouldImplementProperty(string name, Type type)
{
foreach (var interfaceType in _typeBuilder.GetInterfaces())
{
if (interfaceType.GetProperty(name, type) != null)
{
return true;
}
}

return false;
}

public void DefineMembers()
{
// If user didn't provide any instance ctors or static ctor we will generate default ctor or static ctor respectively.
Expand Down Expand Up @@ -576,6 +589,11 @@ private PropertyBuilder EmitPropertyIl(PropertyMemberAst propertyMemberAst, Type
// The property set and property get methods require a special set of attributes.
var getSetAttributes = Reflection.MethodAttributes.SpecialName | Reflection.MethodAttributes.HideBySig;
getSetAttributes |= propertyMemberAst.IsPublic ? Reflection.MethodAttributes.Public : Reflection.MethodAttributes.Private;
if (ShouldImplementProperty(propertyMemberAst.Name, type))
{
getSetAttributes |= Reflection.MethodAttributes.Virtual;
}

if (propertyMemberAst.IsStatic)
{
backingFieldAttributes |= FieldAttributes.Static;
Expand Down
8 changes: 8 additions & 0 deletions test/powershell/Language/Classes/scripting.Classes.inheritance.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@ Describe 'Classes inheritance syntax' -Tags "CI" {
[MyComparable].GetInterface("System.IComparable") | Should -Not -BeNullOrEmpty
}

It 'can implement .NET interface properties' {
Add-Type -TypeDefinition 'public interface InterfaceWithProperty { int Integer { get; set; } }'
$C1 = Invoke-Expression 'class ClassWithInterfaceProperty : InterfaceWithProperty { [int]$Integer } [ClassWithInterfaceProperty]::new()'
$getter = $C1.GetType().GetMember('get_Integer')
$getter.ReturnType.FullName | Should -Be System.Int32
$getter.Attributes -band [System.Reflection.MethodAttributes]::Virtual |Should -Be ([System.Reflection.MethodAttributes]::Virtual)
}

It 'allows use of defined later type as a property type' {
class A { static [B]$b }
class B : A {}
Expand Down