Addressed code review comments

N. Taylor Mullen · N. Taylor Mullen · commit af6249b7b7c9 · 2014-09-23T16:43:25.000-07:00
diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeBuilder.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeBuilder.cs
@@ -39,9 +39,7 @@ public override CodeBuilderResult Build()
                         writer.WriteLine("private static object @__o;");
                     }
 
-                    var csharpCodeVisitor = DecorateCSharpCodeVisitor(writer, 
-                                                                      Context, 
-                                                                      new CSharpCodeVisitor(writer, Context));
+                    var csharpCodeVisitor = CreateCSharpCodeVisitor(writer, Context);
 
                     new CSharpHelperVisitor(csharpCodeVisitor, writer, Context).Accept(Tree.Chunks);
                     new CSharpTypeMemberVisitor(csharpCodeVisitor, writer, Context).Accept(Tree.Chunks);
@@ -68,11 +66,10 @@ public override CodeBuilderResult Build()
             return new CodeBuilderResult(writer.GenerateCode(), writer.LineMappingManager.Mappings);
         }
 
-        protected virtual CSharpCodeVisitor DecorateCSharpCodeVisitor([NotNull] CSharpCodeWriter writer,
-                                                                      [NotNull] CodeBuilderContext context,
-                                                                      [NotNull] CSharpCodeVisitor incomingVisitor)
+        protected virtual CSharpCodeVisitor CreateCSharpCodeVisitor([NotNull] CSharpCodeWriter writer,
+                                                                    [NotNull] CodeBuilderContext context)
         {
-            return incomingVisitor;
+            return new CSharpCodeVisitor(writer, context);
         }
 
         protected virtual CSharpCodeWritingScope BuildClassDeclaration(CSharpCodeWriter writer)
diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpTagHelperCodeRenderer.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpTagHelperCodeRenderer.cs
@@ -23,7 +23,6 @@ public class CSharpTagHelperCodeRenderer
         private static readonly TagHelperAttributeDescriptorComparer AttributeDescriptorComparer =
             new TagHelperAttributeDescriptorComparer();
 
-        private readonly TagHelperAttributeValueCodeRenderer _attributeValueCodeRenderer;
         private readonly CSharpCodeWriter _writer;
         private readonly CodeBuilderContext _context;
         private readonly IChunkVisitor _bodyVisitor;
@@ -37,17 +36,18 @@ public class CSharpTagHelperCodeRenderer
         /// <param name="context">A <see cref="CodeGeneratorContext"/> instance that contains information about 
         /// the current code generation process.</param>
         public CSharpTagHelperCodeRenderer([NotNull] IChunkVisitor bodyVisitor,
-                                           [NotNull] TagHelperAttributeValueCodeRenderer attributeValueCodeRenderer,
                                            [NotNull] CSharpCodeWriter writer,
                                            [NotNull] CodeBuilderContext context)
         {
             _bodyVisitor = bodyVisitor;
-            _attributeValueCodeRenderer = attributeValueCodeRenderer;
             _writer = writer;
             _context = context;
             _tagHelperContext = context.Host.GeneratedClassContext.GeneratedTagHelperContext;
+            AttributeValueCodeRenderer = new TagHelperAttributeValueCodeRenderer();
         }
 
+        public TagHelperAttributeValueCodeRenderer AttributeValueCodeRenderer { get; set; }
+
         /// <summary>
         /// Renders the code to render the given <paramref name="chunk"/>.
         /// </summary>
@@ -405,7 +405,7 @@ private void BuildBufferedWritingScope(string writerVariable, Action renderCode)
         private void RenderAttributeValue(TagHelperAttributeDescriptor attributeDescriptor,
                                           Action<CSharpCodeWriter> valueRenderer)
         {
-            _attributeValueCodeRenderer.RenderAttributeValue(attributeDescriptor, _writer, _context, valueRenderer);
+            AttributeValueCodeRenderer.RenderAttributeValue(attributeDescriptor, _writer, _context, valueRenderer);
         }
 
         private static bool AcceptsRazorCode(TagHelperAttributeDescriptor attributeDescriptor)
diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpCodeVisitor.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpCodeVisitor.cs
@@ -22,10 +22,7 @@ public CSharpCodeVisitor(CSharpCodeWriter writer, CodeBuilderContext context)
             : base(writer, context)
         {
             _paddingBuilder = new CSharpPaddingBuilder(context.Host);
-            TagHelperRenderer = new CSharpTagHelperCodeRenderer(this, 
-                                                                new TagHelperAttributeValueCodeRenderer(), 
-                                                                writer, 
-                                                                context);
+            TagHelperRenderer = new CSharpTagHelperCodeRenderer(this, writer, context);
         }
 
         public CSharpTagHelperCodeRenderer TagHelperRenderer { get; set; }
diff --git a/test/Microsoft.AspNet.Razor.Test/Generator/TagHelperAttributeCodeGeneratorTest.cs b/test/Microsoft.AspNet.Razor.Test/Generator/TagHelperAttributeCodeGeneratorTest.cs
@@ -17,13 +17,13 @@ public class TagHelperAttributeCodeGeneratorTests : TagHelperTestBase
         [Fact]
         public void TagHelpers_CanReplaceAttributeCodeGeneratorLogic()
         {
+            // Arrange
             var inputTypePropertyInfo = new Mock<PropertyInfo>();
             inputTypePropertyInfo.Setup(ipi => ipi.PropertyType).Returns(typeof(string));
             inputTypePropertyInfo.Setup(ipi => ipi.Name).Returns("Type");
             var checkedPropertyInfo = new Mock<PropertyInfo>();
             checkedPropertyInfo.Setup(ipi => ipi.PropertyType).Returns(typeof(bool));
             checkedPropertyInfo.Setup(ipi => ipi.Name).Returns("Checked");
-            // Arrange
             var tagHelperProvider = new TagHelperDescriptorProvider(
                 new TagHelperDescriptor[]
                 {
@@ -73,17 +73,14 @@ public AttributeCodeGeneratorReplacingCodeBuilder(CodeBuilderContext context)
             {
             }
 
-            protected override CSharpCodeVisitor DecorateCSharpCodeVisitor([NotNull] CSharpCodeWriter writer,
-                                                                           [NotNull] CodeBuilderContext context,
-                                                                           [NotNull] CSharpCodeVisitor incomingVisitor)
+            protected override CSharpCodeVisitor CreateCSharpCodeVisitor([NotNull] CSharpCodeWriter writer,
+                                                                         [NotNull] CodeBuilderContext context)
             {
-                incomingVisitor.TagHelperRenderer =
-                    new CSharpTagHelperCodeRenderer(incomingVisitor,
-                                                    new CustomTagHelperAttributeCodeGenerator(),
-                                                    writer,
-                                                    context);
+                var bodyVisitor = base.CreateCSharpCodeVisitor(writer, context);
+
+                bodyVisitor.TagHelperRenderer.AttributeValueCodeRenderer = new CustomTagHelperAttributeCodeGenerator();
 
-                return base.DecorateCSharpCodeVisitor(writer, context, incomingVisitor);
+                return bodyVisitor;
             }
         }
 
@@ -94,7 +91,7 @@ public override void RenderAttributeValue([NotNull]TagHelperAttributeDescriptor
                                                       [NotNull]CodeGeneratorContext context,
                                                       [NotNull]Action<CSharpCodeWriter> renderAttributeValue)
             {
-                writer.Write("**From custom attribute code generator**: ");
+                writer.Write("**From custom attribute code renderer**: ");
 
                 base.RenderAttributeValue(attributeInfo, writer, context, renderAttributeValue);
             }
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs
@@ -13,7 +13,7 @@ public BasicTagHelpers()
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            var __tagHelperAttributeValue = string.Empty;
+            var __tagHelperBufferedStringValue = string.Empty;
             PTagHelper __p_PTagHelper;
             InputTagHelper __input_InputTagHelper;
             InputTagHelper2 __input_InputTagHelper2;
@@ -32,7 +32,7 @@ public override async Task ExecuteAsync()
             __tagHelperManager.EndTagHelpersScope();
             WriteLiteral("\r\n        ");
             __input_InputTagHelper = __tagHelperManager.InstantiateTagHelper<InputTagHelper>();
-            __input_InputTagHelper.Type = **From custom attribute code generator**: "text";
+            __input_InputTagHelper.Type = **From custom attribute code renderer**: "text";
             __tagHelperManager.AddTagHelperAttribute("type", __input_InputTagHelper.Type);
             __input_InputTagHelper2 = __tagHelperManager.InstantiateTagHelper<InputTagHelper2>();
             __input_InputTagHelper2.Type = __input_InputTagHelper.Type;
@@ -43,11 +43,11 @@ public override async Task ExecuteAsync()
             __tagHelperManager.EndTagHelpersScope();
             WriteLiteral("\r\n        ");
             __input_InputTagHelper = __tagHelperManager.InstantiateTagHelper<InputTagHelper>();
-            __input_InputTagHelper.Type = **From custom attribute code generator**: "checkbox";
+            __input_InputTagHelper.Type = **From custom attribute code renderer**: "checkbox";
             __tagHelperManager.AddTagHelperAttribute("type", __input_InputTagHelper.Type);
             __input_InputTagHelper2 = __tagHelperManager.InstantiateTagHelper<InputTagHelper2>();
             __input_InputTagHelper2.Type = __input_InputTagHelper.Type;
-            __input_InputTagHelper2.Checked = **From custom attribute code generator**: true;
+            __input_InputTagHelper2.Checked = **From custom attribute code renderer**: true;
             __tagHelperManager.AddTagHelperAttribute("checked", __input_InputTagHelper2.Checked);
             __tagHelperManager.StartTagHelpersScope("input");
             await __tagHelperManager.ExecuteTagHelpersAsync();

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,7 @@ public override CodeBuilderResult Build()`
`39`	`39`	`writer.WriteLine("private static object @__o;");`
`40`	`40`	`}`
`41`	`41`
`42`		`- var csharpCodeVisitor = DecorateCSharpCodeVisitor(writer,`
`43`		`- Context,`
`44`		`- new CSharpCodeVisitor(writer, Context));`
	`42`	`+ var csharpCodeVisitor = CreateCSharpCodeVisitor(writer, Context);`
`45`	`43`
`46`	`44`	`new CSharpHelperVisitor(csharpCodeVisitor, writer, Context).Accept(Tree.Chunks);`
`47`	`45`	`new CSharpTypeMemberVisitor(csharpCodeVisitor, writer, Context).Accept(Tree.Chunks);`
`@@ -68,11 +66,10 @@ public override CodeBuilderResult Build()`
`68`	`66`	`return new CodeBuilderResult(writer.GenerateCode(), writer.LineMappingManager.Mappings);`
`69`	`67`	`}`
`70`	`68`
`71`		`- protected virtual CSharpCodeVisitor DecorateCSharpCodeVisitor([NotNull] CSharpCodeWriter writer,`
`72`		`- [NotNull] CodeBuilderContext context,`
`73`		`- [NotNull] CSharpCodeVisitor incomingVisitor)`
	`69`	`+ protected virtual CSharpCodeVisitor CreateCSharpCodeVisitor([NotNull] CSharpCodeWriter writer,`
	`70`	`+ [NotNull] CodeBuilderContext context)`
`74`	`71`	`{`
`75`		`- return incomingVisitor;`
	`72`	`+ return new CSharpCodeVisitor(writer, context);`
`76`	`73`	`}`
`77`	`74`
`78`	`75`	`protected virtual CSharpCodeWritingScope BuildClassDeclaration(CSharpCodeWriter writer)`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,7 @@ public CSharpCodeVisitor(CSharpCodeWriter writer, CodeBuilderContext context)`
`22`	`22`	`: base(writer, context)`
`23`	`23`	`{`
`24`	`24`	`_paddingBuilder = new CSharpPaddingBuilder(context.Host);`
`25`		`- TagHelperRenderer = new CSharpTagHelperCodeRenderer(this,`
`26`		`- new TagHelperAttributeValueCodeRenderer(),`
`27`		`- writer,`
`28`		`- context);`
	`25`	`+ TagHelperRenderer = new CSharpTagHelperCodeRenderer(this, writer, context);`
