diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs index 96b0935c63..a7420abff0 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs @@ -85,9 +85,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions // Now i has the right insertion point. node.Children.Insert(i, new DefaultTagHelperCreateIntermediateNode() { - Field = context.GetFieldName(tagHelper), + FieldName = context.GetFieldName(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. @@ -100,8 +100,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions // that will use our field and property name. node.Children[i] = new DefaultTagHelperPropertyIntermediateNode(propertyNode) { - Field = context.GetFieldName(tagHelper), - Property = propertyNode.BoundAttribute.GetPropertyName(), + FieldName = context.GetFieldName(tagHelper), + PropertyName = propertyNode.BoundAttribute.GetPropertyName(), }; } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperCreateIntermediateNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperCreateIntermediateNode.cs index 85094bb52f..92aa2e3038 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperCreateIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperCreateIntermediateNode.cs @@ -11,11 +11,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions { public override IntermediateNodeCollection Children { get; } = IntermediateNodeCollection.ReadOnly; - public string Field { get; set; } + public string FieldName { get; set; } public TagHelperDescriptor TagHelper { get; set; } - public string Type { get; set; } + public string TypeName { get; set; } public override void Accept(IntermediateNodeVisitor visitor) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperOptimizationPass.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperOptimizationPass.cs index cecb8c716c..ef777ff754 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperOptimizationPass.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperOptimizationPass.cs @@ -151,9 +151,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions // Now i has the right insertion point. node.Children.Insert(i, new DefaultTagHelperCreateIntermediateNode() { - Field = context.GetFieldName(tagHelper), + FieldName = context.GetFieldName(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 @@ -166,8 +166,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions // This belongs to the current tag helper, replace it. node.Children[i] = new DefaultTagHelperPropertyIntermediateNode(propertyNode) { - Field = context.GetFieldName(tagHelper), - Property = propertyNode.BoundAttribute.GetPropertyName(), + FieldName = context.GetFieldName(tagHelper), + PropertyName = propertyNode.BoundAttribute.GetPropertyName(), }; } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperPropertyIntermediateNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperPropertyIntermediateNode.cs index 578d53392f..083d84f32e 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperPropertyIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperPropertyIntermediateNode.cs @@ -46,11 +46,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions public BoundAttributeDescriptor BoundAttribute { get; set; } - public string Field { get; set; } + public string FieldName { get; set; } public bool IsIndexerNameMatch { get; set; } - public string Property { get; set; } + public string PropertyName { get; set; } public TagHelperDescriptor TagHelper { get; set; } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperTargetExtension.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperTargetExtension.cs index a58199c34b..0892f7b4d5 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/DefaultTagHelperTargetExtension.cs @@ -132,16 +132,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions } context.CodeWriter - .WriteStartAssignment(node.Field) + .WriteStartAssignment(node.FieldName) .Write(CreateTagHelperMethodName) - .WriteLine("();"); + .WriteLine("();"); if (!DesignTime) { context.CodeWriter.WriteInstanceMethodInvocation( ExecutionContextVariableName, 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. context.CodeWriter .Write("if (") - .Write(node.Field) + .Write(node.FieldName) .Write(".") - .Write(node.Property) + .Write(node.PropertyName) .WriteLine(" == null)"); using (context.CodeWriter.BuildScope()) { @@ -309,7 +309,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions .WriteParameterSeparator() .WriteStringLiteral(node.TagHelper.GetTypeName()) .WriteParameterSeparator() - .WriteStringLiteral(node.Property) + .WriteStringLiteral(node.PropertyName) .WriteEndMethodInvocation(endLine: false) // End of method call .WriteEndMethodInvocation(); // End of new expression / throw statement } @@ -626,7 +626,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions private static string GetPropertyAccessor(DefaultTagHelperPropertyIntermediateNode node) { - var propertyAccessor = $"{node.Field}.{node.Property}"; + var propertyAccessor = $"{node.FieldName}.{node.PropertyName}"; if (node.IsIndexerNameMatch) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/IDesignTimeDirectiveTargetExtension.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/IDesignTimeDirectiveTargetExtension.cs index 8ffde8178d..d99ef10241 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/IDesignTimeDirectiveTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/IDesignTimeDirectiveTargetExtension.cs @@ -2,7 +2,6 @@ // 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.Intermediate; namespace Microsoft.AspNetCore.Razor.Language.Extensions { diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedAttributeTargetExtension.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedAttributeTargetExtension.cs index fe3249e7e0..c371361f4c 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedAttributeTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedAttributeTargetExtension.cs @@ -97,9 +97,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions // Throw a reasonable Exception at runtime if the dictionary property is null. context.CodeWriter .Write("if (") - .Write(node.Field) + .Write(node.FieldName) .Write(".") - .Write(node.Property) + .Write(node.PropertyName) .WriteLine(" == null)"); using (context.CodeWriter.BuildScope()) { @@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions .WriteParameterSeparator() .WriteStringLiteral(node.TagHelper.GetTypeName()) .WriteParameterSeparator() - .WriteStringLiteral(node.Property) + .WriteStringLiteral(node.PropertyName) .WriteEndMethodInvocation(endLine: false) // End of method call .WriteEndMethodInvocation(); // End of new expression / throw statement } @@ -153,7 +153,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions private static string GetPropertyAccessor(PreallocatedTagHelperPropertyIntermediateNode node) { - var propertyAccessor = $"{node.Field}.{node.Property}"; + var propertyAccessor = $"{node.FieldName}.{node.PropertyName}"; if (node.IsIndexerNameMatch) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs index 01da47b567..d062328cb3 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/PreallocatedTagHelperPropertyIntermediateNode.cs @@ -23,9 +23,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions AttributeName = propertyNode.AttributeName; AttributeStructure = propertyNode.AttributeStructure; BoundAttribute = propertyNode.BoundAttribute; - Field = propertyNode.Field; + FieldName = propertyNode.FieldName; IsIndexerNameMatch = propertyNode.IsIndexerNameMatch; - Property = propertyNode.Property; + PropertyName = propertyNode.PropertyName; Source = propertyNode.Source; TagHelper = propertyNode.TagHelper; } @@ -38,11 +38,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions public BoundAttributeDescriptor BoundAttribute { get; set; } - public string Field { get; set; } + public string FieldName { get; set; } public bool IsIndexerNameMatch { get; set; } - public string Property { get; set; } + public string PropertyName { get; set; } public TagHelperDescriptor TagHelper { get; set; } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionDirectivePass.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionDirectivePass.cs index 612aeb682d..d0844d3abb 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionDirectivePass.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionDirectivePass.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions var section = new SectionIntermediateNode() { - Name = sectionName, + SectionName = sectionName, }; var i = 0; diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionIntermediateNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionIntermediateNode.cs index 0666d49c12..7076e3df06 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionIntermediateNode.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions { public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection(); - public string Name { get; set; } + public string SectionName { get; set; } public override void Accept(IntermediateNodeVisitor visitor) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionTargetExtension.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionTargetExtension.cs index 274dda0590..b400790f2e 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/SectionTargetExtension.cs @@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions context.CodeWriter .WriteStartMethodInvocation(SectionMethodName) .Write("\"") - .Write(node.Name) + .Write(node.SectionName) .Write("\", "); using (context.CodeWriter.BuildAsyncLambda(writerName)) diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs index cb762ebebc..24590d70be 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs @@ -87,8 +87,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions // Assert var tagHelper = FindTagHelperNode(irDocument); - Assert.Equal(vcthFullName, Assert.IsType(tagHelper.Children[1]).Type); - Assert.Equal("Foo", Assert.IsType(tagHelper.Children[2]).Property); + Assert.Equal(vcthFullName, Assert.IsType(tagHelper.Children[1]).TypeName); + Assert.Equal("Foo", Assert.IsType(tagHelper.Children[2]).PropertyName); var @class = FindClassNode(irDocument); @@ -159,7 +159,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore. // Assert var tagHelper = FindTagHelperNode(irDocument); - Assert.Equal(vcthFullName, Assert.IsType(tagHelper.Children[1]).Type); + Assert.Equal(vcthFullName, Assert.IsType(tagHelper.Children[1]).TypeName); Assert.IsType(tagHelper.Children[2]); var @class = FindClassNode(irDocument); @@ -238,12 +238,12 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore. // Assert var outerTagHelper = FindTagHelperNode(irDocument); - Assert.Equal("PTestTagHelper", Assert.IsType(outerTagHelper.Children[1]).Type); - Assert.Equal("Foo", Assert.IsType(outerTagHelper.Children[2]).Property); + Assert.Equal("PTestTagHelper", Assert.IsType(outerTagHelper.Children[1]).TypeName); + Assert.Equal("Foo", Assert.IsType(outerTagHelper.Children[2]).PropertyName); var vcth = FindTagHelperNode(outerTagHelper.Children[0]); - Assert.Equal(vcthFullName, Assert.IsType(vcth.Children[1]).Type); - Assert.Equal("Foo", Assert.IsType(vcth.Children[2]).Property); + Assert.Equal(vcthFullName, Assert.IsType(vcth.Children[1]).TypeName); + Assert.Equal("Foo", Assert.IsType(vcth.Children[2]).PropertyName); var @class = FindClassNode(irDocument); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DefaultTagHelperTargetExtensionTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DefaultTagHelperTargetExtensionTest.cs index a1a1c134fc..79aba5837c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DefaultTagHelperTargetExtensionTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DefaultTagHelperTargetExtensionTest.cs @@ -139,8 +139,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions var tagHelperNode = new TagHelperIntermediateNode(); var node = new DefaultTagHelperCreateIntermediateNode() { - Field = "__TestNamespace_MyTagHelper", - Type = "TestNamespace.MyTagHelper", + FieldName = "__TestNamespace_MyTagHelper", + TypeName = "TestNamespace.MyTagHelper", }; tagHelperNode.Children.Add(node); Push(context, tagHelperNode); @@ -167,8 +167,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions var tagHelperNode = new TagHelperIntermediateNode(); var node = new DefaultTagHelperCreateIntermediateNode() { - Field = "__TestNamespace_MyTagHelper", - Type = "TestNamespace.MyTagHelper", + FieldName = "__TestNamespace_MyTagHelper", + TypeName = "TestNamespace.MyTagHelper", }; tagHelperNode.Children.Add(node); Push(context, tagHelperNode); @@ -372,9 +372,9 @@ EndAddHtmlAttributeValues(__tagHelperExecutionContext); AttributeName = "bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = StringPropertyTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = false, - Property = "StringProp", + PropertyName = "StringProp", TagHelper = StringPropertyTagHelper, Children = { @@ -413,9 +413,9 @@ __InputTagHelper.StringProp = ""value""; AttributeName = "bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = StringPropertyTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = false, - Property = "StringProp", + PropertyName = "StringProp", TagHelper = StringPropertyTagHelper, Children = { @@ -454,9 +454,9 @@ __InputTagHelper.StringProp = string.Empty; AttributeName = "bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = false, - Property = "IntProp", + PropertyName = "IntProp", TagHelper = IntPropertyTagHelper, Source = Span, Children = @@ -500,17 +500,17 @@ __InputTagHelper.IntProp = 32; { // We only look at the attribute name here. AttributeName = "bound", - Field = "__OtherTagHelper", - Property = "IntProp", + FieldName = "__OtherTagHelper", + PropertyName = "IntProp", }; var node2 = new DefaultTagHelperPropertyIntermediateNode() { AttributeName = "bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = false, - Property = "IntProp", + PropertyName = "IntProp", TagHelper = IntPropertyTagHelper, Source = Span, }; @@ -543,9 +543,9 @@ __InputTagHelper.IntProp = 32; AttributeName = "bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = false, - Property = "IntProp", + PropertyName = "IntProp", TagHelper = IntPropertyTagHelper, Children = { @@ -583,9 +583,9 @@ __InputTagHelper.IntProp = 32; AttributeName = "foo-bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = true, - Property = "IntIndexer", + PropertyName = "IntIndexer", TagHelper = IntIndexerTagHelper, Source = Span, Children = @@ -628,9 +628,9 @@ __InputTagHelper.IntIndexer[""bound""] = 32; AttributeName = "foo-bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = true, - Property = "IntIndexer", + PropertyName = "IntIndexer", TagHelper = IntIndexerTagHelper, Children = { @@ -668,9 +668,9 @@ __InputTagHelper.IntIndexer[""bound""] = 32; AttributeName = "bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = StringPropertyTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = false, - Property = "StringProp", + PropertyName = "StringProp", TagHelper = StringPropertyTagHelper, Children = { @@ -714,9 +714,9 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.St AttributeName = "bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = false, - Property = "IntProp", + PropertyName = "IntProp", TagHelper = IntPropertyTagHelper, Source = Span, Children = @@ -761,17 +761,17 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.In { // We only look at the attribute name here. AttributeName = "bound", - Field = "__OtherTagHelper", - Property = "IntProp", + FieldName = "__OtherTagHelper", + PropertyName = "IntProp", }; var node2 = new DefaultTagHelperPropertyIntermediateNode() { AttributeName = "bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = false, - Property = "IntProp", + PropertyName = "IntProp", TagHelper = IntPropertyTagHelper, Source = Span, }; @@ -804,9 +804,9 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.In AttributeName = "bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = IntPropertyTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = false, - Property = "IntProp", + PropertyName = "IntProp", TagHelper = IntPropertyTagHelper, Children = { @@ -845,9 +845,9 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""bound"", __InputTagHelper.In AttributeName = "foo-bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = true, - Property = "IntIndexer", + PropertyName = "IntIndexer", TagHelper = IntIndexerTagHelper, Source = Span, Children = @@ -895,9 +895,9 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelpe AttributeName = "foo-first", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = true, - Property = "IntIndexer", + PropertyName = "IntIndexer", TagHelper = IntIndexerTagHelper, Source = Span, Children = @@ -913,9 +913,9 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelpe AttributeName = "foo-bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = true, - Property = "IntIndexer", + PropertyName = "IntIndexer", TagHelper = IntIndexerTagHelper, Source = Span, Children = @@ -960,9 +960,9 @@ __tagHelperExecutionContext.AddTagHelperAttribute(""foo-bound"", __InputTagHelpe AttributeName = "foo-bound", AttributeStructure = AttributeStructure.DoubleQuotes, BoundAttribute = IntIndexerTagHelper.BoundAttributes.Single(), - Field = "__InputTagHelper", + FieldName = "__InputTagHelper", IsIndexerNameMatch = true, - Property = "IntIndexer", + PropertyName = "IntIndexer", TagHelper = IntIndexerTagHelper, Children = { diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/PreallocatedAttributeTargetExtensionTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/PreallocatedAttributeTargetExtensionTest.cs index 58c76cdc53..da2f960847 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/PreallocatedAttributeTargetExtensionTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/PreallocatedAttributeTargetExtensionTest.cs @@ -140,8 +140,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions { AttributeName = descriptor.Name, BoundAttribute = descriptor, - Field = "__FooTagHelper", - Property = "FooProp", + FieldName = "__FooTagHelper", + PropertyName = "FooProp", VariableName = "_tagHelper1", }; tagHelperNode.Children.Add(node); @@ -183,11 +183,11 @@ __tagHelperExecutionContext.AddTagHelperAttribute(_tagHelper1); var node = new PreallocatedTagHelperPropertyIntermediateNode() { AttributeName = "pre-Foo", - Field = "__FooTagHelper", + FieldName = "__FooTagHelper", VariableName = "_tagHelper1", BoundAttribute = descriptor, IsIndexerNameMatch = true, - Property = "FooProp", + PropertyName = "FooProp", TagHelper = tagHelperBuilder.Build(), }; tagHelperNode.Children.Add(node); @@ -234,21 +234,21 @@ __tagHelperExecutionContext.AddTagHelperAttribute(_tagHelper1); var node1 = new PreallocatedTagHelperPropertyIntermediateNode() { AttributeName = "pre-Bar", - Field = "__FooTagHelper", + FieldName = "__FooTagHelper", VariableName = "_tagHelper0s", BoundAttribute = boundAttribute, IsIndexerNameMatch = true, - Property = "FooProp", + PropertyName = "FooProp", TagHelper = tagHelper, }; var node2 = new PreallocatedTagHelperPropertyIntermediateNode() { AttributeName = "pre-Foo", - Field = "__FooTagHelper", + FieldName = "__FooTagHelper", VariableName = "_tagHelper1", BoundAttribute = boundAttribute, IsIndexerNameMatch = true, - Property = "FooProp", + PropertyName = "FooProp", TagHelper = tagHelper, }; tagHelperNode.Children.Add(node1); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionDirectivePassTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionDirectivePassTest.cs index c043304787..454f438bac 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionDirectivePassTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionDirectivePassTest.cs @@ -72,7 +72,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions node => Assert.IsType(node)); var section = method.Children[1] as SectionIntermediateNode; - Assert.Equal("Header", section.Name); + Assert.Equal("Header", section.SectionName); Children(section, c => Html("

