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

Unnest IntermediateToken.TokenKind

This commit is contained in:
Ajay Bhargav Baaskaran 2017-07-06 11:15:36 -07:00
parent 03c92fe36b
commit 11c5293862
20 changed files with 94 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/AssemblyAttributeInjectionPass.cs
View File

@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var pageAttribute = new CSharpCodeIntermediateNode(); var pageAttribute = new CSharpCodeIntermediateNode();
pageAttribute.Children.Add(new IntermediateToken() pageAttribute.Children.Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = attribute, Content = attribute,
}); });

4
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs
View File

@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var beginNode = new CSharpCodeIntermediateNode(); var beginNode = new CSharpCodeIntermediateNode();
beginNode.Children.Add(new IntermediateToken() beginNode.Children.Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = string.Format("{0}({1}, {2}, {3});", Content = string.Format("{0}({1}, {2}, {3});",
beginContextMethodName, beginContextMethodName,
item.Source.AbsoluteIndex.ToString(CultureInfo.InvariantCulture), item.Source.AbsoluteIndex.ToString(CultureInfo.InvariantCulture),
@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var endNode = new CSharpCodeIntermediateNode(); var endNode = new CSharpCodeIntermediateNode();
endNode.Children.Add(new IntermediateToken() endNode.Children.Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = string.Format("{0}();", endContextMethodName) Content = string.Format("{0}();", endContextMethodName)
}); });

6
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelExpressionPass.cs
View File

@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
expression.Children.Add(new IntermediateToken() expression.Children.Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = "ModelExpressionProvider.CreateModelExpression(ViewData, __model => ", Content = "ModelExpressionProvider.CreateModelExpression(ViewData, __model => ",
}); });
@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
expression.Children.Add(new IntermediateToken() expression.Children.Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = "__model." Content = "__model."
}); });
@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
expression.Children.Add(new IntermediateToken() expression.Children.Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = ")", Content = ")",
}); });

4
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs
View File

@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var vddProperty = new CSharpCodeIntermediateNode(); var vddProperty = new CSharpCodeIntermediateNode();
vddProperty.Children.Add(new IntermediateToken() vddProperty.Children.Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = $"public {viewDataType} ViewData => ({viewDataType})PageContext?.ViewData;", Content = $"public {viewDataType} ViewData => ({viewDataType})PageContext?.ViewData;",
}); });
@class.Children.Add(vddProperty); @class.Children.Add(vddProperty);
@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var modelProperty = new CSharpCodeIntermediateNode(); var modelProperty = new CSharpCodeIntermediateNode();
modelProperty.Children.Add(new IntermediateToken() modelProperty.Children.Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = $"public {modelType} Model => ViewData.Model;", Content = $"public {modelType} Model => ViewData.Model;",
}); });
@class.Children.Add(modelProperty); @class.Children.Add(modelProperty);

2
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs
View File

@ -148,7 +148,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var code = new CSharpCodeIntermediateNode(); var code = new CSharpCodeIntermediateNode();
code.Children.Add(new IntermediateToken() code.Children.Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = writer.GenerateCode() Content = writer.GenerateCode()
}); });

10
src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs
View File

@ -440,7 +440,7 @@ namespace Microsoft.AspNetCore.Razor.Language
_builder.Add(new IntermediateToken() _builder.Add(new IntermediateToken()
{ {
Content = chunkGenerator.Value, Content = chunkGenerator.Value,
Kind = IntermediateToken.TokenKind.Html, Kind = TokenKind.Html,
Source = valueSpan Source = valueSpan
}); });
@ -525,7 +525,7 @@ namespace Microsoft.AspNetCore.Razor.Language
_builder.Add(new IntermediateToken() _builder.Add(new IntermediateToken()
{ {
Content = span.Content, Content = span.Content,
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Source = BuildSourceSpanFromNode(span), Source = BuildSourceSpanFromNode(span),
}); });
} }
@ -546,7 +546,7 @@ namespace Microsoft.AspNetCore.Razor.Language
_builder.Add(new IntermediateToken() _builder.Add(new IntermediateToken()
{ {
Content = span.Content, Content = span.Content,
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Source = BuildSourceSpanFromNode(span), Source = BuildSourceSpanFromNode(span),
}); });
@ -601,7 +601,7 @@ namespace Microsoft.AspNetCore.Razor.Language
_builder.Add(new IntermediateToken() _builder.Add(new IntermediateToken()
{ {
Content = span.Content, Content = span.Content,
Kind = IntermediateToken.TokenKind.Html, Kind = TokenKind.Html,
Source = source, Source = source,
}); });
@ -652,7 +652,7 @@ namespace Microsoft.AspNetCore.Razor.Language
node.Children.Add(new IntermediateToken() node.Children.Add(new IntermediateToken()
{ {
Content = span.Content, Content = span.Content,
Kind = IntermediateToken.TokenKind.Html, Kind = TokenKind.Html,
Source = BuildSourceSpanFromNode(span), Source = BuildSourceSpanFromNode(span),
}); });

