From 3afb31b78ba911e0b3e494138c597c810e2f22d9 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 12 Feb 2014 19:21:02 -0800 Subject: [PATCH] Modify SetBaseTYpeCodeGenerator to use value from BaseType instead of parsed content --- .../Generator/SetBaseTypeCodeGenerator.cs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/Microsoft.AspNet.Razor/Generator/SetBaseTypeCodeGenerator.cs b/src/Microsoft.AspNet.Razor/Generator/SetBaseTypeCodeGenerator.cs index 258f75c837..e8aed6bb11 100644 --- a/src/Microsoft.AspNet.Razor/Generator/SetBaseTypeCodeGenerator.cs +++ b/src/Microsoft.AspNet.Razor/Generator/SetBaseTypeCodeGenerator.cs @@ -16,18 +16,13 @@ namespace Microsoft.AspNet.Razor.Generator public string BaseType { get; private set; } - public void GenerateCode(Span target, CodeTreeBuilder codeTreeBuilder, CodeGeneratorContext context) - { - codeTreeBuilder.AddSetBaseTypeChunk(target.Content, target); - } - public override void GenerateCode(Span target, CodeGeneratorContext context) { #if NET45 // No CodeDOM + This code will not be needed once we transition to the CodeTree context.GeneratedClass.BaseTypes.Clear(); - context.GeneratedClass.BaseTypes.Add(new CodeTypeReference(ResolveType(context, BaseType.Trim()))); + context.GeneratedClass.BaseTypes.Add(new CodeTypeReference(BaseType.Trim())); if (context.Host.DesignTimeMode) { @@ -48,14 +43,8 @@ namespace Microsoft.AspNet.Razor.Generator context.AddDesignTimeHelperStatement(stmt); } #endif - // TODO: Make this generate the primary generator - GenerateCode(target, context.CodeTreeBuilder, context); - } - - protected virtual string ResolveType(CodeGeneratorContext context, string baseType) - { - return baseType; + context.CodeTreeBuilder.AddSetBaseTypeChunk(BaseType, target); } public override string ToString()