From 6df8bc23f1c8b48f41b8f3f5c555303f73452214 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Wed, 27 May 2015 16:21:39 -0700 Subject: [PATCH] Renamed CodeBuilder related classes to CodeGenerator - Now that what used to be CodeGenerators are now ChunkGenerators we can rename the CodeBuilder into its correct structure: a CodeGenerator. - Moved the TagHelperAttributeValueCodeRenderer from the TagHelpers namespace into the CodeGeneration namespace. - Went through several classes and remove and sorted usings. - Updated test files to abide by the new naming convention of Builders => CodeGenerators. #140 --- .../CSharpRazorCodeLanguage.cs | 4 ++-- ...pCodeBuilder.cs => CSharpCodeGenerator.cs} | 10 +++++----- .../CSharpTagHelperCodeRenderer.cs | 8 ++++---- .../{CodeBuilder.cs => CodeGenerator.cs} | 10 +++++----- ...lderContext.cs => CodeGeneratorContext.cs} | 8 ++++---- ...uilderResult.cs => CodeGeneratorResult.cs} | 4 ++-- .../CodeGeneration/ExpressionRenderingMode.cs | 4 ++-- .../TagHelperAttributeValueCodeRenderer.cs | 18 ++++++++--------- .../Visitors/CSharpBaseTypeVisitor.cs | 2 +- .../Visitors/CSharpCodeVisitor.cs | 4 ++-- .../CSharpDesignTimeHelpersVisitor.cs | 2 +- .../CSharpTagHelperAttributeValueVisitor.cs | 4 ++-- .../CSharpTagHelperFieldDeclarationVisitor.cs | 2 +- ...arpTagHelperRunnerInitializationVisitor.cs | 4 ++-- .../Visitors/CSharpTypeMemberVisitor.cs | 2 +- .../Visitors/CSharpUsingVisitor.cs | 2 +- .../CodeGeneration/Visitors/ChunkVisitor.cs | 4 ++-- .../CodeGeneration/Visitors/CodeVisitor.cs | 2 +- .../GeneratorResults.cs | 14 ++++++------- .../RazorCodeLanguage.cs | 2 +- src/Microsoft.AspNet.Razor/RazorEngineHost.cs | 12 +++++------ .../RazorTemplateEngine.cs | 20 +++++++++---------- .../CSharpRazorCodeLanguageTest.cs | 9 ++++----- .../Chunks/ChunkVisitorTests.cs | 4 ++-- .../CSharpCodeGeneratorTest.cs} | 19 +++++++++--------- .../CSharpTagHelperRenderingUnitTest.cs | 12 +++++------ ...Builder.cs => CodeGenTestCodeGenerator.cs} | 5 ++--- .../CodeGeneration/CodeGenTestHost.cs | 7 +++---- .../CodeGeneration/RazorChunkGeneratorTest.cs | 2 -- ...TagHelperAttributeValueCodeRendererTest.cs | 20 +++++++++---------- .../CodeGeneration/TagHelperTestBase.cs | 12 +++++------ .../Framework/TestSpanBuilder.cs | 2 +- .../Parser/CSharp/CSharpTemplateTest.cs | 2 +- .../Parser/CSharp/CSharpToMarkupSwitchTest.cs | 2 +- .../Parser/Html/HtmlAttributeTest.cs | 2 +- .../Parser/Html/HtmlBlockTest.cs | 2 +- .../Parser/Html/HtmlDocumentTest.cs | 1 - .../Parser/Html/HtmlErrorTest.cs | 1 - .../Parser/Html/HtmlToCodeSwitchTest.cs | 2 +- .../Parser/Html/HtmlUrlAttributeTest.cs | 3 +-- .../RazorTemplateEngineTest.cs | 10 +++++----- .../TagHelperDirectiveSpanVisitorTest.cs | 12 +++++------ ...agHelpers.CustomAttributeCodeGenerator.cs} | 0 ...pCodeBuilder.cs => CSharpCodeGenerator.cs} | 0 .../Tokenizer/CSharpTokenizerTestBase.cs | 1 - .../Tokenizer/HtmlTokenizerTestBase.cs | 1 - 46 files changed, 131 insertions(+), 142 deletions(-) rename src/Microsoft.AspNet.Razor/CodeGeneration/{CSharpCodeBuilder.cs => CSharpCodeGenerator.cs} (94%) rename src/Microsoft.AspNet.Razor/CodeGeneration/{CodeBuilder.cs => CodeGenerator.cs} (57%) rename src/Microsoft.AspNet.Razor/CodeGeneration/{CodeBuilderContext.cs => CodeGeneratorContext.cs} (90%) rename src/Microsoft.AspNet.Razor/CodeGeneration/{CodeBuilderResult.cs => CodeGeneratorResult.cs} (79%) rename src/Microsoft.AspNet.Razor/{TagHelpers => CodeGeneration}/TagHelperAttributeValueCodeRenderer.cs (68%) rename test/Microsoft.AspNet.Razor.Test/{Chunks/CSharpCodeBuilderTests.cs => CodeGeneration/CSharpCodeGeneratorTest.cs} (64%) rename test/Microsoft.AspNet.Razor.Test/CodeGeneration/{CodeGenTestCodeBuilder.cs => CodeGenTestCodeGenerator.cs} (81%) rename test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/{BasicTagHelpers.CustomAttributeCodeBuilder.cs => BasicTagHelpers.CustomAttributeCodeGenerator.cs} (100%) rename test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/{CSharpCodeBuilder.cs => CSharpCodeGenerator.cs} (100%) diff --git a/src/Microsoft.AspNet.Razor/CSharpRazorCodeLanguage.cs b/src/Microsoft.AspNet.Razor/CSharpRazorCodeLanguage.cs index fba2bd08da..64b15d090b 100644 --- a/src/Microsoft.AspNet.Razor/CSharpRazorCodeLanguage.cs +++ b/src/Microsoft.AspNet.Razor/CSharpRazorCodeLanguage.cs @@ -41,9 +41,9 @@ namespace Microsoft.AspNet.Razor return new RazorChunkGenerator(className, rootNamespaceName, sourceFileName, host); } - public override CodeBuilder CreateCodeBuilder(CodeBuilderContext context) + public override CodeGenerator CreateCodeGenerator(CodeGeneratorContext context) { - return new CSharpCodeBuilder(context); + return new CSharpCodeGenerator(context); } } } diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/CSharpCodeBuilder.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/CSharpCodeGenerator.cs similarity index 94% rename from src/Microsoft.AspNet.Razor/CodeGeneration/CSharpCodeBuilder.cs rename to src/Microsoft.AspNet.Razor/CodeGeneration/CSharpCodeGenerator.cs index 645f8ff920..4f621fbf0e 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/CSharpCodeBuilder.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/CSharpCodeGenerator.cs @@ -10,13 +10,13 @@ using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Razor.CodeGeneration { - public class CSharpCodeBuilder : CodeBuilder + public class CSharpCodeGenerator : CodeGenerator { // See http://msdn.microsoft.com/en-us/library/system.codedom.codechecksumpragma.checksumalgorithmid.aspx private const string Sha1AlgorithmId = "{ff1816ec-aa5e-4d10-87f7-6f4963833460}"; private const int DisableAsyncWarning = 1998; - public CSharpCodeBuilder(CodeBuilderContext context) + public CSharpCodeGenerator(CodeGeneratorContext context) : base(context) { } @@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration return new CSharpCodeWriter(); } - public override CodeBuilderResult Build() + public override CodeGeneratorResult Generate() { var writer = CreateCodeWriter(); @@ -81,11 +81,11 @@ namespace Microsoft.AspNet.Razor.CodeGeneration } } - return new CodeBuilderResult(writer.GenerateCode(), writer.LineMappingManager.Mappings); + return new CodeGeneratorResult(writer.GenerateCode(), writer.LineMappingManager.Mappings); } protected virtual CSharpCodeVisitor CreateCSharpCodeVisitor([NotNull] CSharpCodeWriter writer, - [NotNull] CodeBuilderContext context) + [NotNull] CodeGeneratorContext context) { return new CSharpCodeVisitor(writer, context); } diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/CSharpTagHelperCodeRenderer.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/CSharpTagHelperCodeRenderer.cs index fdb05a9879..9a7f3456ae 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/CSharpTagHelperCodeRenderer.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/CSharpTagHelperCodeRenderer.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration internal static readonly string RunnerVariableName = "__tagHelperRunner"; private readonly CSharpCodeWriter _writer; - private readonly CodeBuilderContext _context; + private readonly CodeGeneratorContext _context; private readonly IChunkVisitor _bodyVisitor; private readonly IChunkVisitor _literalBodyVisitor; private readonly GeneratedTagHelperContext _tagHelperContext; @@ -34,12 +34,12 @@ namespace Microsoft.AspNet.Razor.CodeGeneration /// /// The used to render chunks found in the body. /// The used to write code. - /// A instance that contains information about + /// A instance that contains information about /// the current code generation process. public CSharpTagHelperCodeRenderer( [NotNull] IChunkVisitor bodyVisitor, [NotNull] CSharpCodeWriter writer, - [NotNull] CodeBuilderContext context) + [NotNull] CodeGeneratorContext context) { _bodyVisitor = bodyVisitor; _writer = writer; @@ -653,7 +653,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration public CSharpLiteralCodeVisitor( CSharpTagHelperCodeRenderer tagHelperRenderer, CSharpCodeWriter writer, - CodeBuilderContext context) + CodeGeneratorContext context) : base(writer, context) { // Ensure that no matter how this class is used, we don't create numerous CSharpTagHelperCodeRenderer diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/CodeBuilder.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/CodeGenerator.cs similarity index 57% rename from src/Microsoft.AspNet.Razor/CodeGeneration/CodeBuilder.cs rename to src/Microsoft.AspNet.Razor/CodeGeneration/CodeGenerator.cs index b0b5b265ea..e758a395e6 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/CodeBuilder.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/CodeGenerator.cs @@ -3,20 +3,20 @@ namespace Microsoft.AspNet.Razor.CodeGeneration { - public abstract class CodeBuilder + public abstract class CodeGenerator { - private readonly CodeBuilderContext _context; + private readonly CodeGeneratorContext _context; - public CodeBuilder(CodeBuilderContext context) + public CodeGenerator(CodeGeneratorContext context) { _context = context; } - protected CodeBuilderContext Context + protected CodeGeneratorContext Context { get { return _context; } } - public abstract CodeBuilderResult Build(); + public abstract CodeGeneratorResult Generate(); } } diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/CodeBuilderContext.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/CodeGeneratorContext.cs similarity index 90% rename from src/Microsoft.AspNet.Razor/CodeGeneration/CodeBuilderContext.cs rename to src/Microsoft.AspNet.Razor/CodeGeneration/CodeGeneratorContext.cs index badceadda2..0e30489cdd 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/CodeBuilderContext.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/CodeGeneratorContext.cs @@ -8,17 +8,17 @@ namespace Microsoft.AspNet.Razor.CodeGeneration /// /// Context object with information used to generate a Razor page. /// - public class CodeBuilderContext : ChunkGeneratorContext + public class CodeGeneratorContext : ChunkGeneratorContext { /// - /// Instantiates a new instance of the object. + /// Instantiates a new instance of the object. /// /// A to copy information from. /// /// The used to collect s encountered /// when parsing the current Razor document. /// - public CodeBuilderContext(ChunkGeneratorContext generatorContext, ErrorSink errorSink) + public CodeGeneratorContext(ChunkGeneratorContext generatorContext, ErrorSink errorSink) : base(generatorContext) { ErrorSink = errorSink; @@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration } // Internal for testing. - internal CodeBuilderContext(RazorEngineHost host, + internal CodeGeneratorContext(RazorEngineHost host, string className, string rootNamespace, string sourceFile, diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/CodeBuilderResult.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/CodeGeneratorResult.cs similarity index 79% rename from src/Microsoft.AspNet.Razor/CodeGeneration/CodeBuilderResult.cs rename to src/Microsoft.AspNet.Razor/CodeGeneration/CodeGeneratorResult.cs index 5024c37917..e13d691d21 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/CodeBuilderResult.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/CodeGeneratorResult.cs @@ -5,9 +5,9 @@ using System.Collections.Generic; namespace Microsoft.AspNet.Razor.CodeGeneration { - public class CodeBuilderResult + public class CodeGeneratorResult { - public CodeBuilderResult(string code, IList designTimeLineMappings) + public CodeGeneratorResult(string code, IList designTimeLineMappings) { Code = code; DesignTimeLineMappings = designTimeLineMappings; diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/ExpressionRenderingMode.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/ExpressionRenderingMode.cs index c7a21419f9..ae7655b78b 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/ExpressionRenderingMode.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/ExpressionRenderingMode.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration /// Indicates that expressions should be written to the output stream /// /// - /// If @foo is rendered with WriteToOutput, the code builder would output the following code: + /// If @foo is rendered with WriteToOutput, the code generator would output the following code: /// /// Write(foo); /// @@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration /// the code exists will be used to render it /// /// - /// If @foo is rendered with InjectCode, the code builder would output the following code: + /// If @foo is rendered with InjectCode, the code generator would output the following code: /// /// foo /// diff --git a/src/Microsoft.AspNet.Razor/TagHelpers/TagHelperAttributeValueCodeRenderer.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/TagHelperAttributeValueCodeRenderer.cs similarity index 68% rename from src/Microsoft.AspNet.Razor/TagHelpers/TagHelperAttributeValueCodeRenderer.cs rename to src/Microsoft.AspNet.Razor/CodeGeneration/TagHelperAttributeValueCodeRenderer.cs index da19c8249a..7bf5525de3 100644 --- a/src/Microsoft.AspNet.Razor/TagHelpers/TagHelperAttributeValueCodeRenderer.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/TagHelperAttributeValueCodeRenderer.cs @@ -2,11 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Razor.Chunks.Generators; -using Microsoft.AspNet.Razor.CodeGeneration; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Razor.TagHelpers +namespace Microsoft.AspNet.Razor.CodeGeneration { /// /// Renders code for tag helper property initialization. @@ -21,7 +20,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers /// The to generate code for. /// /// The that's used to write code. - /// A instance that contains information about + /// A instance that contains information about /// the current code generation process. /// /// that renders the raw value of the HTML attribute. @@ -31,11 +30,12 @@ namespace Microsoft.AspNet.Razor.TagHelpers /// C# expressions e.g. "PropertyName". true if the attribute value contain at least one in-line /// Razor construct e.g. "@(@readonly)". /// - public virtual void RenderAttributeValue([NotNull] TagHelperAttributeDescriptor attributeDescriptor, - [NotNull] CSharpCodeWriter writer, - [NotNull] CodeBuilderContext context, - [NotNull] Action renderAttributeValue, - bool complexValue) + public virtual void RenderAttributeValue( + [NotNull] TagHelperAttributeDescriptor attributeDescriptor, + [NotNull] CSharpCodeWriter writer, + [NotNull] CodeGeneratorContext context, + [NotNull] Action renderAttributeValue, + bool complexValue) { renderAttributeValue(writer); } diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpBaseTypeVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpBaseTypeVisitor.cs index 7be7a0edaf..52abbe9992 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpBaseTypeVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpBaseTypeVisitor.cs @@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors { public class CSharpBaseTypeVisitor : CodeVisitor { - public CSharpBaseTypeVisitor([NotNull] CSharpCodeWriter writer, [NotNull] CodeBuilderContext context) + public CSharpBaseTypeVisitor([NotNull] CSharpCodeWriter writer, [NotNull] CodeGeneratorContext context) : base(writer, context) { } diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpCodeVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpCodeVisitor.cs index de1a723a99..410c320f0f 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpCodeVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpCodeVisitor.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors private CSharpPaddingBuilder _paddingBuilder; private CSharpTagHelperCodeRenderer _tagHelperCodeRenderer; - public CSharpCodeVisitor([NotNull] CSharpCodeWriter writer, [NotNull] CodeBuilderContext context) + public CSharpCodeVisitor([NotNull] CSharpCodeWriter writer, [NotNull] CodeGeneratorContext context) : base(writer, context) { _paddingBuilder = new CSharpPaddingBuilder(context.Host); @@ -519,7 +519,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors return RenderPreWriteStart(Writer, Context); } - public static CSharpCodeWriter RenderPreWriteStart(CSharpCodeWriter writer, CodeBuilderContext context) + public static CSharpCodeWriter RenderPreWriteStart(CSharpCodeWriter writer, CodeGeneratorContext context) { if (!string.IsNullOrEmpty(context.TargetWriterName)) { diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpDesignTimeHelpersVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpDesignTimeHelpersVisitor.cs index 79c39d976e..7962742c8f 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpDesignTimeHelpersVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpDesignTimeHelpersVisitor.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors public CSharpDesignTimeHelpersVisitor([NotNull] CSharpCodeVisitor csharpCodeVisitor, [NotNull] CSharpCodeWriter writer, - [NotNull] CodeBuilderContext context) + [NotNull] CodeGeneratorContext context) : base(writer, context) { diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperAttributeValueVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperAttributeValueVisitor.cs index 78be832684..25056f8504 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperAttributeValueVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperAttributeValueVisitor.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors /// /// The used to write code. /// - /// A instance that contains information about the current code generation + /// A instance that contains information about the current code generation /// process. /// /// @@ -35,7 +35,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors /// public CSharpTagHelperAttributeValueVisitor( [NotNull] CSharpCodeWriter writer, - [NotNull] CodeBuilderContext context, + [NotNull] CodeGeneratorContext context, string attributeTypeName) : base(writer, context) { diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs index 9bb42da3a7..de415edcde 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors private bool _foundTagHelpers; public CSharpTagHelperFieldDeclarationVisitor([NotNull] CSharpCodeWriter writer, - [NotNull] CodeBuilderContext context) + [NotNull] CodeGeneratorContext context) : base(writer, context) { _declaredTagHelpers = new HashSet(StringComparer.Ordinal); diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs index cdee32d516..e2b3de5f9f 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs @@ -18,9 +18,9 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors /// Creates a new instance of . /// /// The used to generate code. - /// The . + /// The . public CSharpTagHelperRunnerInitializationVisitor([NotNull] CSharpCodeWriter writer, - [NotNull] CodeBuilderContext context) + [NotNull] CodeGeneratorContext context) : base(writer, context) { _tagHelperContext = Context.Host.GeneratedClassContext.GeneratedTagHelperContext; diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTypeMemberVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTypeMemberVisitor.cs index e31de3c314..b27aade501 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTypeMemberVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTypeMemberVisitor.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors public CSharpTypeMemberVisitor([NotNull] CSharpCodeVisitor csharpCodeVisitor, [NotNull] CSharpCodeWriter writer, - [NotNull] CodeBuilderContext context) + [NotNull] CodeGeneratorContext context) : base(writer, context) { _csharpCodeVisitor = csharpCodeVisitor; diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpUsingVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpUsingVisitor.cs index 9c36ec6875..7ed96e7f61 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpUsingVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpUsingVisitor.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors private bool _foundTagHelpers; - public CSharpUsingVisitor([NotNull] CSharpCodeWriter writer, [NotNull] CodeBuilderContext context) + public CSharpUsingVisitor([NotNull] CSharpCodeWriter writer, [NotNull] CodeGeneratorContext context) : base(writer, context) { ImportedUsings = new List(); diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/ChunkVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/ChunkVisitor.cs index f2737d35dd..e6ed9c35ad 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/ChunkVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/ChunkVisitor.cs @@ -10,14 +10,14 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors public abstract class ChunkVisitor : IChunkVisitor where TWriter : CodeWriter { - public ChunkVisitor([NotNull] TWriter writer, [NotNull] CodeBuilderContext context) + public ChunkVisitor([NotNull] TWriter writer, [NotNull] CodeGeneratorContext context) { Writer = writer; Context = context; } protected TWriter Writer { get; private set; } - protected CodeBuilderContext Context { get; private set; } + protected CodeGeneratorContext Context { get; private set; } public void Accept([NotNull] IList chunks) { diff --git a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CodeVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CodeVisitor.cs index aa2795baf6..d882ee2c49 100644 --- a/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CodeVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CodeVisitor.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors public class CodeVisitor : ChunkVisitor where TWriter : CodeWriter { - public CodeVisitor([NotNull] TWriter writer, [NotNull] CodeBuilderContext context) + public CodeVisitor([NotNull] TWriter writer, [NotNull] CodeGeneratorContext context) : base(writer, context) { } diff --git a/src/Microsoft.AspNet.Razor/GeneratorResults.cs b/src/Microsoft.AspNet.Razor/GeneratorResults.cs index a96f61dd32..23f4a263cc 100644 --- a/src/Microsoft.AspNet.Razor/GeneratorResults.cs +++ b/src/Microsoft.AspNet.Razor/GeneratorResults.cs @@ -19,15 +19,15 @@ namespace Microsoft.AspNet.Razor /// Instantiates a new instance. /// /// The results of parsing a document. - /// The results of generating code for the document. + /// The results of generating code for the document. /// A for the document. public GeneratorResults([NotNull] ParserResults parserResults, - [NotNull] CodeBuilderResult codeBuilderResult, + [NotNull] CodeGeneratorResult codeGeneratorResult, [NotNull] ChunkTree chunkTree) : this(parserResults.Document, parserResults.TagHelperDescriptors, parserResults.ErrorSink, - codeBuilderResult, + codeGeneratorResult, chunkTree) { } @@ -43,17 +43,17 @@ namespace Microsoft.AspNet.Razor /// The used to collect s encountered when parsing the /// current Razor document. /// - /// The results of generating code for the document. + /// The results of generating code for the document. /// A for the document. public GeneratorResults([NotNull] Block document, [NotNull] IEnumerable tagHelperDescriptors, [NotNull] ErrorSink errorSink, - [NotNull] CodeBuilderResult codeBuilderResult, + [NotNull] CodeGeneratorResult codeGeneratorResult, [NotNull] ChunkTree chunkTree) : base(document, tagHelperDescriptors, errorSink) { - GeneratedCode = codeBuilderResult.Code; - DesignTimeLineMappings = codeBuilderResult.DesignTimeLineMappings; + GeneratedCode = codeGeneratorResult.Code; + DesignTimeLineMappings = codeGeneratorResult.DesignTimeLineMappings; ChunkTree = chunkTree; } diff --git a/src/Microsoft.AspNet.Razor/RazorCodeLanguage.cs b/src/Microsoft.AspNet.Razor/RazorCodeLanguage.cs index 86cc0c850e..ce046591d2 100644 --- a/src/Microsoft.AspNet.Razor/RazorCodeLanguage.cs +++ b/src/Microsoft.AspNet.Razor/RazorCodeLanguage.cs @@ -54,6 +54,6 @@ namespace Microsoft.AspNet.Razor /// public abstract RazorChunkGenerator CreateChunkGenerator(string className, string rootNamespaceName, string sourceFileName, RazorEngineHost host); - public abstract CodeBuilder CreateCodeBuilder(CodeBuilderContext chunkGeneratorContext); + public abstract CodeGenerator CreateCodeGenerator(CodeGeneratorContext chunkGeneratorContext); } } diff --git a/src/Microsoft.AspNet.Razor/RazorEngineHost.cs b/src/Microsoft.AspNet.Razor/RazorEngineHost.cs index 3fadd05254..8b240a2df7 100644 --- a/src/Microsoft.AspNet.Razor/RazorEngineHost.cs +++ b/src/Microsoft.AspNet.Razor/RazorEngineHost.cs @@ -204,13 +204,13 @@ namespace Microsoft.AspNet.Razor } /// - /// Gets an instance of the code builder and is provided an opportunity to decorate or replace it + /// Gets an instance of the code generator and is provided an opportunity to decorate or replace it /// - /// The code builder - /// Either the same code builder, after modifications, or a different code builder. - public virtual CodeBuilder DecorateCodeBuilder( - [NotNull] CodeBuilder incomingBuilder, - CodeBuilderContext context) + /// The code generator + /// Either the same code generator, after modifications, or a different code generator. + public virtual CodeGenerator DecorateCodeGenerator( + [NotNull] CodeGenerator incomingBuilder, + CodeGeneratorContext context) { return incomingBuilder; } diff --git a/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs b/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs index e99cf8bdeb..cf01ec7cf8 100644 --- a/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs +++ b/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs @@ -313,17 +313,17 @@ namespace Microsoft.AspNet.Razor var results = parser.Parse(input); // Generate code - var generator = CreateChunkGenerator(className, rootNamespace, sourceFileName); - generator.DesignTimeMode = Host.DesignTimeMode; - generator.Visit(results); + var chunkGenerator = CreateChunkGenerator(className, rootNamespace, sourceFileName); + chunkGenerator.DesignTimeMode = Host.DesignTimeMode; + chunkGenerator.Visit(results); - var codeBuilderContext = new CodeBuilderContext(generator.Context, results.ErrorSink); - codeBuilderContext.Checksum = checksum; - var builder = CreateCodeBuilder(codeBuilderContext); - var builderResult = builder.Build(); + var codeGeneratorContext = new CodeGeneratorContext(chunkGenerator.Context, results.ErrorSink); + codeGeneratorContext.Checksum = checksum; + var codeGenerator = CreateCodeGenerator(codeGeneratorContext); + var codeGeneratorResult = codeGenerator.Generate(); // Collect results and return - return new GeneratorResults(results, builderResult, codeBuilderContext.ChunkTreeBuilder.ChunkTree); + return new GeneratorResults(results, codeGeneratorResult, codeGeneratorContext.ChunkTreeBuilder.ChunkTree); } protected internal virtual RazorChunkGenerator CreateChunkGenerator( @@ -351,9 +351,9 @@ namespace Microsoft.AspNet.Razor return Host.DecorateRazorParser(parser, sourceFileName); } - protected internal virtual CodeBuilder CreateCodeBuilder(CodeBuilderContext context) + protected internal virtual CodeGenerator CreateCodeGenerator(CodeGeneratorContext context) { - return Host.DecorateCodeBuilder(Host.CodeLanguage.CreateCodeBuilder(context), context); + return Host.DecorateCodeGenerator(Host.CodeLanguage.CreateCodeGenerator(context), context); } private static string ComputeChecksum(Stream inputStream) diff --git a/test/Microsoft.AspNet.Razor.Test/CSharpRazorCodeLanguageTest.cs b/test/Microsoft.AspNet.Razor.Test/CSharpRazorCodeLanguageTest.cs index 39fc112139..3f9b01b187 100644 --- a/test/Microsoft.AspNet.Razor.Test/CSharpRazorCodeLanguageTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/CSharpRazorCodeLanguageTest.cs @@ -3,7 +3,6 @@ using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.CodeGeneration; -using Microsoft.AspNet.Razor.CodeGeneration; using Microsoft.AspNet.Razor.Parser; using Xunit; @@ -45,12 +44,12 @@ namespace Microsoft.AspNet.Razor.Test } [Fact] - public void CreateCodeBuilder_ReturnsNewCSharpCodeBuilder() + public void CreateCodeGenerator_ReturnsNewCSharpCodeGenerator() { // Arrange var language = new CSharpRazorCodeLanguage(); var host = new RazorEngineHost(language); - var codeBuilderContext = new CodeBuilderContext( + var codeGeneratorContext = new CodeGeneratorContext( host, "myclass", "myns", @@ -59,10 +58,10 @@ namespace Microsoft.AspNet.Razor.Test errorSink: new ErrorSink()); // Act - var generator = language.CreateCodeBuilder(codeBuilderContext); + var generator = language.CreateCodeGenerator(codeGeneratorContext); // Assert - Assert.IsType(generator); + Assert.IsType(generator); } } } diff --git a/test/Microsoft.AspNet.Razor.Test/Chunks/ChunkVisitorTests.cs b/test/Microsoft.AspNet.Razor.Test/Chunks/ChunkVisitorTests.cs index e32986c169..0481dda2ea 100644 --- a/test/Microsoft.AspNet.Razor.Test/Chunks/ChunkVisitorTests.cs +++ b/test/Microsoft.AspNet.Razor.Test/Chunks/ChunkVisitorTests.cs @@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Razor.Chunks private static Mock> CreateVisitor() { - var codeBuilderContext = new CodeBuilderContext( + var codeGeneratorContext = new CodeGeneratorContext( new RazorEngineHost(new CSharpRazorCodeLanguage()), "myclass", "myns", @@ -37,7 +37,7 @@ namespace Microsoft.AspNet.Razor.Chunks shouldGenerateLinePragmas: false, errorSink: new ErrorSink()); var writer = Mock.Of(); - return new Mock>(writer, codeBuilderContext); + return new Mock>(writer, codeGeneratorContext); } private class MyTestChunk : Chunk diff --git a/test/Microsoft.AspNet.Razor.Test/Chunks/CSharpCodeBuilderTests.cs b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CSharpCodeGeneratorTest.cs similarity index 64% rename from test/Microsoft.AspNet.Razor.Test/Chunks/CSharpCodeBuilderTests.cs rename to test/Microsoft.AspNet.Razor.Test/CodeGeneration/CSharpCodeGeneratorTest.cs index 83128f15a0..08defe8b43 100644 --- a/test/Microsoft.AspNet.Razor.Test/Chunks/CSharpCodeBuilderTests.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CSharpCodeGeneratorTest.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. #if !DNXCORE50 -using Microsoft.AspNet.Razor.CodeGeneration; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Test; using Microsoft.AspNet.Razor.Test.Generator; @@ -10,9 +9,9 @@ using Microsoft.AspNet.Razor.Test.Utils; using Moq; using Xunit; -namespace Microsoft.AspNet.Razor.Chunks +namespace Microsoft.AspNet.Razor.CodeGeneration { - public class CSharpCodeBuilderTests + public class CSharpCodeGeneratorTest { [Fact] public void ChunkTreeWithUsings() @@ -20,25 +19,25 @@ namespace Microsoft.AspNet.Razor.Chunks var syntaxTreeNode = new Mock(new SpanBuilder()); var language = new CSharpRazorCodeLanguage(); var host = new CodeGenTestHost(language); - var codeBuilderContext = new CodeBuilderContext( + var codeGeneratorContext = new CodeGeneratorContext( host, "TestClass", "TestNamespace", "Foo.cs", shouldGenerateLinePragmas: false, errorSink: new ErrorSink()); - codeBuilderContext.ChunkTreeBuilder.AddUsingChunk("FakeNamespace1", syntaxTreeNode.Object); - codeBuilderContext.ChunkTreeBuilder.AddUsingChunk("FakeNamespace2.SubNamespace", syntaxTreeNode.Object); - var codeBuilder = new CodeGenTestCodeBuilder(codeBuilderContext); + codeGeneratorContext.ChunkTreeBuilder.AddUsingChunk("FakeNamespace1", syntaxTreeNode.Object); + codeGeneratorContext.ChunkTreeBuilder.AddUsingChunk("FakeNamespace2.SubNamespace", syntaxTreeNode.Object); + var codeGenerator = new CodeGenTestCodeGenerator(codeGeneratorContext); // Act - var result = codeBuilder.Build(); + var result = codeGenerator.Generate(); BaselineWriter.WriteBaseline( - @"test\Microsoft.AspNet.Razor.Test\TestFiles\CodeGenerator\Output\CSharpCodeBuilder.cs", + @"test\Microsoft.AspNet.Razor.Test\TestFiles\CodeGenerator\Output\CSharpCodeGenerator.cs", result.Code); - var expectedOutput = TestFile.Create("TestFiles/CodeGenerator/Output/CSharpCodeBuilder.cs").ReadAllText(); + var expectedOutput = TestFile.Create("TestFiles/CodeGenerator/Output/CSharpCodeGenerator.cs").ReadAllText(); // Assert Assert.Equal(expectedOutput, result.Code); diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CSharpTagHelperRenderingUnitTest.cs b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CSharpTagHelperRenderingUnitTest.cs index be072c84ac..3b7706cbca 100644 --- a/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CSharpTagHelperRenderingUnitTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CSharpTagHelperRenderingUnitTest.cs @@ -177,19 +177,19 @@ namespace Microsoft.AspNet.Razor.Test.Generator private static TrackingUniqueIdsTagHelperCodeRenderer CreateCodeRenderer() { var writer = new CSharpCodeWriter(); - var codeBuilderContext = CreateContext(); - var visitor = new CSharpCodeVisitor(writer, codeBuilderContext); + var codeGeneratorContext = CreateContext(); + var visitor = new CSharpCodeVisitor(writer, codeGeneratorContext); var codeRenderer = new TrackingUniqueIdsTagHelperCodeRenderer( visitor, writer, - codeBuilderContext); + codeGeneratorContext); visitor.TagHelperRenderer = codeRenderer; return codeRenderer; } - private static CodeBuilderContext CreateContext() + private static CodeGeneratorContext CreateContext() { - return new CodeBuilderContext( + return new CodeGeneratorContext( new ChunkGeneratorContext( new RazorEngineHost(new CSharpRazorCodeLanguage()), "MyClass", @@ -204,7 +204,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator public TrackingUniqueIdsTagHelperCodeRenderer( IChunkVisitor bodyVisitor, CSharpCodeWriter writer, - CodeBuilderContext context) + CodeGeneratorContext context) : base(bodyVisitor, writer, context) { diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestCodeBuilder.cs b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestCodeGenerator.cs similarity index 81% rename from test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestCodeBuilder.cs rename to test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestCodeGenerator.cs index ed128492f3..52cdc7d43d 100644 --- a/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestCodeBuilder.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestCodeGenerator.cs @@ -1,14 +1,13 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.CodeGeneration; namespace Microsoft.AspNet.Razor.Test.Generator { - public class CodeGenTestCodeBuilder : CSharpCodeBuilder + public class CodeGenTestCodeGenerator : CSharpCodeGenerator { - public CodeGenTestCodeBuilder(CodeBuilderContext context) + public CodeGenTestCodeGenerator(CodeGeneratorContext context) : base(context) { } diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestHost.cs b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestHost.cs index f518c3076e..75d6b49d72 100644 --- a/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestHost.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestHost.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.CodeGeneration; namespace Microsoft.AspNet.Razor.Test.Generator @@ -13,15 +12,15 @@ namespace Microsoft.AspNet.Razor.Test.Generator { } - public override CodeBuilder DecorateCodeBuilder(CodeBuilder incomingBuilder, CodeBuilderContext context) + public override CodeGenerator DecorateCodeGenerator(CodeGenerator incomingBuilder, CodeGeneratorContext context) { - if (incomingBuilder is CodeGenTestCodeBuilder) + if (incomingBuilder is CodeGenTestCodeGenerator) { return incomingBuilder; } else { - return new CodeGenTestCodeBuilder(context); + return new CodeGenTestCodeGenerator(context); } } } diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGeneration/RazorChunkGeneratorTest.cs b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/RazorChunkGeneratorTest.cs index 4ff127896f..03b7a42aa6 100644 --- a/test/Microsoft.AspNet.Razor.Test/CodeGeneration/RazorChunkGeneratorTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/RazorChunkGeneratorTest.cs @@ -6,9 +6,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.CodeGeneration; -using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Test.Utils; using Microsoft.AspNet.Testing; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGeneration/TagHelperAttributeValueCodeRendererTest.cs b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/TagHelperAttributeValueCodeRendererTest.cs index 1a581d433e..035565fce2 100644 --- a/test/Microsoft.AspNet.Razor.Test/CodeGeneration/TagHelperAttributeValueCodeRendererTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/TagHelperAttributeValueCodeRendererTest.cs @@ -42,38 +42,38 @@ namespace Microsoft.AspNet.Razor.Test.Generator // Act & Assert RunTagHelperTest(testName: "BasicTagHelpers", - baseLineName: "BasicTagHelpers.CustomAttributeCodeBuilder", + baseLineName: "BasicTagHelpers.CustomAttributeCodeGenerator", tagHelperDescriptors: tagHelperDescriptors, hostConfig: (host) => { - return new CodeBuilderReplacingHost(host); + return new CodeGeneratorReplacingHost(host); }); } - private class CodeBuilderReplacingHost : CodeGenTestHost + private class CodeGeneratorReplacingHost : CodeGenTestHost { - public CodeBuilderReplacingHost(RazorEngineHost originalHost) + public CodeGeneratorReplacingHost(RazorEngineHost originalHost) : base(new CSharpRazorCodeLanguage()) { GeneratedClassContext = originalHost.GeneratedClassContext; } - public override CodeBuilder DecorateCodeBuilder(CodeBuilder incomingBuilder, CodeBuilderContext context) + public override CodeGenerator DecorateCodeGenerator(CodeGenerator incomingBuilder, CodeGeneratorContext context) { - return new AttributeChunkGeneratorReplacingCodeBuilder(context); + return new AttributeChunkGeneratorReplacingCodeGenerator(context); } } - private class AttributeChunkGeneratorReplacingCodeBuilder : TestCSharpCodeBuilder + private class AttributeChunkGeneratorReplacingCodeGenerator : TestCSharpCodeGenerator { - public AttributeChunkGeneratorReplacingCodeBuilder(CodeBuilderContext context) + public AttributeChunkGeneratorReplacingCodeGenerator(CodeGeneratorContext context) : base(context) { } protected override CSharpCodeVisitor CreateCSharpCodeVisitor( CSharpCodeWriter writer, - CodeBuilderContext context) + CodeGeneratorContext context) { var bodyVisitor = base.CreateCSharpCodeVisitor(writer, context); @@ -88,7 +88,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator public override void RenderAttributeValue( TagHelperAttributeDescriptor attributeInfo, CSharpCodeWriter writer, - CodeBuilderContext context, + CodeGeneratorContext context, Action renderAttributeValue, bool complexValue) { diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGeneration/TagHelperTestBase.cs b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/TagHelperTestBase.cs index 4ce3802aab..b9e3bdc7b8 100644 --- a/test/Microsoft.AspNet.Razor.Test/CodeGeneration/TagHelperTestBase.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGeneration/TagHelperTestBase.cs @@ -77,9 +77,9 @@ namespace Microsoft.AspNet.Razor.Test.Generator _tagHelperDescriptors = tagHelperDescriptors; } - protected internal override CodeBuilder CreateCodeBuilder(CodeBuilderContext context) + protected internal override CodeGenerator CreateCodeGenerator(CodeGeneratorContext context) { - return Host.DecorateCodeBuilder(new TestCSharpCodeBuilder(context), context); + return Host.DecorateCodeGenerator(new TestCSharpCodeGenerator(context), context); } protected internal override RazorParser CreateParser(string fileName) @@ -92,15 +92,15 @@ namespace Microsoft.AspNet.Razor.Test.Generator } } - protected class TestCSharpCodeBuilder : CodeGenTestCodeBuilder + protected class TestCSharpCodeGenerator : CodeGenTestCodeGenerator { - public TestCSharpCodeBuilder(CodeBuilderContext context) + public TestCSharpCodeGenerator(CodeGeneratorContext context) : base(context) { } - protected override CSharpCodeVisitor CreateCSharpCodeVisitor(CSharpCodeWriter writer, CodeBuilderContext context) + protected override CSharpCodeVisitor CreateCSharpCodeVisitor(CSharpCodeWriter writer, CodeGeneratorContext context) { var visitor = base.CreateCSharpCodeVisitor(writer, context); visitor.TagHelperRenderer = new NoUniqueIdsTagHelperCodeRenderer(visitor, writer, context); @@ -111,7 +111,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator { public NoUniqueIdsTagHelperCodeRenderer(IChunkVisitor bodyVisitor, CSharpCodeWriter writer, - CodeBuilderContext context) + CodeGeneratorContext context) : base(bodyVisitor, writer, context) { diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/TestSpanBuilder.cs b/test/Microsoft.AspNet.Razor.Test/Framework/TestSpanBuilder.cs index 1d01af7f05..d2b0b81cdf 100644 --- a/test/Microsoft.AspNet.Razor.Test/Framework/TestSpanBuilder.cs +++ b/test/Microsoft.AspNet.Razor.Test/Framework/TestSpanBuilder.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Chunks.Generators; +using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Text; diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs index 30159d5836..1befe99ab6 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Chunks.Generators; +using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Test.Framework; diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs index 54e85983e8..a4dad67b64 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Chunks.Generators; +using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Test.Framework; diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlAttributeTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlAttributeTest.cs index d2a285bb87..ea5b3511f6 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlAttributeTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlAttributeTest.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Linq; -using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Chunks.Generators; +using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Test.Framework; diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlBlockTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlBlockTest.cs index 20ae58c978..b77a209a50 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlBlockTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlBlockTest.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Chunks.Generators; +using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Test.Framework; diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlDocumentTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlDocumentTest.cs index 58311731b3..e3c679ddaa 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlDocumentTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlDocumentTest.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlErrorTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlErrorTest.cs index 8484707a3a..fca6029488 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlErrorTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlErrorTest.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Test.Framework; diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs index ac5eb912fb..5f1ed74197 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Chunks.Generators; +using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Test.Framework; diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlUrlAttributeTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlUrlAttributeTest.cs index 88e0bf7162..2dd7ac6b4a 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlUrlAttributeTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlUrlAttributeTest.cs @@ -1,9 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; -using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Chunks.Generators; +using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Test.Framework; diff --git a/test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.cs b/test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.cs index a09136f5f3..f750a03a77 100644 --- a/test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.cs @@ -103,11 +103,11 @@ namespace Microsoft.AspNet.Razor.Test } [Fact] - public void CreateCodeBuilder_PassesChunkGeneratorThroughDecorateMethodOnHost() + public void CreateCodeGenerator_PassesChunkGeneratorThroughDecorateMethodOnHost() { // Arrange var mockHost = new Mock(new CSharpRazorCodeLanguage()) { CallBase = true }; - var codeBuilderContext = new CodeBuilderContext( + var codeGeneratorContext = new CodeGeneratorContext( mockHost.Object, "different-class", "different-ns", @@ -115,14 +115,14 @@ namespace Microsoft.AspNet.Razor.Test shouldGenerateLinePragmas: true, errorSink: new ErrorSink()); - var expected = new CSharpCodeBuilder(codeBuilderContext); + var expected = new CSharpCodeGenerator(codeGeneratorContext); - mockHost.Setup(h => h.DecorateCodeBuilder(It.IsAny(), codeBuilderContext)) + mockHost.Setup(h => h.DecorateCodeGenerator(It.IsAny(), codeGeneratorContext)) .Returns(expected); var engine = new RazorTemplateEngine(mockHost.Object); // Act - var actual = engine.CreateCodeBuilder(codeBuilderContext); + var actual = engine.CreateCodeGenerator(codeGeneratorContext); // Assert Assert.Equal(expected, actual); diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs index 9d68a04427..462928c08f 100644 --- a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs @@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers resolver.Setup(mock => mock.Resolve(It.IsAny())) .Returns(Enumerable.Empty()); var tagHelperDirectiveSpanVisitor = new TagHelperDirectiveSpanVisitor( - resolver.Object, + resolver.Object, new ErrorSink()); var document = new MarkupBlock( Factory.Code("\"one\"").AsAddTagHelper("one"), @@ -139,8 +139,8 @@ namespace Microsoft.AspNet.Razor.TagHelpers // Assert var directiveDescriptor = Assert.Single(resolver.DirectiveDescriptors); Assert.Equal( - expectedDirectiveDescriptor, - directiveDescriptor, + expectedDirectiveDescriptor, + directiveDescriptor, TagHelperDirectiveDescriptorComparer.Default); } @@ -255,14 +255,14 @@ namespace Microsoft.AspNet.Razor.TagHelpers private class CustomTagHelperDirectiveSpanVisitor : TagHelperDirectiveSpanVisitor { - private Func, + private Func, ErrorSink, TagHelperDescriptorResolutionContext> _replacer; public CustomTagHelperDirectiveSpanVisitor( ITagHelperDescriptorResolver descriptorResolver, - Func, - ErrorSink, + Func, + ErrorSink, TagHelperDescriptorResolutionContext> replacer) : base(descriptorResolver, new ErrorSink()) { diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeBuilder.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs similarity index 100% rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeBuilder.cs rename to test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CSharpCodeBuilder.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CSharpCodeGenerator.cs similarity index 100% rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CSharpCodeBuilder.cs rename to test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CSharpCodeGenerator.cs diff --git a/test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs b/test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs index e66dccb98a..22cfa445f4 100644 --- a/test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs +++ b/test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using Microsoft.AspNet.Razor.Text; using Microsoft.AspNet.Razor.Tokenizer; using Microsoft.AspNet.Razor.Tokenizer.Symbols; diff --git a/test/Microsoft.AspNet.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs b/test/Microsoft.AspNet.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs index c256afa194..1805494780 100644 --- a/test/Microsoft.AspNet.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs +++ b/test/Microsoft.AspNet.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using Microsoft.AspNet.Razor.Text; using Microsoft.AspNet.Razor.Tokenizer; using Microsoft.AspNet.Razor.Tokenizer.Symbols;