6
src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectivePass.cs
View File

@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
{ {
new IntermediateToken() new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = "#pragma warning disable 0414", Content = "#pragma warning disable 0414",
} }
} }
@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
{ {
new IntermediateToken() new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = $"private static {typeof(object).FullName} {DesignTimeVariable} = null;", Content = $"private static {typeof(object).FullName} {DesignTimeVariable} = null;",
} }
} }
@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
{ {
new IntermediateToken() new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = "#pragma warning restore 0414", Content = "#pragma warning restore 0414",
} }
} }

7
src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateToken.cs
View File

@ -26,13 +26,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
visitor.VisitToken(this); visitor.VisitToken(this);
} }
public enum TokenKind
{
Unknown,
CSharp,
Html,
}
} }
} }

12
src/Microsoft.AspNetCore.Razor.Language/Intermediate/TokenKind.cs Normal file
View File

@ -0,0 +1,12 @@
// 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.
namespace Microsoft.AspNetCore.Razor.Language.Intermediate
{
public enum TokenKind
{
Unknown,
CSharp,
Html,
}
}

8
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/AssemblyAttributeInjectionPassTest.cs
View File

@ -187,7 +187,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
{ {
var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node); var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children)); var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
Assert.Equal(IntermediateToken.TokenKind.CSharp, token.Kind); Assert.Equal(TokenKind.CSharp, token.Kind);
Assert.Equal(expectedAttribute, token.Content); Assert.Equal(expectedAttribute, token.Content);
}, },
node => Assert.Same(@namespace, node)); node => Assert.Same(@namespace, node));
@ -238,7 +238,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
{ {
var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node); var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children)); var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
Assert.Equal(IntermediateToken.TokenKind.CSharp, token.Kind); Assert.Equal(TokenKind.CSharp, token.Kind);
Assert.Equal(expectedAttribute, token.Content); Assert.Equal(expectedAttribute, token.Content);
}, },
node => Assert.Same(@namespace, node)); node => Assert.Same(@namespace, node));
@ -296,7 +296,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
{ {
var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node); var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children)); var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
Assert.Equal(IntermediateToken.TokenKind.CSharp, token.Kind); Assert.Equal(TokenKind.CSharp, token.Kind);
Assert.Equal(expectedAttribute, token.Content); Assert.Equal(expectedAttribute, token.Content);
}, },
node => Assert.Same(@namespace, node)); node => Assert.Same(@namespace, node));
@ -348,7 +348,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
{ {
var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node); var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children)); var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
Assert.Equal(IntermediateToken.TokenKind.CSharp, token.Kind); Assert.Equal(TokenKind.CSharp, token.Kind);
Assert.Equal(expectedAttribute, token.Content); Assert.Equal(expectedAttribute, token.Content);
}, },
node => Assert.Same(@namespace, node)); node => Assert.Same(@namespace, node));

2
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InjectDirectiveTest.cs
View File

