fixed: #347

Author: maximv

src/DryIoc/Container.cs

@@ -5041,7 +5041,7 @@ public static Expression GetLazyExpressionOrDefault(Request request, bool nullWr
 
             // creates: r => new Lazy(() => r.Resolve<X>(key))
             // or for singleton : r => new Lazy(() => r.Root.Resolve<X>(key))
-            var serviceExpr = Resolver.CreateResolutionExpression(serviceRequest);
+            var serviceExpr = Resolver.CreateResolutionExpression(serviceRequest, openResolutionScope: false, asResolutionCall: true);
 
             // The conversion is required in .NET 3.5 to handle lack of covariance for Func<out T>
             // So that Func<Derived> may be used for Func<Base>
@@ -5087,7 +5087,7 @@ private static Expression GetFuncOrActionExpressionOrDefault(Request request)
             var serviceRequest = request.Push(serviceType, flags: RequestFlags.IsWrappedInFunc | RequestFlags.IsDirectlyWrappedInFunc);
             var container = request.Container;
             var serviceExpr = container.Rules.FuncAndLazyWithoutRegistration && !isAction
-                ? Resolver.CreateResolutionExpression(serviceRequest)
+                ? Resolver.CreateResolutionExpression(serviceRequest, openResolutionScope: false, asResolutionCall: true)
                 : container.ResolveFactory(serviceRequest)?.GetExpressionOrDefault(serviceRequest);
 
             if (serviceExpr == null)
@@ -7863,7 +7863,8 @@ public static T New<T>(this IResolver resolver, Made.TypedMade<T> made,
         private static readonly ConstantExpression _nullTypeExpr          = Constant(null, typeof(Type));
         private static readonly ConstantExpression _nullExpr              = Constant(null, typeof(object));
 
-        internal static Expression CreateResolutionExpression(Request request, bool opensResolutionScope = false)
+        internal static Expression CreateResolutionExpression(Request request, 
+            bool openResolutionScope = false, bool asResolutionCall = false)
         {
             if (request.Rules.DependencyResolutionCallExprs != null &&
                 request.Factory != null && !request.Factory.HasRuntimeState)
@@ -7889,7 +7890,7 @@ internal static Expression CreateResolutionExpression(Request request, bool open
                 : container.GetConstantExpression(details.ServiceKey, typeof(object));
 
             Expression resolverExpr;
-            if (!opensResolutionScope)
+            if (!openResolutionScope)
             {
                 resolverExpr = ResolverContext.GetRootOrSelfExpr(request);
             }
@@ -7909,9 +7910,9 @@ internal static Expression CreateResolutionExpression(Request request, bool open
             }
 
             var parentFlags = default(RequestFlags);
-            if (opensResolutionScope)
+            if (openResolutionScope)
                 parentFlags |= RequestFlags.OpensResolutionScope;
-            if ((request.Flags & RequestFlags.StopRecursiveDependencyCheck) != 0)
+            if (asResolutionCall || (request.Flags & RequestFlags.StopRecursiveDependencyCheck) != 0)
                 parentFlags |= RequestFlags.StopRecursiveDependencyCheck;
 
             // Only parent is converted to be passed to Resolve.
@@ -9857,7 +9858,7 @@ public virtual Expression GetExpressionOrDefault(Request request)
                         && request.GetActualServiceType() != typeof(void));
 
             if (getAsRsolutionCall)
-                return Resolver.CreateResolutionExpression(request, setup.OpenResolutionScope);
+                return Resolver.CreateResolutionExpression(request, setup.OpenResolutionScope, setup.AsResolutionCall);
 
             var cacheExpression = 
                 Caching != FactoryCaching.DoNotCache &&
@@ -9986,7 +9987,7 @@ cacheEntry.Value.ScopeNameOrDependencyCount is Container.Registry.TransientDepen
                             ((Container)container).CacheFactoryExpression(request.FactoryID, serviceExpr, reuse, 
                                 depCount, cacheEntry);
 
-                        return Resolver.CreateResolutionExpression(request, false);
+                        return Resolver.CreateResolutionExpression(request);
                     }
                 }
             }
@@ -11333,7 +11334,7 @@ public override Expression GetExpressionOrDefault(Request request)
             if (// preventing recursion
                 (request.Flags & RequestFlags.IsGeneratedResolutionDependencyExpression) == 0 && !request.IsResolutionCall && 
                  (Setup.AsResolutionCall || Setup.AsResolutionCallForExpressionGeneration && request.Rules.UsedForExpressionGeneration))
-                return Resolver.CreateResolutionExpression(request.WithResolvedFactory(this), Setup.OpenResolutionScope);
+                return Resolver.CreateResolutionExpression(request.WithResolvedFactory(this), Setup.OpenResolutionScope, Setup.AsResolutionCall);
 
             // First look for decorators if it is not already a decorator
             var serviceType = request.ServiceType;

test/DryIoc.IssuesTests/GHIssue347_The_AsResolutionCall_option_and_or_WithFuncAndLazyWithoutRegistration_rule_are_not_respected.cs

@@ -6,7 +6,7 @@ namespace DryIoc.IssuesTests
     [TestFixture]
     public class GHIssue347_The_AsResolutionCall_option_and_or_WithFuncAndLazyWithoutRegistration_rule_are_not_respected
     {
-        [Test, Ignore("fixme")]
+        [Test]
         public void RecursiveDependencyIssue_with_asResolutionCall()
         {
             var container = new Container();
@@ -21,7 +21,7 @@ public void RecursiveDependencyIssue_with_asResolutionCall()
             Assert.AreSame(actual, serviceA);
         }
 
-        [Test, Ignore("fixme")]
+        [Test]
         public void RecursiveDependencyIssue_WithFuncAndLazyWithoutRegistration()
         {
             var container = new Container(rules => rules.WithFuncAndLazyWithoutRegistration());