Merge pull request #538 from Nisden/InlineBlockShouldNotGetEscaped

Rendering inline blocks are incorrectly escaped

Author: rexm

source/Handlebars.Test/ViewEngine/ViewEngineTests.cs

@@ -73,6 +73,31 @@ public void CanLoadAViewWithALayoutInTheRoot()
             Assert.Equal("layout start\r\nThis is the body\r\nlayout end", output);
         }
 
+        [Fact]
+        public void CanRenderInlineBlocks()
+        {
+            // This sample is based on https://handlebarsjs.com/examples/partials/inline-blocks.html
+
+            var files = new FakeFileSystem()
+            {
+                //Given a layout in a subfolder
+                { "partials/layout.hbs", "<div class=\"nav\">\r\n{{> nav}}\r\n</div>\r\n<div class=\"content\">\r\n{{> content}}\r\n</div>"},
+
+                { "template.hbs", "{{#> layout}}\r\n{{#*inline \"nav\"}}\r\n{{Text}}\r\n{{/inline}}\r\n{{#*inline \"content\"}}\r\nMy Content\r\n{{/inline}}\r\n{{/layout}}"}
+            };
+
+            //When a viewengine renders that view
+            var handleBars = Handlebars.Create(new HandlebarsConfiguration() { FileSystem = files });
+            var renderView = handleBars.CompileView("template.hbs");
+            var output = renderView(new Dictionary<string, string>
+            {
+                { "Text", "<My Nav>" }
+            });
+
+            //Then the correct output should be rendered
+            Assert.Equal("<div class=\"nav\">\r\n&lt;My Nav&gt;\r\n</div>\r\n<div class=\"content\">\r\nMy Content\r\n</div>", output);
+        }
+
         [Fact]
         public void CanLoadAViewWithALayoutWithAVariable()
         {

source/Handlebars/FileSystemPartialTemplateResolver.cs

@@ -27,7 +27,7 @@ public bool TryRegisterPartial(IHandlebars env, string partialName, string templ
 
                 handlebarsTemplateRegistrations.RegisteredTemplates.AddOrReplace(partialName, (writer, o, data) =>
                 {
-                    writer.Write(compiled(o, data));
+                    ((EncodedTextWriterWrapper)writer).Write(compiled(o, data), false);
                 });
 
                 return true;