huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
N. Taylor Mullen 2015-05-27 16:21:39 -07:00
parent 5df9b52afe
commit 6df8bc23f1
46 changed files with 131 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNet.Razor/CSharpRazorCodeLanguage.cs
View File

@ -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);
}
}
}

10
src/Microsoft.AspNet.Razor/CodeGeneration/CSharpCodeBuilder.cs → src/Microsoft.AspNet.Razor/CodeGeneration/CSharpCodeGenerator.cs
View File

@ -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);
}

8
src/Microsoft.AspNet.Razor/CodeGeneration/CSharpTagHelperCodeRenderer.cs
View File

@ -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
/// </summary>
/// <param name="bodyVisitor">The <see cref="IChunkVisitor"/> used to render chunks found in the body.</param>
/// <param name="writer">The <see cref="CSharpCodeWriter"/> used to write code.</param>
/// <param name="context">A <see cref="CodeBuilderContext"/> instance that contains information about
/// <param name="context">A <see cref="CodeGeneratorContext"/> instance that contains information about
/// the current code generation process.</param>
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

10
src/Microsoft.AspNet.Razor/CodeGeneration/CodeBuilder.cs → src/Microsoft.AspNet.Razor/CodeGeneration/CodeGenerator.cs
View File

@ -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();
}
}

8
src/Microsoft.AspNet.Razor/CodeGeneration/CodeBuilderContext.cs → src/Microsoft.AspNet.Razor/CodeGeneration/CodeGeneratorContext.cs
View File

