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

Rename properties on taghelper nodes

This commit is contained in:
Ryan Nowak 2017-07-07 11:32:05 -07:00
parent ff40124594
commit 9c0a8a5c96
18 changed files with 90 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,9 +85,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
// Now i has the right insertion point. // Now i has the right insertion point.
node.Children.Insert(i, new DefaultTagHelperCreateIntermediateNode() node.Children.Insert(i, new DefaultTagHelperCreateIntermediateNode()
{ {
Field = context.GetFieldName(tagHelper), FieldName = context.GetFieldName(tagHelper),
TagHelper = tagHelper, TagHelper = tagHelper,
Type = context.GetFullyQualifiedName(tagHelper), TypeName = context.GetFullyQualifiedName(tagHelper),
}); });
// Now we need to rewrite any set property nodes to use the default runtime. // Now we need to rewrite any set property nodes to use the default runtime.
@ -100,8 +100,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
// that will use our field and property name. // that will use our field and property name.
node.Children[i] = new DefaultTagHelperPropertyIntermediateNode(propertyNode) node.Children[i] = new DefaultTagHelperPropertyIntermediateNode(propertyNode)
{ {
Field = context.GetFieldName(tagHelper), FieldName = context.GetFieldName(tagHelper),
Property = propertyNode.BoundAttribute.GetPropertyName(), PropertyName = propertyNode.BoundAttribute.GetPropertyName(),
}; };
} }
} }

4
src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperCreateIntermediateNode.cs
View File

@ -11,11 +11,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
{ {
public override IntermediateNodeCollection Children { get; } = IntermediateNodeCollection.ReadOnly; public override IntermediateNodeCollection Children { get; } = IntermediateNodeCollection.ReadOnly;
public string Field { get; set; } public string FieldName { get; set; }
public TagHelperDescriptor TagHelper { get; set; } public TagHelperDescriptor TagHelper { get; set; }
public string Type { get; set; } public string TypeName { get; set; }
public override void Accept(IntermediateNodeVisitor visitor) public override void Accept(IntermediateNodeVisitor visitor)
{ {

8
src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperOptimizationPass.cs
View File

@ -151,9 +151,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
// Now i has the right insertion point. // Now i has the right insertion point.
node.Children.Insert(i, new DefaultTagHelperCreateIntermediateNode() node.Children.Insert(i, new DefaultTagHelperCreateIntermediateNode()
{ {
Field = context.GetFieldName(tagHelper), FieldName = context.GetFieldName(tagHelper),
TagHelper = tagHelper, TagHelper = tagHelper,
Type = tagHelper.GetTypeName(), TypeName = tagHelper.GetTypeName(),
}); });
// Next we need to rewrite any property nodes to use the field and property name for this // Next we need to rewrite any property nodes to use the field and property name for this
@ -166,8 +166,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
// This belongs to the current tag helper, replace it. // This belongs to the current tag helper, replace it.
node.Children[i] = new DefaultTagHelperPropertyIntermediateNode(propertyNode) node.Children[i] = new DefaultTagHelperPropertyIntermediateNode(propertyNode)
{ {
Field = context.GetFieldName(tagHelper), FieldName = context.GetFieldName(tagHelper),
Property = propertyNode.BoundAttribute.GetPropertyName(), PropertyName = propertyNode.BoundAttribute.GetPropertyName(),
}; };
} }
} }

4
src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperPropertyIntermediateNode.cs
View File

@ -46,11 +46,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
public BoundAttributeDescriptor BoundAttribute { get; set; } public BoundAttributeDescriptor BoundAttribute { get; set; }
public string Field { get; set; } public string FieldName { get; set; }
public bool IsIndexerNameMatch { get; set; } public bool IsIndexerNameMatch { get; set; }
public string Property { get; set; } public string PropertyName { get; set; }
public TagHelperDescriptor TagHelper { get; set; } public TagHelperDescriptor TagHelper { get; set; }

