Refactored CodeGeneratorContext to CodeBuilderContext.

- Needed to separate the context's of "generation" and "building" to enable the communication of the TagHelperProvider.

Author: N. Taylor Mullen

src/Microsoft.AspNet.Razor/CSharpRazorCodeLanguage.cs

@@ -42,7 +42,7 @@ public override RazorCodeGenerator CreateCodeGenerator(string className, string
             return new CSharpRazorCodeGenerator(className, rootNamespaceName, sourceFileName, host);
         }
 
-        public override CodeBuilder CreateCodeBuilder(CodeGeneratorContext context)
+        public override CodeBuilder CreateCodeBuilder(CodeBuilderContext context)
         {
             return new CSharpCodeBuilder(context);
         }

src/Microsoft.AspNet.Razor/Generator/CodeBuilderContext.cs

@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNet.Razor.Generator
+{
+    /// <summary>
+    /// Context object with information used to generate a Razor page.
+    /// </summary>
+    public class CodeBuilderContext : CodeGeneratorContext
+    {
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="CodeBuilderContext"/> object.
+        /// </summary>
+        /// <param name="generatorContext">A <see cref="CodeGeneratorContext"/> to copy information from.</param>
+        public CodeBuilderContext(CodeGeneratorContext generatorContext)
+            : base(generatorContext)
+        {
+            ExpressionRenderingMode = ExpressionRenderingMode.WriteToOutput;
+        }
+
+        // Internal for testing.
+        internal CodeBuilderContext(RazorEngineHost host,
+                                    string className,
+                                    string rootNamespace,
+                                    string sourceFile,
+                                    bool shouldGenerateLinePragmas)
+            : base(host, className, rootNamespace, sourceFile, shouldGenerateLinePragmas)
+        {
+            ExpressionRenderingMode = ExpressionRenderingMode.WriteToOutput;
+        }
+
+        /// <summary>
+        /// The current C# rendering mode.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="ExpressionRenderingMode.WriteToOutput"/> forces C# generation to write 
+        /// <see cref="Compiler.Chunk"/>s to the output page, i.e. WriteLiteral("Hello World").
+        /// <see cref="ExpressionRenderingMode.InjectCode"/> writes <see cref="Compiler.Chunk"/> values in their
+        /// rawest form, i.g. "Hello World".
+        /// </remarks>
+        public ExpressionRenderingMode ExpressionRenderingMode { get; set; }
+
+        /// <summary>
+        /// The C# writer to write <see cref="Compiler.Chunk"/> information to.
+        /// </summary>
+        /// <remarks>
+        /// If <see cref="TargetWriterName"/> is <c>null</c> values will be written using a default write method
+        /// i.e. WriteLiteral("Hello World").
+        /// If <see cref="TargetWriterName"/> is not <c>null</c> values will be written to the given 
+        /// <see cref="TargetWriterName"/>, i.e. WriteLiteralTo(myWriter, "Hello World").
+        /// </remarks>
+        public string TargetWriterName { get; set; }
+    }
+}

src/Microsoft.AspNet.Razor/Generator/CodeGeneratorContext.cs

@@ -7,32 +7,38 @@ namespace Microsoft.AspNet.Razor.Generator
 {
     public class CodeGeneratorContext
     {
-        private CodeGeneratorContext()
+        protected CodeGeneratorContext(CodeGeneratorContext context)
+            : this(context.Host,
+                   context.ClassName,
+                   context.RootNamespace,
+                   context.SourceFile,
+                   // True because we're pulling from the provided context's source file.
+                   shouldGenerateLinePragmas: true)
         {
-            ExpressionRenderingMode = ExpressionRenderingMode.WriteToOutput;
+            CodeTreeBuilder = context.CodeTreeBuilder;
+        }
+
+        public CodeGeneratorContext(RazorEngineHost host,
+                                    string className,
+                                    string rootNamespace,
+                                    string sourceFile,
+                                    bool shouldGenerateLinePragmas)
+        {
+            CodeTreeBuilder = new CodeTreeBuilder();
+            Host = host;
+            SourceFile = shouldGenerateLinePragmas ? sourceFile : null;
+            RootNamespace = rootNamespace;
+            ClassName = className;
         }
 
-        // Internal/Private state. Technically consumers might want to use some of these but they can implement them independently if necessary.
-        // It's way safer to make them internal for now, especially with the code generator stuff in a bit of flux.
-        internal ExpressionRenderingMode ExpressionRenderingMode { get; set; }
         public string SourceFile { get; internal set; }
+
         public string RootNamespace { get; private set; }
+
         public string ClassName { get; private set; }
+
         public RazorEngineHost Host { get; private set; }
-        public string TargetWriterName { get; set; }
 
         public CodeTreeBuilder CodeTreeBuilder { get; set; }
-
-        public static CodeGeneratorContext Create(RazorEngineHost host, string className, string rootNamespace, string sourceFile, bool shouldGenerateLinePragmas)
-        {
-            return new CodeGeneratorContext()
-            {
-                CodeTreeBuilder = new CodeTreeBuilder(),
-                Host = host,
-                SourceFile = shouldGenerateLinePragmas ? sourceFile : null,
-                RootNamespace = rootNamespace,
-                ClassName = className
-            };
-        }
     }
 }

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

