Use CodeBuilderContext instead of CodeGeneratorContext.

This commit is contained in:
N. Taylor Mullen 2014-09-23 15:25:33 -07:00
parent be4a6c8d98
commit 24a12ba103
8 changed files with 20 additions and 18 deletions

View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.Razor
private readonly string _activateAttribute; private readonly string _activateAttribute;
public InjectChunkVisitor([NotNull] CSharpCodeWriter writer, public InjectChunkVisitor([NotNull] CSharpCodeWriter writer,
[NotNull] CodeGeneratorContext context, [NotNull] CodeBuilderContext context,
[NotNull] string activateAttributeName) [NotNull] string activateAttributeName)
: base(writer, context) : base(writer, context)
{ {

View File

@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Mvc.Razor
public class ModelChunkVisitor : MvcCSharpCodeVisitor public class ModelChunkVisitor : MvcCSharpCodeVisitor
{ {
public ModelChunkVisitor([NotNull] CSharpCodeWriter writer, public ModelChunkVisitor([NotNull] CSharpCodeWriter writer,
[NotNull] CodeGeneratorContext context) [NotNull] CodeBuilderContext context)
: base(writer, context) : base(writer, context)
{ {
} }

View File

@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Mvc.Razor
public abstract class MvcCSharpChunkVisitor : CodeVisitor<CSharpCodeWriter> public abstract class MvcCSharpChunkVisitor : CodeVisitor<CSharpCodeWriter>
{ {
public MvcCSharpChunkVisitor([NotNull] CSharpCodeWriter writer, public MvcCSharpChunkVisitor([NotNull] CSharpCodeWriter writer,
[NotNull] CodeGeneratorContext context) [NotNull] CodeBuilderContext context)
: base(writer, context) : base(writer, context)
{ {
} }

View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.Razor
private readonly string _defaultModel; private readonly string _defaultModel;
private readonly string _activateAttribute; private readonly string _activateAttribute;
public MvcCSharpCodeBuilder([NotNull] CodeGeneratorContext context, public MvcCSharpCodeBuilder([NotNull] CodeBuilderContext context,
[NotNull] string defaultModel, [NotNull] string defaultModel,
[NotNull] string activateAttribute) [NotNull] string activateAttribute)
: base(context) : base(context)

View File

@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Mvc.Razor
public abstract class MvcCSharpCodeVisitor : MvcCSharpChunkVisitor public abstract class MvcCSharpCodeVisitor : MvcCSharpChunkVisitor
{ {
public MvcCSharpCodeVisitor([NotNull] CSharpCodeWriter writer, public MvcCSharpCodeVisitor([NotNull] CSharpCodeWriter writer,
[NotNull] CodeGeneratorContext context) [NotNull] CodeBuilderContext context)
: base(writer, context) : base(writer, context)
{ {
} }

View File

@ -142,7 +142,7 @@ namespace Microsoft.AspNet.Mvc.Razor
/// <inheritdoc /> /// <inheritdoc />
public override CodeBuilder DecorateCodeBuilder([NotNull] CodeBuilder incomingBuilder, public override CodeBuilder DecorateCodeBuilder([NotNull] CodeBuilder incomingBuilder,
[NotNull] CodeGeneratorContext context) [NotNull] CodeBuilderContext context)
{ {
UpdateCodeBuilder(context); UpdateCodeBuilder(context);
return new MvcCSharpCodeBuilder(context, DefaultModel, ActivateAttribute); return new MvcCSharpCodeBuilder(context, DefaultModel, ActivateAttribute);

View File

@ -142,13 +142,14 @@ MyType1
Assert.Equal(expected, code); Assert.Equal(expected, code);
} }
private static CodeGeneratorContext CreateContext() private static CodeBuilderContext CreateContext()
{ {
return CodeGeneratorContext.Create(new MvcRazorHost(new TestFileSystem()), return new CodeBuilderContext(
"MyClass", new CodeGeneratorContext(new MvcRazorHost(new TestFileSystem()),
"MyNamespace", "MyClass",
string.Empty, "MyNamespace",
shouldGenerateLinePragmas: true); string.Empty,
shouldGenerateLinePragmas: true));
} }
} }
} }

View File

@ -98,13 +98,14 @@ Environment.NewLine +
Assert.Equal(expected, code); Assert.Equal(expected, code);
} }
private static CodeGeneratorContext CreateContext() private static CodeBuilderContext CreateContext()
{ {
return CodeGeneratorContext.Create(new MvcRazorHost(new TestFileSystem()), return new CodeBuilderContext(
"MyClass", new CodeGeneratorContext(new MvcRazorHost(new TestFileSystem()),
"MyNamespace", "MyClass",
string.Empty, "MyNamespace",
shouldGenerateLinePragmas: true); string.Empty,
shouldGenerateLinePragmas: true));
} }
} }
} }