14
src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperTargetExtension.cs
View File

@ -132,16 +132,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
} }
context.CodeWriter context.CodeWriter
.WriteStartAssignment(node.Field) .WriteStartAssignment(node.FieldName)
.Write(CreateTagHelperMethodName) .Write(CreateTagHelperMethodName)
.WriteLine("<global::" + node.Type + ">();"); .WriteLine("<global::" + node.TypeName + ">();");
if (!DesignTime) if (!DesignTime)
{ {
context.CodeWriter.WriteInstanceMethodInvocation( context.CodeWriter.WriteInstanceMethodInvocation(
ExecutionContextVariableName, ExecutionContextVariableName,
ExecutionContextAddMethodName, ExecutionContextAddMethodName,
node.Field); node.FieldName);
} }
} }
@ -293,9 +293,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
// Throw a reasonable Exception at runtime if the dictionary property is null. // Throw a reasonable Exception at runtime if the dictionary property is null.
context.CodeWriter context.CodeWriter
.Write("if (") .Write("if (")
.Write(node.Field) .Write(node.FieldName)
.Write(".") .Write(".")
.Write(node.Property) .Write(node.PropertyName)
.WriteLine(" == null)"); .WriteLine(" == null)");
using (context.CodeWriter.BuildScope()) using (context.CodeWriter.BuildScope())
{ {
@ -309,7 +309,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
.WriteParameterSeparator() .WriteParameterSeparator()
.WriteStringLiteral(node.TagHelper.GetTypeName()) .WriteStringLiteral(node.TagHelper.GetTypeName())
.WriteParameterSeparator() .WriteParameterSeparator()
.WriteStringLiteral(node.Property) .WriteStringLiteral(node.PropertyName)
.WriteEndMethodInvocation(endLine: false) // End of method call .WriteEndMethodInvocation(endLine: false) // End of method call
.WriteEndMethodInvocation(); // End of new expression / throw statement .WriteEndMethodInvocation(); // End of new expression / throw statement
} }
@ -626,7 +626,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
private static string GetPropertyAccessor(DefaultTagHelperPropertyIntermediateNode node) private static string GetPropertyAccessor(DefaultTagHelperPropertyIntermediateNode node)
{ {
var propertyAccessor = $"{node.Field}.{node.Property}"; var propertyAccessor = $"{node.FieldName}.{node.PropertyName}";
if (node.IsIndexerNameMatch) if (node.IsIndexerNameMatch)
{ {

1
src/Microsoft.AspNetCore.Razor.Language/Extensions/IDesignTimeDirectiveTargetExtension.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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
using Microsoft.AspNetCore.Razor.Language.Intermediate;
namespace Microsoft.AspNetCore.Razor.Language.Extensions namespace Microsoft.AspNetCore.Razor.Language.Extensions
{ {

8
src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedAttributeTargetExtension.cs
View File

@ -97,9 +97,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
// Throw a reasonable Exception at runtime if the dictionary property is null. // Throw a reasonable Exception at runtime if the dictionary property is null.
context.CodeWriter context.CodeWriter
.Write("if (") .Write("if (")
.Write(node.Field) .Write(node.FieldName)
.Write(".") .Write(".")
.Write(node.Property) .Write(node.PropertyName)
.WriteLine(" == null)"); .WriteLine(" == null)");
using (context.CodeWriter.BuildScope()) using (context.CodeWriter.BuildScope())
{ {
@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
.WriteParameterSeparator() .WriteParameterSeparator()
.WriteStringLiteral(node.TagHelper.GetTypeName()) .WriteStringLiteral(node.TagHelper.GetTypeName())
.WriteParameterSeparator() .WriteParameterSeparator()
.WriteStringLiteral(node.Property) .WriteStringLiteral(node.PropertyName)
.WriteEndMethodInvocation(endLine: false) // End of method call .WriteEndMethodInvocation(endLine: false) // End of method call
.WriteEndMethodInvocation(); // End of new expression / throw statement .WriteEndMethodInvocation(); // End of new expression / throw statement
} }
@ -153,7 +153,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
private static string GetPropertyAccessor(PreallocatedTagHelperPropertyIntermediateNode node) private static string GetPropertyAccessor(PreallocatedTagHelperPropertyIntermediateNode node)
{ {
var propertyAccessor = $"{node.Field}.{node.Property}"; var propertyAccessor = $"{node.FieldName}.{node.PropertyName}";
if (node.IsIndexerNameMatch) if (node.IsIndexerNameMatch)
{ {

8
src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs
View File

@ -23,9 +23,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
AttributeName = propertyNode.AttributeName; AttributeName = propertyNode.AttributeName;
AttributeStructure = propertyNode.AttributeStructure; AttributeStructure = propertyNode.AttributeStructure;
BoundAttribute = propertyNode.BoundAttribute; BoundAttribute = propertyNode.BoundAttribute;
Field = propertyNode.Field; FieldName = propertyNode.FieldName;
IsIndexerNameMatch = propertyNode.IsIndexerNameMatch; IsIndexerNameMatch = propertyNode.IsIndexerNameMatch;
Property = propertyNode.Property; PropertyName = propertyNode.PropertyName;
Source = propertyNode.Source; Source = propertyNode.Source;
TagHelper = propertyNode.TagHelper; TagHelper = propertyNode.TagHelper;
} }
@ -38,11 +38,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
public BoundAttributeDescriptor BoundAttribute { get; set; } public BoundAttributeDescriptor BoundAttribute { get; set; }
public string Field { get; set; } public string FieldName { get; set; }
public bool IsIndexerNameMatch { get; set; } public bool IsIndexerNameMatch { get; set; }
public string Property { get; set; } public string PropertyName { get; set; }
public TagHelperDescriptor TagHelper { get; set; } public TagHelperDescriptor TagHelper { get; set; }

2
src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionDirectivePass.cs
View File

@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
var section = new SectionIntermediateNode() var section = new SectionIntermediateNode()
{ {
Name = sectionName, SectionName = sectionName,
}; };
var i = 0; var i = 0;

2
src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionIntermediateNode.cs
View File

@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
{ {
public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection(); public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection();
public string Name { get; set; } public string SectionName { get; set; }
public override void Accept(IntermediateNodeVisitor visitor) public override void Accept(IntermediateNodeVisitor visitor)
{ {

2
src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionTargetExtension.cs
View File

@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
context.CodeWriter context.CodeWriter
.WriteStartMethodInvocation(SectionMethodName) .WriteStartMethodInvocation(SectionMethodName)
.Write("\"") .Write("\"")
.Write(node.Name) .Write(node.SectionName)
.Write("\", "); .Write("\", ");
using (context.CodeWriter.BuildAsyncLambda(writerName)) using (context.CodeWriter.BuildAsyncLambda(writerName))

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

@ -87,8 +87,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
// Assert // Assert
var tagHelper = FindTagHelperNode(irDocument); var tagHelper = FindTagHelperNode(irDocument);
Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]).Type); Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]).TypeName);
Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(tagHelper.Children[2]).Property); Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(tagHelper.Children[2]).PropertyName);
var @class = FindClassNode(irDocument); var @class = FindClassNode(irDocument);
@ -159,7 +159,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
// Assert // Assert
var tagHelper = FindTagHelperNode(irDocument); var tagHelper = FindTagHelperNode(irDocument);
Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]).Type); Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]).TypeName);
Assert.IsType<DefaultTagHelperHtmlAttributeIntermediateNode>(tagHelper.Children[2]); Assert.IsType<DefaultTagHelperHtmlAttributeIntermediateNode>(tagHelper.Children[2]);
var @class = FindClassNode(irDocument); var @class = FindClassNode(irDocument);
@ -238,12 +238,12 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
// Assert // Assert
var outerTagHelper = FindTagHelperNode(irDocument); var outerTagHelper = FindTagHelperNode(irDocument);
Assert.Equal("PTestTagHelper", Assert.IsType<DefaultTagHelperCreateIntermediateNode>(outerTagHelper.Children[1]).Type); Assert.Equal("PTestTagHelper", Assert.IsType<DefaultTagHelperCreateIntermediateNode>(outerTagHelper.Children[1]).TypeName);
Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(outerTagHelper.Children[2]).Property); Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(outerTagHelper.Children[2]).PropertyName);
var vcth = FindTagHelperNode(outerTagHelper.Children[0]); var vcth = FindTagHelperNode(outerTagHelper.Children[0]);
Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(vcth.Children[1]).Type); Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(vcth.Children[1]).TypeName);
Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(vcth.Children[2]).Property); Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(vcth.Children[2]).PropertyName);
var @class = FindClassNode(irDocument); var @class = FindClassNode(irDocument);

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

