AMT-Cheif
/
Stylet
mirror of https://github.com/AMT-Cheif/Stylet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a corner-case with unbound generic registrations

This commit is contained in:
Antony Male 2014-02-13 13:34:26 +00:00
parent 0005e2b194
commit e71a1f0dc7
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Stylet/StyletIoC.cs
View File

@ -183,10 +183,7 @@ namespace Stylet
private void TryEnsureGenericRegistrationCreated(Type type, string key) private void TryEnsureGenericRegistrationCreated(Type type, string key)
{ {
if (this.registrations.ContainsKey(type) || !type.IsGenericType) if (this.registrations.ContainsKey(type) || !type.IsGenericType || type.GenericTypeArguments.Length == 0)
return;
if (type.GenericTypeArguments.Length == 0)
return; return;
Type unboundGenericType = type.GetGenericTypeDefinition(); Type unboundGenericType = type.GetGenericTypeDefinition();
@ -200,7 +197,17 @@ namespace Stylet
if (unboundGeneric == null) if (unboundGeneric == null)
break; break;
Type newType = unboundGeneric.Type.MakeGenericType(type.GenericTypeArguments); // Consider this scenario:
// interface IC<T, U> { } class C<T, U> : IC<U, T> { }
// Then they ask for an IC<int, bool>. We need to give them a C<bool, int>
// Search the ancestry of C for an IC (called implOfUnboundGenericType), then create a mapping which says that
// U is a bool and T is an int by comparing this against 'type' - the IC<T, U> that's registered as the service
// Then use this when making the type for C
var implOfUnboundGenericType = unboundGeneric.Type.GetBaseTypesAndInterfaces().Single(x => x.Name == unboundGenericType.Name);
var mapping = implOfUnboundGenericType.GenericTypeArguments.Zip(type.GenericTypeArguments, (n, t) => new { Type = t, Name = n });
Type newType = unboundGeneric.Type.MakeGenericType(unboundGeneric.Type.GetTypeInfo().GenericTypeParameters.Select(x => mapping.Single(t => t.Name.Name == x.Name).Type).ToArray());
if (!type.IsAssignableFrom(newType)) if (!type.IsAssignableFrom(newType))
break; break;

1
StyletUnitTests/StyletUnitTests.csproj
View File

@ -46,6 +46,7 @@
<ItemGroup> <ItemGroup>
<Compile Include="BindableCollectionTests.cs" /> <Compile Include="BindableCollectionTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="StyletIoCConstructorInjectionTests.cs" />
<Compile Include="StyletIoCGetAllTests.cs" /> <Compile Include="StyletIoCGetAllTests.cs" />
<Compile Include="StyletIoCGetSingleKeyedTests.cs" /> <Compile Include="StyletIoCGetSingleKeyedTests.cs" />
<Compile Include="StyletIoCGetSingleTests.cs" /> <Compile Include="StyletIoCGetSingleTests.cs" />