@ -203,7 +203,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
for (var i = 0; i < node.Children.Count; i++) for (var i = 0; i < node.Children.Count; i++)
{ {
var child = node.Children[i] as IntermediateToken; var child = node.Children[i] as IntermediateToken;
if (child.Kind == IntermediateToken.TokenKind.CSharp) if (child.Kind == TokenKind.CSharp)
{ {
builder.Append(child.Content); builder.Append(child.Content);
} }

12
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs
View File

@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "Hi", Content = "Hi",
Kind = IntermediateToken.TokenKind.Html, Kind = TokenKind.Html,
Source = CreateSource(1) Source = CreateSource(1)
}); });
builder.Pop(); builder.Pop();
@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "Hi", Content = "Hi",
Kind = IntermediateToken.TokenKind.Html, Kind = TokenKind.Html,
}); });
builder.Pop(); builder.Pop();
@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "Hi", Content = "Hi",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
var pass = new InstrumentationPass() var pass = new InstrumentationPass()
@ -115,7 +115,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "Hi", Content = "Hi",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
var pass = new InstrumentationPass() var pass = new InstrumentationPass()
@ -150,7 +150,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "Hi", Content = "Hi",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
var pass = new InstrumentationPass() var pass = new InstrumentationPass()
@ -197,7 +197,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "Hi", Content = "Hi",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
var pass = new InstrumentationPass() var pass = new InstrumentationPass()

2
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelDirectiveTest.cs
View File