@ -8,17 +8,17 @@ namespace Microsoft.AspNet.Razor.CodeGeneration
/// <summary>
/// Context object with information used to generate a Razor page.
/// </summary>
public class CodeBuilderContext : ChunkGeneratorContext
public class CodeGeneratorContext : ChunkGeneratorContext
{
/// <summary>
/// Instantiates a new instance of the <see cref="CodeBuilderContext"/> object.
/// Instantiates a new instance of the <see cref="CodeGeneratorContext"/> object.
/// </summary>
/// <param name="generatorContext">A <see cref="ChunkGeneratorContext"/> to copy information from.</param>
/// <param name="errorSink">
/// The <see cref="ErrorSink"/> used to collect <see cref="RazorError"/>s encountered
/// when parsing the current Razor document.
/// </param>
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,

4
src/Microsoft.AspNet.Razor/CodeGeneration/CodeBuilderResult.cs → src/Microsoft.AspNet.Razor/CodeGeneration/CodeGeneratorResult.cs
View File

@ -5,9 +5,9 @@ using System.Collections.Generic;
namespace Microsoft.AspNet.Razor.CodeGeneration
{
public class CodeBuilderResult
public class CodeGeneratorResult
{
public CodeBuilderResult(string code, IList<LineMapping> designTimeLineMappings)
public CodeGeneratorResult(string code, IList<LineMapping> designTimeLineMappings)
{
Code = code;
DesignTimeLineMappings = designTimeLineMappings;

4
src/Microsoft.AspNet.Razor/CodeGeneration/ExpressionRenderingMode.cs
View File

@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration
/// Indicates that expressions should be written to the output stream
/// </summary>
/// <example>
/// 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);
/// </example>
@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration
/// the code exists will be used to render it
/// </summary>
/// <example>
/// 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
/// </example>

18
src/Microsoft.AspNet.Razor/TagHelpers/TagHelperAttributeValueCodeRenderer.cs → src/Microsoft.AspNet.Razor/CodeGeneration/TagHelperAttributeValueCodeRenderer.cs
View File

@ -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
{
/// <summary>
/// Renders code for tag helper property initialization.
@ -21,7 +20,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers
/// The <see cref="TagHelperAttributeDescriptor"/> to generate code for.
/// </param>
/// <param name="writer">The <see cref="CSharpCodeWriter"/> that's used to write code.</param>
/// <param name="context">A <see cref="ChunkGeneratorContext"/> instance that contains information about
/// <param name="context">A <see cref="Chunks.Generators.ChunkGeneratorContext"/> instance that contains information about
/// the current code generation process.</param>
/// <param name="renderAttributeValue">
/// <see cref="Action"/> that renders the raw value of the HTML attribute.
@ -31,11 +30,12 @@ namespace Microsoft.AspNet.Razor.TagHelpers
/// C# expressions e.g. <c>"PropertyName"</c>. <c>true</c> if the attribute value contain at least one in-line
/// Razor construct e.g. <c>"@(@readonly)"</c>.
/// </param>
public virtual void RenderAttributeValue([NotNull] TagHelperAttributeDescriptor attributeDescriptor,
[NotNull] CSharpCodeWriter writer,
[NotNull] CodeBuilderContext context,
[NotNull] Action<CSharpCodeWriter> renderAttributeValue,
bool complexValue)
public virtual void RenderAttributeValue(
[NotNull] TagHelperAttributeDescriptor attributeDescriptor,
[NotNull] CSharpCodeWriter writer,
[NotNull] CodeGeneratorContext context,
[NotNull] Action<CSharpCodeWriter> renderAttributeValue,
bool complexValue)
{
renderAttributeValue(writer);
}

2
src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpBaseTypeVisitor.cs
View File

@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors
{
public class CSharpBaseTypeVisitor : CodeVisitor<CSharpCodeWriter>
{
public CSharpBaseTypeVisitor([NotNull] CSharpCodeWriter writer, [NotNull] CodeBuilderContext context)
public CSharpBaseTypeVisitor([NotNull] CSharpCodeWriter writer, [NotNull] CodeGeneratorContext context)
: base(writer, context)
{
}

4
src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpCodeVisitor.cs
View File

@ -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))
{

2
src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpDesignTimeHelpersVisitor.cs
View File

@ -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)
{

4
src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperAttributeValueVisitor.cs
View File

@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors
/// </summary>
/// <param name="writer">The <see cref="CSharpCodeWriter"/> used to write code.</param>
/// <param name="context">
/// A <see cref="CodeBuilderContext"/> instance that contains information about the current code generation
/// A <see cref="CodeGeneratorContext"/> instance that contains information about the current code generation
/// process.
/// </param>
/// <param name="attributeTypeName">
@ -35,7 +35,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors
/// </param>
public CSharpTagHelperAttributeValueVisitor(
[NotNull] CSharpCodeWriter writer,
[NotNull] CodeBuilderContext context,
[NotNull] CodeGeneratorContext context,
string attributeTypeName)
: base(writer, context)
{

2
src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs
View File

@ -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<string>(StringComparer.Ordinal);

4
src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs
View File

@ -18,9 +18,9 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors
/// Creates a new instance of <see cref="CSharpTagHelperRunnerInitializationVisitor"/>.
/// </summary>
/// <param name="writer">The <see cref="CSharpCodeWriter"/> used to generate code.</param>
/// <param name="context">The <see cref="CodeBuilderContext"/>.</param>
/// <param name="context">The <see cref="CodeGeneratorContext"/>.</param>
public CSharpTagHelperRunnerInitializationVisitor([NotNull] CSharpCodeWriter writer,
[NotNull] CodeBuilderContext context)
[NotNull] CodeGeneratorContext context)
: base(writer, context)
{
_tagHelperContext = Context.Host.GeneratedClassContext.GeneratedTagHelperContext;

2
src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpTypeMemberVisitor.cs
View File

@ -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;

2
src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CSharpUsingVisitor.cs
View File

@ -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<string>();

4
src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/ChunkVisitor.cs
View File

@ -10,14 +10,14 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors
public abstract class ChunkVisitor<TWriter> : 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<Chunk> chunks)
{

2
src/Microsoft.AspNet.Razor/CodeGeneration/Visitors/CodeVisitor.cs
View File

@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Razor.CodeGeneration.Visitors
public class CodeVisitor<TWriter> : ChunkVisitor<TWriter>
where TWriter : CodeWriter
{
public CodeVisitor([NotNull] TWriter writer, [NotNull] CodeBuilderContext context)
public CodeVisitor([NotNull] TWriter writer, [NotNull] CodeGeneratorContext context)
: base(writer, context)
{
}

14
src/Microsoft.AspNet.Razor/GeneratorResults.cs
View File

@ -19,15 +19,15 @@ namespace Microsoft.AspNet.Razor
/// Instantiates a new <see cref="GeneratorResults"/> instance.
/// </summary>
/// <param name="parserResults">The results of parsing a document.</param>
/// <param name="codeBuilderResult">The results of generating code for the document.</param>
/// <param name="codeGeneratorResult">The results of generating code for the document.</param>
/// <param name="chunkTree">A <see cref="ChunkTree"/> for the document.</param>
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 <see cref="ErrorSink"/> used to collect <see cref="RazorError"/>s encountered when parsing the
/// current Razor document.
/// </param>
/// <param name="codeBuilderResult">The results of generating code for the document.</param>
/// <param name="codeGeneratorResult">The results of generating code for the document.</param>
/// <param name="chunkTree">A <see cref="ChunkTree"/> for the document.</param>
public GeneratorResults([NotNull] Block document,
[NotNull] IEnumerable<TagHelperDescriptor> 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;
}

2
src/Microsoft.AspNet.Razor/RazorCodeLanguage.cs
View File

@ -54,6 +54,6 @@ namespace Microsoft.AspNet.Razor
/// </summary>
public abstract RazorChunkGenerator CreateChunkGenerator(string className, string rootNamespaceName, string sourceFileName, RazorEngineHost host);
public abstract CodeBuilder CreateCodeBuilder(CodeBuilderContext chunkGeneratorContext);
public abstract CodeGenerator CreateCodeGenerator(CodeGeneratorContext chunkGeneratorContext);
}
}

12
src/Microsoft.AspNet.Razor/RazorEngineHost.cs
View File

@ -204,13 +204,13 @@ namespace Microsoft.AspNet.Razor
}
/// <summary>
/// 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
/// </summary>
/// <param name="incomingBuilder">The code builder</param>
/// <returns>Either the same code builder, after modifications, or a different code builder.</returns>
public virtual CodeBuilder DecorateCodeBuilder(
[NotNull] CodeBuilder incomingBuilder,
CodeBuilderContext context)
/// <param name="incomingBuilder">The code generator</param>
/// <returns>Either the same code generator, after modifications, or a different code generator.</returns>
public virtual CodeGenerator DecorateCodeGenerator(
[NotNull] CodeGenerator incomingBuilder,
CodeGeneratorContext context)
{
return incomingBuilder;
}

20
src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs
View File

@ -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)

9
test/Microsoft.AspNet.Razor.Test/CSharpRazorCodeLanguageTest.cs
View File

@ -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<CSharpCodeBuilder>(generator);
Assert.IsType<CSharpCodeGenerator>(generator);
}
}
}

4
test/Microsoft.AspNet.Razor.Test/Chunks/ChunkVisitorTests.cs
View File

@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Razor.Chunks
private static Mock<ChunkVisitor<CodeWriter>> 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<CodeWriter>();
return new Mock<ChunkVisitor<CodeWriter>>(writer, codeBuilderContext);
return new Mock<ChunkVisitor<CodeWriter>>(writer, codeGeneratorContext);
}
private class MyTestChunk : Chunk

