Merge pull request #516 from /issues/515

Nested partial block receives correct context

Author: oformaniuk

source/Handlebars.Test/IssueTests.cs

@@ -161,6 +161,23 @@ End outer partial block<br />
             Assert.Equal(expected, result);
         }
 
+        // issue: https://github.com/Handlebars-Net/Handlebars.Net/issues/515
+        [Fact]
+        public void ValidContextInNestedPartialBlock()
+        {
+            const string template = @"{{#> [a/b] c=this }}{{c.value}}{{/ [a/b] }}";
+            const string partial = "{{c.value}} {{> @partial-block }}";
+
+            var handlebars = Handlebars.Create();
+            handlebars.RegisterTemplate("a/b", @partial);
+
+            var callback = handlebars.Compile(template);
+            var result = callback(new { value = 42 });
+
+            const string expected = @"42 42";
+            Assert.Equal(expected, result);
+        }
+        
         // issue: https://github.com/Handlebars-Net/Handlebars.Net/issues/395
         [Fact]
         public void RenderingWithUnusedPartial()

source/Handlebars/BindingContext.cs

@@ -115,7 +115,7 @@ out WellKnownVariables[(int) WellKnownVariable.Parent]
 
         internal CascadeIndex<string, IHelperDescriptor<BlockHelperOptions>, StringEqualityComparer> BlockHelpers { get; }
 
-        internal TemplateDelegate PartialBlockTemplate { get; private set; }
+        internal TemplateDelegate PartialBlockTemplate { get; set; }
 
         public object Value { get; set; }
 

source/Handlebars/Compiler/Translation/Expression/PartialBinder.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using Expressions.Shortcuts;
+using HandlebarsDotNet.PathStructure;
 using HandlebarsDotNet.Polyfills;
 using static Expressions.Shortcuts.ExpressionShortcuts;
 
@@ -92,6 +93,7 @@ private static void InvokePartialWithFallback(
             EncodedTextWriter writer,
             ICompiledHandlebarsConfiguration configuration)
         {
+            partialName = partialName != null ? ChainSegment.Create(partialName).TrimmedValue : null;
             if (InvokePartial(partialName, context, writer, configuration)) return;
             if (context.PartialBlockTemplate == null)
             {
@@ -118,7 +120,16 @@ private static bool InvokePartial(
                     return false;
                 }
 
-                context.PartialBlockTemplate(writer, context.ParentContext);
+                var partialBlockTemplate = context.PartialBlockTemplate;
+                try
+                {
+                    context.PartialBlockTemplate = context.ParentContext.PartialBlockTemplate;
+                    partialBlockTemplate(writer, context);
+                }
+                finally
+                {
+                    context.PartialBlockTemplate = partialBlockTemplate;
+                }
                 return true;
             }