noEscape support

Handlebars-Net/issues/276
oformaniuk · Oct 26, 2020 · b12d4ff · b12d4ff
1 parent d0c4fef
commit b12d4ff
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/source/Handlebars/Configuration/HandlebarsConfiguration.cs b/source/Handlebars/Configuration/HandlebarsConfiguration.cs
@@ -32,6 +32,8 @@ public sealed class HandlebarsConfiguration : IHandlebarsTemplateRegistrations
 	    public string UnresolvedBindingFormatter { get; set; }
 
         public bool ThrowOnUnresolvedBindingExpression { get; set; }
+
+        public bool NoEscape { get; set; }
 
         /// <summary>
         /// The resolver used for unregistered partials. Defaults

diff --git a/source/Handlebars/Configuration/HandlebarsConfigurationAdapter.cs b/source/Handlebars/Configuration/HandlebarsConfigurationAdapter.cs
@@ -49,6 +49,7 @@ public HandlebarsConfigurationAdapter(HandlebarsConfiguration configuration)
         public IPartialTemplateResolver PartialTemplateResolver => UnderlingConfiguration.PartialTemplateResolver;
         public IMissingPartialTemplateHandler MissingPartialTemplateHandler => UnderlingConfiguration.MissingPartialTemplateHandler;
         public Compatibility Compatibility => UnderlingConfiguration.Compatibility;
+        public bool NoEscape => UnderlingConfiguration.NoEscape;
 
         public IObjectDescriptorProvider ObjectDescriptorProvider { get; }
         public IList<IExpressionMiddleware> ExpressionMiddleware { get; }

diff --git a/source/Handlebars/Configuration/ICompiledHandlebarsConfiguration.cs b/source/Handlebars/Configuration/ICompiledHandlebarsConfiguration.cs
@@ -99,5 +99,7 @@ public interface ICompiledHandlebarsConfiguration : IHandlebarsTemplateRegistrat
 
         /// <inheritdoc cref="IPathInfoStore"/>
         IPathInfoStore PathInfoStore { get; }
+
+        bool NoEscape { get; }
     }
 }
diff --git a/source/Handlebars/HandlebarsEnvironment.cs b/source/Handlebars/HandlebarsEnvironment.cs
@@ -72,7 +72,7 @@ private HandlebarsTemplate<TextWriter, object, object> CompileViewInternal(strin
 
             return (writer, context, data) =>
             {
-                using var encodedTextWriter = new EncodedTextWriter(writer, configuration.TextEncoder);
+                using var encodedTextWriter = new EncodedTextWriter(writer, configuration.TextEncoder, configuration.NoEscape);
                 if (context is BindingContext bindingContext)
                 {
                     compiledView(encodedTextWriter, bindingContext);
@@ -109,7 +109,7 @@ public HandlebarsTemplate<TextWriter, object, object> Compile(TextReader templat
                 }
                 else
                 {
-                    using var encodedTextWriter = new EncodedTextWriter(writer, configuration.TextEncoder);
+                    using var encodedTextWriter = new EncodedTextWriter(writer, configuration.TextEncoder, configuration.NoEscape);
                     if (context is BindingContext bindingContext)
                     {
                         compiledTemplate(encodedTextWriter, bindingContext);

diff --git a/source/Handlebars/Helpers/HelperDescriptor.cs b/source/Handlebars/Helpers/HelperDescriptor.cs
@@ -20,7 +20,7 @@ protected HelperDescriptor(PathInfo name) : base(name)
         internal sealed override object ReturnInvoke(BindingContext bindingContext, object context, in Arguments arguments)
         {
             using var writer = ReusableStringWriter.Get(bindingContext.Configuration.FormatProvider);
-            using var encodedTextWriter = new EncodedTextWriter(writer, bindingContext.Configuration.TextEncoder);
+            using var encodedTextWriter = new EncodedTextWriter(writer, bindingContext.Configuration.TextEncoder, bindingContext.Configuration.NoEscape);
             WriteInvoke(bindingContext, encodedTextWriter, context, arguments);
             return writer.ToString();
         }