@ -275,7 +275,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
for (var i = 0; i < node.Children.Count; i++) for (var i = 0; i < node.Children.Count; i++)
{ {
var child = node.Children[i] as IntermediateToken; var child = node.Children[i] as IntermediateToken;
if (child.Kind == IntermediateToken.TokenKind.CSharp) if (child.Kind == TokenKind.CSharp)
{ {
builder.Append(child.Content); builder.Append(child.Content);
} }

6
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelExpressionPassTest.cs
View File

@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Bar)", GetCSharpContent(expression)); Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Bar)", GetCSharpContent(expression));
var originalNode = Assert.IsType<IntermediateToken>(expression.Children[2]); var originalNode = Assert.IsType<IntermediateToken>(expression.Children[2]);
Assert.Equal(IntermediateToken.TokenKind.CSharp, originalNode.Kind); Assert.Equal(TokenKind.CSharp, originalNode.Kind);
Assert.Equal("Bar", originalNode.Content); Assert.Equal("Bar", originalNode.Content);
Assert.Equal(new SourceSpan("test.cshtml", 51, 1, 8, 3), originalNode.Source.Value); Assert.Equal(new SourceSpan("test.cshtml", 51, 1, 8, 3), originalNode.Source.Value);
} }
@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => Bar)", GetCSharpContent(expression)); Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => Bar)", GetCSharpContent(expression));
var originalNode = Assert.IsType<IntermediateToken>(expression.Children[1]); var originalNode = Assert.IsType<IntermediateToken>(expression.Children[1]);
Assert.Equal(IntermediateToken.TokenKind.CSharp, originalNode.Kind); Assert.Equal(TokenKind.CSharp, originalNode.Kind);
Assert.Equal("Bar", originalNode.Content); Assert.Equal("Bar", originalNode.Content);
Assert.Equal(new SourceSpan("test.cshtml", 52, 1, 9, 3), originalNode.Source.Value); Assert.Equal(new SourceSpan("test.cshtml", 52, 1, 9, 3), originalNode.Source.Value);
} }
@ -186,7 +186,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
for (var i = 0; i < node.Children.Count; i++) for (var i = 0; i < node.Children.Count; i++)
{ {
var child = node.Children[i] as IntermediateToken; var child = node.Children[i] as IntermediateToken;
if (child.Kind == IntermediateToken.TokenKind.CSharp) if (child.Kind == TokenKind.CSharp)
{ {
builder.Append(child.Content); builder.Append(child.Content);
} }

8
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs
View File

@ -119,7 +119,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
", ",
tokenNode.Content, tokenNode.Content,
ignoreLineEndingDifferences: true); ignoreLineEndingDifferences: true);
Assert.Equal(IntermediateToken.TokenKind.CSharp, tokenNode.Kind); Assert.Equal(TokenKind.CSharp, tokenNode.Kind);
} }
[Fact] [Fact]
@ -191,7 +191,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
", ",
tokenNode.Content, tokenNode.Content,
ignoreLineEndingDifferences: true); ignoreLineEndingDifferences: true);
Assert.Equal(IntermediateToken.TokenKind.CSharp, tokenNode.Kind); Assert.Equal(TokenKind.CSharp, tokenNode.Kind);
} }
[Fact] [Fact]
@ -274,7 +274,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
", ",
tokenNode.Content, tokenNode.Content,
ignoreLineEndingDifferences: true); ignoreLineEndingDifferences: true);
Assert.Equal(IntermediateToken.TokenKind.CSharp, tokenNode.Kind); Assert.Equal(TokenKind.CSharp, tokenNode.Kind);
} }
private RazorCodeDocument CreateDocument(string content) private RazorCodeDocument CreateDocument(string content)
@ -335,7 +335,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
for (var i = 0; i < node.Children.Count; i++) for (var i = 0; i < node.Children.Count; i++)
{ {
var child = node.Children[i] as IntermediateToken; var child = node.Children[i] as IntermediateToken;
if (child.Kind == IntermediateToken.TokenKind.CSharp) if (child.Kind == TokenKind.CSharp)
{ {
builder.Append(child.Content); builder.Append(child.Content);
} }

22
test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeNodeWriterTest.cs
View File

@ -81,7 +81,7 @@ using System;
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "i++", Content = "i++",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
// Act // Act
@ -111,7 +111,7 @@ using System;
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "i++", Content = "i++",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
// Act // Act
@ -142,13 +142,13 @@ __o = i++;
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "i", Content = "i",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
builder.Add(new MyExtensionIntermediateNode()); builder.Add(new MyExtensionIntermediateNode());
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "++", Content = "++",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
// Act // Act
@ -179,13 +179,13 @@ __o = i++;
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "i", Content = "i",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
builder.Add(new MyExtensionIntermediateNode()); builder.Add(new MyExtensionIntermediateNode());
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "++", Content = "++",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
// Act // Act
@ -216,7 +216,7 @@ __o = i++;
IntermediateNodeBuilder.Create(node) IntermediateNodeBuilder.Create(node)
.Add(new IntermediateToken() .Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = " \t" Content = " \t"
}); });
@ -242,7 +242,7 @@ __o = i++;
IntermediateNodeBuilder.Create(node) IntermediateNodeBuilder.Create(node)
.Add(new IntermediateToken() .Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = " " Content = " "
}); });
@ -269,7 +269,7 @@ __o = i++;
IntermediateNodeBuilder.Create(node) IntermediateNodeBuilder.Create(node)
.Add(new IntermediateToken() .Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = "if (true) { }" Content = "if (true) { }"
}); });
@ -299,7 +299,7 @@ __o = i++;
IntermediateNodeBuilder.Create(node) IntermediateNodeBuilder.Create(node)
.Add(new IntermediateToken() .Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = "if (true) { }", Content = "if (true) { }",
}); });
@ -333,7 +333,7 @@ if (true) { }
IntermediateNodeBuilder.Create(node) IntermediateNodeBuilder.Create(node)
.Add(new IntermediateToken() .Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = " if (true) { }", Content = " if (true) { }",
}); });

2
test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/LiteralRuntimeNodeWriterTest.cs
View File

@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "i++", Content = "i++",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
// Act // Act

24
test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeNodeWriterTest.cs
View File

