Merge pull request #203 from hadashiA/ku/misc

hadashiA · May 1, 2021 · 1c63815 · 1c63815
2 parents 17b735a + d780eb6
commit 1c63815
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/VContainer/Assets/VContainer/Runtime/Internal/FixedTypeKeyHashTableRegistry.cs b/VContainer/Assets/VContainer/Runtime/Internal/FixedTypeKeyHashTableRegistry.cs
@@ -55,7 +55,7 @@ static void AddToBuildBuffer(IDictionary<Type, IRegistration> buf, Type service,
                 }
                 else
                 {
-                    collection = new CollectionRegistration(service) { exists };
+                    collection = new CollectionRegistration(collectionService, service) { exists };
                     AddCollectionToBuildBuffer(buf, collection);
                 }
                 collection.Add(registration);
@@ -97,14 +97,14 @@ public bool TryGet(Type interfaceType, out IRegistration registration)
             if (interfaceType.IsConstructedGenericType)
             {
                 var genericType = interfaceType.GetGenericTypeDefinition();
-                return TryGetCollection(interfaceType, genericType, out registration);
+                return TryFallbackSingleCollection(interfaceType, genericType, out registration);
             }
             return false;
         }
 
         public bool Exists(Type type) => hashTable.TryGet(type, out _);
 
-        bool TryGetCollection(Type interfaceType, Type genericType, out IRegistration registration)
+        bool TryFallbackSingleCollection(Type interfaceType, Type genericType, out IRegistration registration)
         {
             if (genericType == typeof(IEnumerable<>) ||
                 genericType == typeof(IReadOnlyList<>))

diff --git a/VContainer/Assets/VContainer/Runtime/Internal/Registration.cs b/VContainer/Assets/VContainer/Runtime/Internal/Registration.cs
@@ -56,10 +56,16 @@ sealed class CollectionRegistration : IRegistration, IEnumerable<IRegistration>
         readonly List<Type> interfaceTypes;
         readonly IList<IRegistration> registrations = new List<IRegistration>();
 
-        public CollectionRegistration(Type elementType)
+        public CollectionRegistration(Type elementType) : this(
+            typeof(List<>).MakeGenericType(elementType),
+            elementType)
+        {
+        }
+
+        public CollectionRegistration(Type listType, Type elementType)
         {
             this.elementType = elementType;
-            ImplementationType = typeof(List<>).MakeGenericType(elementType);
+            ImplementationType = listType;
             interfaceTypes = new List<Type>
             {
                 typeof(IEnumerable<>).MakeGenericType(elementType),

diff --git a/VContainer/Assets/VContainer/Tests/ContainerTest.cs b/VContainer/Assets/VContainer/Tests/ContainerTest.cs
@@ -244,6 +244,7 @@ public void ResolveGenerics()
 
             var resolved = container.Resolve<GenericsArgumentService>();
             Assert.That(resolved.GenericsService, Is.InstanceOf<GenericsService<I2>>());
+            Assert.That(resolved.GenericsService.ParameterService, Is.InstanceOf<NoDependencyServiceA>());
         }
 
         [Test]

diff --git a/VContainer/Assets/VContainer/Tests/Fixtures.cs b/VContainer/Assets/VContainer/Tests/Fixtures.cs
@@ -227,11 +227,11 @@ public void MethodInjectable1(I2 service2)
 
     class GenericsService<T>
     {
-        public readonly I2 Service2;
+        public readonly I2 ParameterService;
 
-        public GenericsService(I2 service2)
+        public GenericsService(I2 parameterService)
         {
-            Service2 = service2;
+            ParameterService = parameterService;
         }
     }