`29`	`26`	`}`
`30`	`27`
`31`	`28`	`public CSharpTagHelperCodeRenderer TagHelperRenderer { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,13 @@ public class TagHelperAttributeCodeGeneratorTests : TagHelperTestBase`
`17`	`17`	`[Fact]`
`18`	`18`	`public void TagHelpers_CanReplaceAttributeCodeGeneratorLogic()`
`19`	`19`	`{`
	`20`	`+ // Arrange`
`20`	`21`	`var inputTypePropertyInfo = new Mock<PropertyInfo>();`
`21`	`22`	`inputTypePropertyInfo.Setup(ipi => ipi.PropertyType).Returns(typeof(string));`
`22`	`23`	`inputTypePropertyInfo.Setup(ipi => ipi.Name).Returns("Type");`
`23`	`24`	`var checkedPropertyInfo = new Mock<PropertyInfo>();`
`24`	`25`	`checkedPropertyInfo.Setup(ipi => ipi.PropertyType).Returns(typeof(bool));`
`25`	`26`	`checkedPropertyInfo.Setup(ipi => ipi.Name).Returns("Checked");`
`26`		`- // Arrange`
`27`	`27`	`var tagHelperProvider = new TagHelperDescriptorProvider(`
`28`	`28`	`new TagHelperDescriptor[]`
`29`	`29`	`{`
`@@ -73,17 +73,14 @@ public AttributeCodeGeneratorReplacingCodeBuilder(CodeBuilderContext context)`
`73`	`73`	`{`
`74`	`74`	`}`
`75`	`75`
`76`		`- protected override CSharpCodeVisitor DecorateCSharpCodeVisitor([NotNull] CSharpCodeWriter writer,`
`77`		`- [NotNull] CodeBuilderContext context,`
`78`		`- [NotNull] CSharpCodeVisitor incomingVisitor)`
	`76`	`+ protected override CSharpCodeVisitor CreateCSharpCodeVisitor([NotNull] CSharpCodeWriter writer,`
	`77`	`+ [NotNull] CodeBuilderContext context)`
