Merge pull request #37 from hadashiA/ku/fix-inject-constructors

Fix a bug that inject constructor targets .cctor
hadashiA · Oct 17, 2020 · b0f7d1f · b0f7d1f
2 parents 25c0fdf + 536b445
commit b0f7d1f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/VContainer/Assets/VContainer/Runtime/Internal/TypeAnalyzer.cs b/VContainer/Assets/VContainer/Runtime/Internal/TypeAnalyzer.cs
@@ -99,8 +99,7 @@ public static InjectTypeInfo Analyze(Type type)
             // Constructor, single [Inject] constructor -> single most parameters constuctor
             var injectConstructorCount = 0;
             var maxParameters = -1;
-            foreach (var constructorInfo in typeInfo.DeclaredConstructors)
-            {
+            foreach (var constructorInfo in typeInfo.GetConstructors(BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)) {
                 if (constructorInfo.IsDefined(typeof(InjectAttribute), true))
                 {
                     if (++injectConstructorCount > 1)

diff --git a/VContainer/Assets/VContainer/Tests/TypeAnalyzerTest.cs b/VContainer/Assets/VContainer/Tests/TypeAnalyzerTest.cs
@@ -22,6 +22,16 @@ public HasNoAttributeConstructor(int x, int y)
             }
         }
 
+        class HasStaticConstructor
+        {
+            static int Foo = 400;
+
+            [Inject]
+            public HasStaticConstructor()
+            {
+            }
+        }
+
         class HasInjectConstructor
         {
             [Inject]
@@ -56,7 +66,11 @@ public void Analyze()
             }
             {
                 var injectTypeInfo = TypeAnalyzer.Analyze(typeof(HasInjectConstructor));
-                // Assert.That(injectTypeInfo.InjectConstructor.ConstructorInfo.GetCustomAttribute<InjectAttribute>(), Is.Not.Null);
+                Assert.That(injectTypeInfo.InjectConstructor.ConstructorInfo.GetCustomAttribute<InjectAttribute>(), Is.Not.Null);
+            }
+            {
+                var injectTypeInfo = TypeAnalyzer.Analyze(typeof(HasStaticConstructor));
+                Assert.That(injectTypeInfo.InjectConstructor.ConstructorInfo.IsStatic, Is.False);
             }
         }
     }