19
test/Microsoft.AspNet.Razor.Test/Chunks/CSharpCodeBuilderTests.cs → test/Microsoft.AspNet.Razor.Test/CodeGeneration/CSharpCodeGeneratorTest.cs
View File

@ -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<Span>(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);

12
test/Microsoft.AspNet.Razor.Test/CodeGeneration/CSharpTagHelperRenderingUnitTest.cs
View File

@ -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)
{

5
test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestCodeBuilder.cs → test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestCodeGenerator.cs
View File

@ -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)
{
}

7
test/Microsoft.AspNet.Razor.Test/CodeGeneration/CodeGenTestHost.cs
View File

@ -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);
}
}
}

2
test/Microsoft.AspNet.Razor.Test/CodeGeneration/RazorChunkGeneratorTest.cs
View File

@ -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;

20
test/Microsoft.AspNet.Razor.Test/CodeGeneration/TagHelperAttributeValueCodeRendererTest.cs
View File

@ -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<CSharpCodeWriter> renderAttributeValue,
bool complexValue)
{

12
test/Microsoft.AspNet.Razor.Test/CodeGeneration/TagHelperTestBase.cs
View File

@ -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)
{

2
test/Microsoft.AspNet.Razor.Test/Framework/TestSpanBuilder.cs
View File

@ -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;

2
test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs
View File

@ -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;

2
test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
View File

@ -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;

2
test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlAttributeTest.cs
View File

@ -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;

2
test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlBlockTest.cs
View File

@ -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;

1
test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlDocumentTest.cs
View File

@ -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;

1
test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlErrorTest.cs
View File

@ -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;

2
test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs
View File

@ -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;

3
test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlUrlAttributeTest.cs
View File

@ -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;

10
test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.cs
View File

@ -103,11 +103,11 @@ namespace Microsoft.AspNet.Razor.Test
}
[Fact]
public void CreateCodeBuilder_PassesChunkGeneratorThroughDecorateMethodOnHost()
public void CreateCodeGenerator_PassesChunkGeneratorThroughDecorateMethodOnHost()
{
// Arrange
var mockHost = new Mock<RazorEngineHost>(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<CSharpCodeBuilder>(), codeBuilderContext))
mockHost.Setup(h => h.DecorateCodeGenerator(It.IsAny<CSharpCodeGenerator>(), 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);

12
test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
View File

@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers
resolver.Setup(mock => mock.Resolve(It.IsAny<TagHelperDescriptorResolutionContext>()))
.Returns(Enumerable.Empty<TagHelperDescriptor>());
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<IEnumerable<TagHelperDirectiveDescriptor>,
private Func<IEnumerable<TagHelperDirectiveDescriptor>,
ErrorSink,
TagHelperDescriptorResolutionContext> _replacer;
public CustomTagHelperDirectiveSpanVisitor(
ITagHelperDescriptorResolver descriptorResolver,
Func<IEnumerable<TagHelperDirectiveDescriptor>,
ErrorSink,
Func<IEnumerable<TagHelperDirectiveDescriptor>,
ErrorSink,
TagHelperDescriptorResolutionContext> replacer)
: base(descriptorResolver, new ErrorSink())
{

0
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeBuilder.cs → test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs
View File

0
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CSharpCodeBuilder.cs → test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CSharpCodeGenerator.cs
View File

1
test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs
View File

@ -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;

1
test/Microsoft.AspNet.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs
View File

@ -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;