diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/ExpressionChunk.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/ExpressionChunk.cs index 5b17aec8d1..e97ca0e1d9 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/ExpressionChunk.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/ExpressionChunk.cs @@ -3,7 +3,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler { public class ExpressionChunk : Chunk { - public Snippet Code { get; set; } + public string Code { get; set; } public ExpressionRenderingMode RenderingMode { get; set; } public override string ToString() diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/LiteralCodeAttributeChunk.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/LiteralCodeAttributeChunk.cs index ef487b6413..68adc64089 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/LiteralCodeAttributeChunk.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/LiteralCodeAttributeChunk.cs @@ -4,7 +4,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler { public class LiteralCodeAttributeChunk : ChunkBlock { - public Snippet Code { get; set; } + public string Code { get; set; } public LocationTagged Prefix { get; set; } public LocationTagged Value { get; set; } public SourceLocation ValueLocation { get; set; } diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/StatementChunk.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/StatementChunk.cs index bcaca10ca0..5ca04700b4 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/StatementChunk.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/StatementChunk.cs @@ -3,7 +3,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler { public class StatementChunk : Chunk { - public Snippets Code { get; set; } + public string Code { get; set; } public override string ToString() { diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/TypeMemberChunk.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/TypeMemberChunk.cs index 5147003074..bc17bd58e7 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/TypeMemberChunk.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Chunks/TypeMemberChunk.cs @@ -3,6 +3,6 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler { public class TypeMemberChunk : Chunk { - public Snippets Code { get; set; } + public string Code { get; set; } } } diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/CodeTreeBuilder.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/CodeTreeBuilder.cs index 3426f42365..5ca018540c 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/CodeTreeBuilder.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/CodeTreeBuilder.cs @@ -55,7 +55,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler { AddChunk(new ExpressionChunk { - Code = new Snippet(expression), + Code = expression, RenderingMode = renderingMode }, association, context); } @@ -64,7 +64,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler { AddChunk(new StatementChunk { - Code = new Snippets(code), + Code = code, }, association, context); } @@ -80,7 +80,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler { AddChunk(new TypeMemberChunk { - Code = new Snippets(code), + Code = code, }, association, context, topLevel: true); } @@ -88,7 +88,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler { AddChunk(new LiteralCodeAttributeChunk { - Code = new Snippet(code), + Code = code, }, association, context); } diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Snippet.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Snippet.cs deleted file mode 100644 index 9ea8db211f..0000000000 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Snippet.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Microsoft.AspNet.Razor.Text; - -namespace Microsoft.AspNet.Razor.Generator.Compiler -{ - public class Snippet - { - public Snippet() {} - - public Snippet(string value) - { - Value = value; - } - - public string Value { get; set; } - public SourceSpan View { get; set; } - } -} diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Snippets.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Snippets.cs deleted file mode 100644 index 5bf3f10233..0000000000 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeTree/Snippets.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections.Generic; -using System.Linq; - -namespace Microsoft.AspNet.Razor.Generator.Compiler -{ - public class Snippets : List - { - public Snippets() {} - - public Snippets(int capacity) - : base(capacity) {} - - public Snippets(IEnumerable collection) - : base(collection) {} - - public Snippets(Snippets collection) - : base(collection) {} - - public Snippets(string value) - : base(new[] { new Snippet { Value = value } }) {} - - public override string ToString() - { - return string.Concat(this.Select(s => s.Value).ToArray()); - } - } -}