Hello World

", c)); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionTargetExtensionTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionTargetExtensionTest.cs index c2d6b70ebc..991fcce28e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionTargetExtensionTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/SectionTargetExtensionTest.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions { new CSharpExpressionIntermediateNode(), }, - Name = "MySection" + SectionName = "MySection" }; var extension = new SectionTargetExtension() @@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions { new CSharpExpressionIntermediateNode(), }, - Name = "MySection" + SectionName = "MySection" }; var extension = new SectionTargetExtension() diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs index 5127d7ddb2..783d021bf7 100644 --- a/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs +++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntermediateNodeWriter.cs @@ -121,13 +121,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests WriteContentNode(n, n.VariableName, n.AttributeName, n.Value, string.Format("HtmlAttributeValueStyle.{0}", n.AttributeStructure)); break; case PreallocatedTagHelperPropertyIntermediateNode n: - WriteContentNode(n, n.VariableName, n.AttributeName, n.Property); + WriteContentNode(n, n.VariableName, n.AttributeName, n.PropertyName); break; case PreallocatedTagHelperPropertyValueIntermediateNode n: WriteContentNode(n, n.VariableName, n.AttributeName, n.Value, string.Format("HtmlAttributeValueStyle.{0}", n.AttributeStructure)); break; case DefaultTagHelperCreateIntermediateNode n: - WriteContentNode(n, n.Type); + WriteContentNode(n, n.TypeName); break; case DefaultTagHelperExecuteIntermediateNode n: WriteBasicNode(n); @@ -149,7 +149,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests public void VisitExtension(SectionIntermediateNode node) { - WriteContentNode(node, node.Name); + WriteContentNode(node, node.SectionName); } protected void WriteBasicNode(IntermediateNode node) diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs index 2937b8f13b..b4fc6f105e 100644 --- a/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs +++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Intermediate/IntermediateNodeAssert.cs @@ -388,7 +388,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate try { Assert.Equal(attributeName, setPreallocatedTagHelperProperty.AttributeName); - Assert.Equal(propertyName, setPreallocatedTagHelperProperty.Property); + Assert.Equal(propertyName, setPreallocatedTagHelperProperty.PropertyName); } catch (XunitException e) {