@ -139,8 +139,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
var tagHelperNode = new TagHelperIntermediateNode(); var tagHelperNode = new TagHelperIntermediateNode();
var node = new DefaultTagHelperCreateIntermediateNode() var node = new DefaultTagHelperCreateIntermediateNode()
{ {
Field = "__TestNamespace_MyTagHelper", FieldName = "__TestNamespace_MyTagHelper",
Type = "TestNamespace.MyTagHelper", TypeName = "TestNamespace.MyTagHelper",
}; };
tagHelperNode.Children.Add(node); tagHelperNode.Children.Add(node);
Push(context, tagHelperNode); Push(context, tagHelperNode);
@ -167,8 +167,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
var tagHelperNode = new TagHelperIntermediateNode(); var tagHelperNode = new TagHelperIntermediateNode();
var node = new DefaultTagHelperCreateIntermediateNode() var node = new DefaultTagHelperCreateIntermediateNode()
{ {
Field = "__TestNamespace_MyTagHelper", FieldName = "__TestNamespace_MyTagHelper",
Type = "TestNamespace.MyTagHelper", TypeName = "TestNamespace.MyTagHelper",
}; };
tagHelperNode.Children.Add(node); tagHelperNode.Children.Add(node);
Push(context, tagHelperNode); Push(context, tagHelperNode);
@ -372,9 +372,9 @@ EndAddHtmlAttributeValues(__tagHelperExecutionContext);
AttributeName = "bound", AttributeName = "bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = StringPropertyTagHelper.BoundAttributes.Single(), BoundAttribute = StringPropertyTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = false, IsIndexerNameMatch = false,
Property = "StringProp", PropertyName = "StringProp",
TagHelper = StringPropertyTagHelper, TagHelper = StringPropertyTagHelper,
Children = Children =
{ {
@ -413,9 +413,9 @@ __InputTagHelper.StringProp = ""value"";
AttributeName = "bound", AttributeName = "bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = StringPropertyTagHelper.BoundAttributes.Single(), BoundAttribute = StringPropertyTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = false, IsIndexerNameMatch = false,
Property = "StringProp", PropertyName = "StringProp",
TagHelper = StringPropertyTagHelper, TagHelper = StringPropertyTagHelper,
Children = Children =
{ {
@ -454,9 +454,9 @@ __InputTagHelper.StringProp = string.Empty;
AttributeName = "bound", AttributeName = "bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(), BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = false, IsIndexerNameMatch = false,
Property = "IntProp", PropertyName = "IntProp",
TagHelper = IntPropertyTagHelper, TagHelper = IntPropertyTagHelper,
Source = Span, Source = Span,
Children = Children =
@ -500,17 +500,17 @@ __InputTagHelper.IntProp = 32;
{ {
// We only look at the attribute name here. // We only look at the attribute name here.
AttributeName = "bound", AttributeName = "bound",
Field = "__OtherTagHelper", FieldName = "__OtherTagHelper",
Property = "IntProp", PropertyName = "IntProp",
}; };
var node2 = new DefaultTagHelperPropertyIntermediateNode() var node2 = new DefaultTagHelperPropertyIntermediateNode()
{ {
AttributeName = "bound", AttributeName = "bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(), BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = false, IsIndexerNameMatch = false,
Property = "IntProp", PropertyName = "IntProp",
TagHelper = IntPropertyTagHelper, TagHelper = IntPropertyTagHelper,
Source = Span, Source = Span,
}; };
@ -543,9 +543,9 @@ __InputTagHelper.IntProp = 32;
AttributeName = "bound", AttributeName = "bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(), BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = false, IsIndexerNameMatch = false,
Property = "IntProp", PropertyName = "IntProp",
TagHelper = IntPropertyTagHelper, TagHelper = IntPropertyTagHelper,
Children = Children =
{ {
@ -583,9 +583,9 @@ __InputTagHelper.IntProp = 32;
AttributeName = "foo-bound", AttributeName = "foo-bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(), BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = true, IsIndexerNameMatch = true,
Property = "IntIndexer", PropertyName = "IntIndexer",
TagHelper = IntIndexerTagHelper, TagHelper = IntIndexerTagHelper,
Source = Span, Source = Span,
Children = Children =
@ -628,9 +628,9 @@ __InputTagHelper.IntIndexer[""bound""] = 32;
AttributeName = "foo-bound", AttributeName = "foo-bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(), BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = true, IsIndexerNameMatch = true,
Property = "IntIndexer", PropertyName = "IntIndexer",
TagHelper = IntIndexerTagHelper, TagHelper = IntIndexerTagHelper,
Children = Children =
{ {
@ -668,9 +668,9 @@ __InputTagHelper.IntIndexer[""bound""] = 32;
AttributeName = "bound", AttributeName = "bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = StringPropertyTagHelper.BoundAttributes.Single(), BoundAttribute = StringPropertyTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = false, IsIndexerNameMatch = false,
Property = "StringProp", PropertyName = "StringProp",
TagHelper = StringPropertyTagHelper, TagHelper = StringPropertyTagHelper,
Children = Children =
{ {
@ -714,9 +714,9 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.St
AttributeName = "bound", AttributeName = "bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(), BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = false, IsIndexerNameMatch = false,
Property = "IntProp", PropertyName = "IntProp",
TagHelper = IntPropertyTagHelper, TagHelper = IntPropertyTagHelper,
Source = Span, Source = Span,
Children = Children =
@ -761,17 +761,17 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.In
{ {
// We only look at the attribute name here. // We only look at the attribute name here.
AttributeName = "bound", AttributeName = "bound",
Field = "__OtherTagHelper", FieldName = "__OtherTagHelper",
Property = "IntProp", PropertyName = "IntProp",
}; };
var node2 = new DefaultTagHelperPropertyIntermediateNode() var node2 = new DefaultTagHelperPropertyIntermediateNode()
{ {
AttributeName = "bound", AttributeName = "bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(), BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = false, IsIndexerNameMatch = false,
Property = "IntProp", PropertyName = "IntProp",
TagHelper = IntPropertyTagHelper, TagHelper = IntPropertyTagHelper,
Source = Span, Source = Span,
}; };
@ -804,9 +804,9 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.In
AttributeName = "bound", AttributeName = "bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(), BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = false, IsIndexerNameMatch = false,
Property = "IntProp", PropertyName = "IntProp",
TagHelper = IntPropertyTagHelper, TagHelper = IntPropertyTagHelper,
Children = Children =
{ {
@ -845,9 +845,9 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.In
AttributeName = "foo-bound", AttributeName = "foo-bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(), BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = true, IsIndexerNameMatch = true,
Property = "IntIndexer", PropertyName = "IntIndexer",
TagHelper = IntIndexerTagHelper, TagHelper = IntIndexerTagHelper,
Source = Span, Source = Span,
Children = Children =
@ -895,9 +895,9 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelpe
AttributeName = "foo-first", AttributeName = "foo-first",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(), BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = true, IsIndexerNameMatch = true,
Property = "IntIndexer", PropertyName = "IntIndexer",
TagHelper = IntIndexerTagHelper, TagHelper = IntIndexerTagHelper,
Source = Span, Source = Span,
Children = Children =
@ -913,9 +913,9 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelpe
AttributeName = "foo-bound", AttributeName = "foo-bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(), BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = true, IsIndexerNameMatch = true,
Property = "IntIndexer", PropertyName = "IntIndexer",
TagHelper = IntIndexerTagHelper, TagHelper = IntIndexerTagHelper,
Source = Span, Source = Span,
Children = Children =
@ -960,9 +960,9 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelpe
AttributeName = "foo-bound", AttributeName = "foo-bound",
AttributeStructure = AttributeStructure.DoubleQuotes, AttributeStructure = AttributeStructure.DoubleQuotes,
BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(), BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(),
Field = "__InputTagHelper", FieldName = "__InputTagHelper",
IsIndexerNameMatch = true, IsIndexerNameMatch = true,
Property = "IntIndexer", PropertyName = "IntIndexer",
TagHelper = IntIndexerTagHelper, TagHelper = IntIndexerTagHelper,
Children = Children =
{ {

16
test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/PreallocatedAttributeTargetExtensionTest.cs
View File

@ -140,8 +140,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
{ {
AttributeName = descriptor.Name, AttributeName = descriptor.Name,
BoundAttribute = descriptor, BoundAttribute = descriptor,
Field = "__FooTagHelper", FieldName = "__FooTagHelper",
Property = "FooProp", PropertyName = "FooProp",
VariableName = "_tagHelper1", VariableName = "_tagHelper1",
}; };
tagHelperNode.Children.Add(node); tagHelperNode.Children.Add(node);
@ -183,11 +183,11 @@ __tagHelperExecutionContext.AddTagHelperAttribute(_tagHelper1);
var node = new PreallocatedTagHelperPropertyIntermediateNode() var node = new PreallocatedTagHelperPropertyIntermediateNode()
{ {
AttributeName = "pre-Foo", AttributeName = "pre-Foo",
Field = "__FooTagHelper", FieldName = "__FooTagHelper",
VariableName = "_tagHelper1", VariableName = "_tagHelper1",
BoundAttribute = descriptor, BoundAttribute = descriptor,
IsIndexerNameMatch = true, IsIndexerNameMatch = true,
Property = "FooProp", PropertyName = "FooProp",
TagHelper = tagHelperBuilder.Build(), TagHelper = tagHelperBuilder.Build(),
}; };
tagHelperNode.Children.Add(node); tagHelperNode.Children.Add(node);
@ -234,21 +234,21 @@ __tagHelperExecutionContext.AddTagHelperAttribute(_tagHelper1);
var node1 = new PreallocatedTagHelperPropertyIntermediateNode() var node1 = new PreallocatedTagHelperPropertyIntermediateNode()
{ {
AttributeName = "pre-Bar", AttributeName = "pre-Bar",
Field = "__FooTagHelper", FieldName = "__FooTagHelper",
VariableName = "_tagHelper0s", VariableName = "_tagHelper0s",
BoundAttribute = boundAttribute, BoundAttribute = boundAttribute,
IsIndexerNameMatch = true, IsIndexerNameMatch = true,
Property = "FooProp", PropertyName = "FooProp",
TagHelper = tagHelper, TagHelper = tagHelper,
}; };
var node2 = new PreallocatedTagHelperPropertyIntermediateNode() var node2 = new PreallocatedTagHelperPropertyIntermediateNode()
{ {
AttributeName = "pre-Foo", AttributeName = "pre-Foo",
Field = "__FooTagHelper", FieldName = "__FooTagHelper",
VariableName = "_tagHelper1", VariableName = "_tagHelper1",
BoundAttribute = boundAttribute, BoundAttribute = boundAttribute,
IsIndexerNameMatch = true, IsIndexerNameMatch = true,
Property = "FooProp", PropertyName = "FooProp",
TagHelper = tagHelper, TagHelper = tagHelper,
}; };
tagHelperNode.Children.Add(node1); tagHelperNode.Children.Add(node1);

2
test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionDirectivePassTest.cs
View File

@ -72,7 +72,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
node => Assert.IsType<SectionIntermediateNode>(node)); node => Assert.IsType<SectionIntermediateNode>(node));
var section = method.Children[1] as SectionIntermediateNode; var section = method.Children[1] as SectionIntermediateNode;
Assert.Equal("Header", section.Name); Assert.Equal("Header", section.SectionName);
Children(section, c => Html(" <p>Hello World</p> ", c)); Children(section, c => Html(" <p>Hello World</p> ", c));
} }

4
test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionTargetExtensionTest.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
{ {
new CSharpExpressionIntermediateNode(), new CSharpExpressionIntermediateNode(),
}, },
Name = "MySection" SectionName = "MySection"
}; };
var extension = new SectionTargetExtension() var extension = new SectionTargetExtension()
@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
{ {
new CSharpExpressionIntermediateNode(), new CSharpExpressionIntermediateNode(),
}, },
Name = "MySection" SectionName = "MySection"
}; };
var extension = new SectionTargetExtension() var extension = new SectionTargetExtension()

6
test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs
View File

@ -121,13 +121,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
WriteContentNode(n, n.VariableName, n.AttributeName, n.Value, string.Format("HtmlAttributeValueStyle.{0}", n.AttributeStructure)); WriteContentNode(n, n.VariableName, n.AttributeName, n.Value, string.Format("HtmlAttributeValueStyle.{0}", n.AttributeStructure));
break; break;
case PreallocatedTagHelperPropertyIntermediateNode n: case PreallocatedTagHelperPropertyIntermediateNode n:
WriteContentNode(n, n.VariableName, n.AttributeName, n.Property); WriteContentNode(n, n.VariableName, n.AttributeName, n.PropertyName);
break; break;
case PreallocatedTagHelperPropertyValueIntermediateNode n: case PreallocatedTagHelperPropertyValueIntermediateNode n:
WriteContentNode(n, n.VariableName, n.AttributeName, n.Value, string.Format("HtmlAttributeValueStyle.{0}", n.AttributeStructure)); WriteContentNode(n, n.VariableName, n.AttributeName, n.Value, string.Format("HtmlAttributeValueStyle.{0}", n.AttributeStructure));
break; break;
case DefaultTagHelperCreateIntermediateNode n: case DefaultTagHelperCreateIntermediateNode n:
WriteContentNode(n, n.Type); WriteContentNode(n, n.TypeName);
break; break;
case DefaultTagHelperExecuteIntermediateNode n: case DefaultTagHelperExecuteIntermediateNode n:
WriteBasicNode(n); WriteBasicNode(n);
@ -149,7 +149,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
public void VisitExtension(SectionIntermediateNode node) public void VisitExtension(SectionIntermediateNode node)
{ {
WriteContentNode(node, node.Name); WriteContentNode(node, node.SectionName);
} }
protected void WriteBasicNode(IntermediateNode node) protected void WriteBasicNode(IntermediateNode node)

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

@ -388,7 +388,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate
try try
{ {
Assert.Equal(attributeName, setPreallocatedTagHelperProperty.AttributeName); Assert.Equal(attributeName, setPreallocatedTagHelperProperty.AttributeName);
Assert.Equal(propertyName, setPreallocatedTagHelperProperty.Property); Assert.Equal(propertyName, setPreallocatedTagHelperProperty.PropertyName);
} }
catch (XunitException e) catch (XunitException e)
{ {