@ -81,7 +81,7 @@ using System;
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "i++", Content = "i++",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
// Act // Act
@ -115,7 +115,7 @@ using System;
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "i++", Content = "i++",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
// Act // Act
@ -150,13 +150,13 @@ Test(i++);
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "i", Content = "i",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
builder.Add(new MyExtensionIntermediateNode()); builder.Add(new MyExtensionIntermediateNode());
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "++", Content = "++",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
// Act // Act
@ -191,13 +191,13 @@ Test(i++);
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "i", Content = "i",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
builder.Add(new MyExtensionIntermediateNode()); builder.Add(new MyExtensionIntermediateNode());
builder.Add(new IntermediateToken() builder.Add(new IntermediateToken()
{ {
Content = "++", Content = "++",
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
}); });
// Act // Act
@ -229,7 +229,7 @@ Test(i++);
IntermediateNodeBuilder.Create(node) IntermediateNodeBuilder.Create(node)
.Add(new IntermediateToken() .Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = " \t" Content = " \t"
}); });
@ -253,7 +253,7 @@ Test(i++);
IntermediateNodeBuilder.Create(node) IntermediateNodeBuilder.Create(node)
.Add(new IntermediateToken() .Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = "if (true) { }" Content = "if (true) { }"
}); });
@ -284,7 +284,7 @@ Test(i++);
IntermediateNodeBuilder.Create(node) IntermediateNodeBuilder.Create(node)
.Add(new IntermediateToken() .Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = "if (true) { }", Content = "if (true) { }",
}); });
@ -319,7 +319,7 @@ if (true) { }
IntermediateNodeBuilder.Create(node) IntermediateNodeBuilder.Create(node)
.Add(new IntermediateToken() .Add(new IntermediateToken()
{ {
Kind = IntermediateToken.TokenKind.CSharp, Kind = TokenKind.CSharp,
Content = " if (true) { }", Content = " if (true) { }",
}); });
@ -351,7 +351,7 @@ if (true) { }
node.Children.Add(new IntermediateToken() node.Children.Add(new IntermediateToken()
{ {
Content = "SomeContent", Content = "SomeContent",
Kind = IntermediateToken.TokenKind.Html, Kind = TokenKind.Html,
}); });
// Act // Act
@ -378,7 +378,7 @@ if (true) { }
node.Children.Add(new IntermediateToken() node.Children.Add(new IntermediateToken()
{ {
Content = new string('*', 2000), Content = new string('*', 2000),
Kind = IntermediateToken.TokenKind.Html, Kind = TokenKind.Html,
}); });
// Act // Act

36
test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DefaultTagHelperTargetExtensionTest.cs
View File

@ -255,11 +255,11 @@ __tagHelperExecutionContext = __tagHelperScopeManager.End();
{ {
new HtmlAttributeValueIntermediateNode() new HtmlAttributeValueIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.Html, Content = "Blah-" } } Children = { new IntermediateToken { Kind = TokenKind.Html, Content = "Blah-" } }
}, },
new CSharpCodeAttributeValueIntermediateNode() new CSharpCodeAttributeValueIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "\"Foo\"", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "\"Foo\"", } },
} }
} }
}; };
@ -295,7 +295,7 @@ Render Children
{ {
new HtmlAttributeIntermediateNode() new HtmlAttributeIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.Html, Content = "\"value\"", } }, Children = { new IntermediateToken { Kind = TokenKind.Html, Content = "\"value\"", } },
} }
} }
}; };
@ -333,11 +333,11 @@ __tagHelperExecutionContext.AddHtmlAttribute(""name"", Html.Raw(__tagHelperStrin
{ {
new HtmlAttributeValueIntermediateNode() new HtmlAttributeValueIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.Html, Content = "Blah-" } } Children = { new IntermediateToken { Kind = TokenKind.Html, Content = "Blah-" } }
}, },
new CSharpCodeAttributeValueIntermediateNode() new CSharpCodeAttributeValueIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "\"Foo\"", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "\"Foo\"", } },
} }
} }
}; };
@ -380,7 +380,7 @@ EndAddHtmlAttributeValues(__tagHelperExecutionContext);
{ {
new HtmlContentIntermediateNode() new HtmlContentIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.Html, Content = "value", } }, Children = { new IntermediateToken { Kind = TokenKind.Html, Content = "value", } },
} }
} }
}; };
@ -421,7 +421,7 @@ __InputTagHelper.StringProp = ""value"";
{ {
new CSharpExpressionIntermediateNode() new CSharpExpressionIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "\"3+5\"", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "\"3+5\"", } },
} }
} }
}; };
@ -463,7 +463,7 @@ __InputTagHelper.StringProp = string.Empty;
{ {
new CSharpExpressionIntermediateNode() new CSharpExpressionIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "32", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
} }
} }
}; };
@ -551,7 +551,7 @@ __InputTagHelper.IntProp = 32;
{ {
new CSharpExpressionIntermediateNode() new CSharpExpressionIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "32", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
} }
} }
}; };
@ -592,7 +592,7 @@ __InputTagHelper.IntProp = 32;
{ {
new CSharpExpressionIntermediateNode() new CSharpExpressionIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "32", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
} }
} }
}; };
@ -636,7 +636,7 @@ __InputTagHelper.IntIndexer[""bound""] = 32;
{ {
new CSharpExpressionIntermediateNode() new CSharpExpressionIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "32", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
} }
} }
}; };
@ -676,7 +676,7 @@ __InputTagHelper.IntIndexer[""bound""] = 32;
{ {
new HtmlContentIntermediateNode() new HtmlContentIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.Html, Content = "\"value\"", } }, Children = { new IntermediateToken { Kind = TokenKind.Html, Content = "\"value\"", } },
} }
} }
}; };
@ -723,7 +723,7 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.St
{ {
new CSharpExpressionIntermediateNode() new CSharpExpressionIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "32", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
} }
}, },
}; };
@ -812,7 +812,7 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.In
{ {
new CSharpExpressionIntermediateNode() new CSharpExpressionIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "32", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
} }
} }
}; };
@ -854,7 +854,7 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.In
{ {
new CSharpExpressionIntermediateNode() new CSharpExpressionIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "32", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
} }
} }
}; };
@ -904,7 +904,7 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelpe
{ {
new CSharpExpressionIntermediateNode() new CSharpExpressionIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "17", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "17", } },
} }
} }
}; };
@ -922,7 +922,7 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelpe
{ {
new CSharpExpressionIntermediateNode() new CSharpExpressionIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "32", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
} }
} }
}; };
@ -968,7 +968,7 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelpe
{ {
new CSharpExpressionIntermediateNode() new CSharpExpressionIntermediateNode()
{ {
Children = { new IntermediateToken { Kind = IntermediateToken.TokenKind.CSharp, Content = "32", } }, Children = { new IntermediateToken { Kind = TokenKind.CSharp, Content = "32", } },
} }
} }
}; };