`79`	`78`	`{`
`80`		`- incomingVisitor.TagHelperRenderer =`
`81`		`- new CSharpTagHelperCodeRenderer(incomingVisitor,`
`82`		`- new CustomTagHelperAttributeCodeGenerator(),`
`83`		`- writer,`
`84`		`- context);`
	`79`	`+ var bodyVisitor = base.CreateCSharpCodeVisitor(writer, context);`
	`80`	`+`
	`81`	`+ bodyVisitor.TagHelperRenderer.AttributeValueCodeRenderer = new CustomTagHelperAttributeCodeGenerator();`
`85`	`82`
`86`		`- return base.DecorateCSharpCodeVisitor(writer, context, incomingVisitor);`
	`83`	`+ return bodyVisitor;`
`87`	`84`	`}`
`88`	`85`	`}`
`89`	`86`
`@@ -94,7 +91,7 @@ public override void RenderAttributeValue([NotNull]TagHelperAttributeDescriptor`
`94`	`91`	`[NotNull]CodeGeneratorContext context,`
`95`	`92`	`[NotNull]Action<CSharpCodeWriter> renderAttributeValue)`
`96`	`93`	`{`
`97`		`- writer.Write("From custom attribute code generator: ");`
	`94`	`+ writer.Write("From custom attribute code renderer: ");`
`98`	`95`
`99`	`96`	`base.RenderAttributeValue(attributeInfo, writer, context, renderAttributeValue);`
`100`	`97`	`}`