@@ -12,7 +12,7 @@ public class CSharpCodeBuilder : CodeBuilder
     {
         private const int DisableAsyncWarning = 1998;
 
-        public CSharpCodeBuilder(CodeGeneratorContext context)
+        public CSharpCodeBuilder(CodeBuilderContext context)
             : base(context)
         {
         }

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpBaseTypeVisitor.cs

@@ -5,7 +5,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 {
     public class CSharpBaseTypeVisitor : CodeVisitor<CSharpCodeWriter>
     {
-        public CSharpBaseTypeVisitor(CSharpCodeWriter writer, CodeGeneratorContext context)
+        public CSharpBaseTypeVisitor(CSharpCodeWriter writer, CodeBuilderContext context)
             : base(writer, context) { }
 
         public string CurrentBaseType { get; set; }

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpClassAttributeVisitor.cs

@@ -7,7 +7,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 {
     public class CSharpClassAttributeVisitor : CodeVisitor<CSharpCodeWriter>
     {
-        public CSharpClassAttributeVisitor(CSharpCodeWriter writer, CodeGeneratorContext context)
+        public CSharpClassAttributeVisitor(CSharpCodeWriter writer, CodeBuilderContext context)
             : base(writer, context) { }
 
         protected override void Visit(SessionStateChunk chunk)

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpCodeVisitor.cs

@@ -17,7 +17,7 @@ public class CSharpCodeVisitor : CodeVisitor<CSharpCodeWriter>
 
         private CSharpPaddingBuilder _paddingBuilder;
 
-        public CSharpCodeVisitor(CSharpCodeWriter writer, CodeGeneratorContext context)
+        public CSharpCodeVisitor(CSharpCodeWriter writer, CodeBuilderContext context)
             : base(writer, context)
         {
             _paddingBuilder = new CSharpPaddingBuilder(context.Host);

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpDesignTimeHelpersVisitor.cs

@@ -10,7 +10,7 @@ public class CSharpDesignTimeHelpersVisitor : CodeVisitor<CSharpCodeWriter>
 
         private const int DisableVariableNamingWarnings = 219;
 
-        public CSharpDesignTimeHelpersVisitor(CSharpCodeWriter writer, CodeGeneratorContext context)
+        public CSharpDesignTimeHelpersVisitor(CSharpCodeWriter writer, CodeBuilderContext context)
             : base(writer, context) { }
 
         public void AcceptTree(CodeTree tree)

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpHelperVisitor.cs

@@ -11,7 +11,7 @@ public class CSharpHelperVisitor : CodeVisitor<CSharpCodeWriter>
 
         private CSharpCodeVisitor _codeVisitor;
 
-        public CSharpHelperVisitor(CSharpCodeWriter writer, CodeGeneratorContext context)
+        public CSharpHelperVisitor(CSharpCodeWriter writer, CodeBuilderContext context)
             : base(writer, context)
         {
             _codeVisitor = new CSharpCodeVisitor(writer, context);

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpTypeMemberVisitor.cs

@@ -9,7 +9,7 @@ public class CSharpTypeMemberVisitor : CodeVisitor<CSharpCodeWriter>
     {
         private CSharpCodeVisitor _csharpCodeVisitor;
 
-        public CSharpTypeMemberVisitor(CSharpCodeWriter writer, CodeGeneratorContext context)
+        public CSharpTypeMemberVisitor(CSharpCodeWriter writer, CodeBuilderContext context)
             : base(writer, context)
         {
             _csharpCodeVisitor = new CSharpCodeVisitor(writer, context);