Handle generic Lazy parameters correctly in LazyConstructorScorer (#42)

Author: tothdavid

src/Ninject.Extensions.Factory.Test/Fakes/ClassWithGenericLazy.cs

@@ -0,0 +1,41 @@
+//-------------------------------------------------------------------------------
+// <copyright file="ClassWithGenericLazy.cs" company="Ninject Project Contributors">
+//   Copyright (c) 2009-2018 Ninject Project Contributors
+//           
+//   Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
+//   You may not use this file except in compliance with one of the Licenses.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//   or
+//       http://www.microsoft.com/opensource/licenses.mspx
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+// </copyright>
+//-------------------------------------------------------------------------------
+
+#if !NET_35 && !SILVERLIGHT_30 && !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
+namespace Ninject.Extensions.Factory.Fakes
+{
+    using System;
+
+    public class ClassWithGenericLazy
+    {
+        private readonly Lazy<Lazy<IWeapon>> lazyWeapons;
+
+        public ClassWithGenericLazy(Lazy<Lazy<IWeapon>> lazyWeapons)
+        {
+            this.lazyWeapons = lazyWeapons;
+        }
+
+        public IWeapon GetWeapon()
+        {
+            return this.lazyWeapons.Value.Value;
+        }
+    }
+}
+#endif

src/Ninject.Extensions.Factory.Test/FuncTests.cs

@@ -197,6 +197,20 @@ public void LazyInjection()
             var weapon1 = service.GetWeapon();
             var weapon2 = service.GetWeapon();
 
+            weapon1.Should().BeOfType<Sword>();
+            weapon2.Should().BeOfType<Sword>();
+            weapon1.Should().BeSameAs(weapon2);
+        }
+
+        [Fact]
+        public void GenericLazyInjection()
+        {
+            this.kernel.Bind<IWeapon>().To<Sword>();
+
+            var service = this.kernel.Get<ClassWithGenericLazy>();
+            var weapon1 = service.GetWeapon();
+            var weapon2 = service.GetWeapon();
+
             weapon1.Should().BeOfType<Sword>();
             weapon2.Should().BeOfType<Sword>();
             weapon1.Should().BeSameAs(weapon2);

src/Ninject.Extensions.Factory/Func/LazyConstructorScorer.cs

@@ -46,12 +46,30 @@ public override int Score(IContext context, ConstructorInjectionDirective direct
                 if (directive.Constructor.GetParameters().Length == 1 &&
                     directive.Constructor.GetParameters()[0].ParameterType.IsGenericType)
                 {
-                    return 1;
-                }
-                else
-                {
-                    return 0;
+                    var parameterGenericType = directive.Constructor.GetParameters()[0].ParameterType.GetGenericTypeDefinition();
+                    if (parameterGenericType == typeof(Func<>)
+                        || parameterGenericType == typeof(Func<,>)
+                        || parameterGenericType == typeof(Func<,,>)
+                        || parameterGenericType == typeof(Func<,,,>)
+                        || parameterGenericType == typeof(Func<,,,,>)
+                        || parameterGenericType == typeof(Func<,,,,,>)
+                        || parameterGenericType == typeof(Func<,,,,,,>)
+                        || parameterGenericType == typeof(Func<,,,,,,,>)
+                        || parameterGenericType == typeof(Func<,,,,,,,,>)
+                        || parameterGenericType == typeof(Func<,,,,,,,,,>)
+                        || parameterGenericType == typeof(Func<,,,,,,,,,,>)
+                        || parameterGenericType == typeof(Func<,,,,,,,,,,,>)
+                        || parameterGenericType == typeof(Func<,,,,,,,,,,,,>)
+                        || parameterGenericType == typeof(Func<,,,,,,,,,,,,,>)
+                        || parameterGenericType == typeof(Func<,,,,,,,,,,,,,,>)
+                        || parameterGenericType == typeof(Func<,,,,,,,,,,,,,,,>)
+                        || parameterGenericType == typeof(Func<,,,,,,,,,,,,,,,,>))
+                    {
+                        return 1;
+                    }
                 }
+
+                return 0;
             }
             else
             {