Formatted and addressed some additional code review comments.

Author: N. Taylor Mullen

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpTagHelperCodeRenderer.cs

@@ -81,7 +81,7 @@ public void RenderTagHelper(TagHelperChunk chunk)
 
             RenderUnboundHTMLAttributes(unboundHTMLAttributes);
 
-            switch(contentBehavior)
+            switch (contentBehavior)
             {
                 case ContentBehavior.None:
                     RenderRunTagHelpers(bufferedBody: false);
@@ -298,7 +298,7 @@ private void RenderUnboundHTMLAttributes(IEnumerable<KeyValuePair<string, Chunk>
                 }
                 else
                 {
-                    RenderBufferedAttributeValueAccessor();
+                    RenderBufferedAttributeValueAccessor(_writer);
                 }
 
                 _writer.WriteEndMethodInvocation();
@@ -359,20 +359,13 @@ private void RenderRunTagHelpers(bool bufferedBody)
                    .WriteLine(".Result;");
         }
 
-        private void RenderBufferedAttributeValueAccessor()
-        {
-            _writer.WriteInstanceMethodInvocation(StringValueBufferVariableName,
-                                                  "ToString",
-                                                  endLine: false);
-        }
-
         private void RenderBufferedAttributeValue(TagHelperAttributeDescriptor attributeDescriptor)
         {
             RenderAttributeValue(
                 attributeDescriptor,
                 valueRenderer: (writer) =>
                 {
-                    RenderBufferedAttributeValueAccessor();
+                    RenderBufferedAttributeValueAccessor(writer);
                 });
         }
 
@@ -382,7 +375,7 @@ private void RenderRawAttributeValue(string value, TagHelperAttributeDescriptor
                 attributeDescriptor,
                 valueRenderer: (writer) =>
                 {
-                    _writer.Write(value);
+                    writer.Write(value);
                 });
         }
 
@@ -392,7 +385,7 @@ private void RenderQuotedAttributeValue(string value, TagHelperAttributeDescript
                 attributeDescriptor,
                 valueRenderer: (writer) =>
                 {
-                    _writer.WriteStringLiteral(value);
+                    writer.WriteStringLiteral(value);
                 });
         }
 
@@ -429,10 +422,10 @@ private void BuildBufferedWritingScope(IList<Chunk> chunks)
             {
                 // Reset instrumentation back to what it was, leaving the writing scope.
                 _context.Host.EnableInstrumentation = oldInstrumentation;
-            }
 
-            // Reset the writer/buffer back to what it was, leaving the writing scope.
-            _context.TargetWriterName = oldWriter;
+                // Reset the writer/buffer back to what it was, leaving the writing scope.
+                _context.TargetWriterName = oldWriter;
+            }
         }
 
         private void RenderAttributeValue(TagHelperAttributeDescriptor attributeDescriptor,
@@ -441,6 +434,13 @@ private void RenderAttributeValue(TagHelperAttributeDescriptor attributeDescript
             _attributeValueCodeRenderer.RenderAttributeValue(attributeDescriptor, _writer, _context, valueRenderer);
         }
 
+        private static void RenderBufferedAttributeValueAccessor(CSharpCodeWriter writer)
+        {
+            writer.WriteInstanceMethodInvocation(StringValueBufferVariableName,
+                                                  "ToString",
+                                                  endLine: false);
+        }
+
         private static bool IsStringAttribute(TagHelperAttributeDescriptor attributeDescriptor)
         {
             return attributeDescriptor.PropertyInfo.PropertyType == typeof(string);