8
test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs
View File

@ -102,7 +102,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
for (var i = 0; i < html.Children.Count; i++) for (var i = 0; i < html.Children.Count; i++)
{ {
var token = Assert.IsType<IntermediateToken>(html.Children[i]); var token = Assert.IsType<IntermediateToken>(html.Children[i]);
Assert.Equal(IntermediateToken.TokenKind.Html, token.Kind); Assert.Equal(TokenKind.Html, token.Kind);
content.Append(token.Content); content.Append(token.Content);
} }
@ -123,7 +123,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
for (var i = 0; i < statement.Children.Count; i++) for (var i = 0; i < statement.Children.Count; i++)
{ {
var token = Assert.IsType<IntermediateToken>(statement.Children[i]); var token = Assert.IsType<IntermediateToken>(statement.Children[i]);
Assert.Equal(IntermediateToken.TokenKind.CSharp, token.Kind); Assert.Equal(TokenKind.CSharp, token.Kind);
content.Append(token.Content); content.Append(token.Content);
} }
@ -256,7 +256,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
for (var i = 0; i < cSharp.Children.Count; i++) for (var i = 0; i < cSharp.Children.Count; i++)
{ {
var token = Assert.IsType<IntermediateToken>(cSharp.Children[i]); var token = Assert.IsType<IntermediateToken>(cSharp.Children[i]);
Assert.Equal(IntermediateToken.TokenKind.CSharp, token.Kind); Assert.Equal(TokenKind.CSharp, token.Kind);
content.Append(token.Content); content.Append(token.Content);
} }
@ -298,7 +298,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
for (var i = 0; i < endNode.Children.Count; i++) for (var i = 0; i < endNode.Children.Count; i++)
{ {
var token = Assert.IsType<IntermediateToken>(endNode.Children[i]); var token = Assert.IsType<IntermediateToken>(endNode.Children[i]);
Assert.Equal(IntermediateToken.TokenKind.CSharp, token.Kind); Assert.Equal(TokenKind.CSharp, token.Kind);
content.Append(token.Content); content.Append(token.Content);
} }
Assert.Equal("EndContext();", content.ToString()); Assert.Equal("EndContext();", content.ToString());