diff --git a/src/Microsoft.AspNetCore.Razor.Language/HtmlAttributeValueStyle.cs b/src/Microsoft.AspNetCore.Razor.Language/AttributeStructure.cs similarity index 91% rename from src/Microsoft.AspNetCore.Razor.Language/HtmlAttributeValueStyle.cs rename to src/Microsoft.AspNetCore.Razor.Language/AttributeStructure.cs index 468aec72a1..9a191578c4 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/HtmlAttributeValueStyle.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/AttributeStructure.cs @@ -5,7 +5,7 @@ namespace Microsoft.AspNetCore.Razor.Language { // This is the design time equivalent of Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle. // They should be kept in sync. - public enum HtmlAttributeValueStyle + public enum AttributeStructure { DoubleQuotes, SingleQuotes, diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/PreallocatedAttributeTargetExtension.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/PreallocatedAttributeTargetExtension.cs index bd3babf656..e101707eac 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/PreallocatedAttributeTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/PreallocatedAttributeTargetExtension.cs @@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration .WriteStartNewObject("global::" + TagHelperAttributeTypeName) .WriteStringLiteral(node.Name); - if (node.ValueStyle == HtmlAttributeValueStyle.Minimized) + if (node.AttributeStructure == AttributeStructure.Minimized) { context.Writer.WriteEndMethodInvocation(); } @@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration .WriteStringLiteral(node.Value) .WriteEndMethodInvocation(endLine: false) .WriteParameterSeparator() - .Write($"global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.{node.ValueStyle}") + .Write($"global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.{node.AttributeStructure}") .WriteEndMethodInvocation(); } } @@ -70,7 +70,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration .WriteParameterSeparator() .WriteStringLiteral(node.Value) .WriteParameterSeparator() - .Write($"global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.{node.ValueStyle}") + .Write($"global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.{node.AttributeStructure}") .WriteEndMethodInvocation(); } diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeTagHelperWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeTagHelperWriter.cs index 4e8cf6d7f7..41d426d561 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeTagHelperWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeTagHelperWriter.cs @@ -242,7 +242,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration public override void WriteAddTagHelperHtmlAttribute(CSharpRenderingContext context, AddTagHelperHtmlAttributeIntermediateNode node) { - var attributeValueStyleParameter = $"{HtmlAttributeValueStyleTypeName}.{node.ValueStyle}"; + var attributeValueStyleParameter = $"{HtmlAttributeValueStyleTypeName}.{node.AttributeStructure}"; var isConditionalAttributeValue = node.Children.Any( child => child is CSharpExpressionAttributeValueIntermediateNode || child is CSharpCodeAttributeValueIntermediateNode); @@ -416,7 +416,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration .WriteParameterSeparator() .Write(propertyValueAccessor) .WriteParameterSeparator() - .Write($"global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.{node.ValueStyle}") + .Write($"global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.{node.AttributeStructure}") .WriteEndMethodInvocation(); } diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs index a259539024..902bd1d252 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs @@ -754,7 +754,7 @@ namespace Microsoft.AspNetCore.Razor.Language TagHelperTypeName = tagHelperTypeName, Descriptor = associatedAttributeDescriptor, Binding = tagHelperBinding, - ValueStyle = attribute.ValueStyle, + AttributeStructure = attribute.AttributeStructure, Source = BuildSourceSpanFromNode(attributeValueNode), IsIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(attribute.Name, associatedAttributeDescriptor), }; @@ -769,7 +769,7 @@ namespace Microsoft.AspNetCore.Razor.Language var addHtmlAttribute = new AddTagHelperHtmlAttributeIntermediateNode() { Name = attribute.Name, - ValueStyle = attribute.ValueStyle + AttributeStructure = attribute.AttributeStructure }; _builder.Push(addHtmlAttribute); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/AddTagHelperHtmlAttributeIntermediateNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/AddTagHelperHtmlAttributeIntermediateNode.cs index 27636e11e3..91ebc5f74b 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/AddTagHelperHtmlAttributeIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/AddTagHelperHtmlAttributeIntermediateNode.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Razor.Language.Legacy; namespace Microsoft.AspNetCore.Razor.Language.Intermediate { @@ -33,7 +32,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate public string Name { get; set; } - internal HtmlAttributeValueStyle ValueStyle { get; set; } + public AttributeStructure AttributeStructure { get; set; } public override void Accept(IntermediateNodeVisitor visitor) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIntermediateNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIntermediateNode.cs index 91103ae717..e421a63f7a 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperAttributeIntermediateNode.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Legacy; namespace Microsoft.AspNetCore.Razor.Language.Intermediate { @@ -21,7 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate public string Value { get; set; } - public HtmlAttributeValueStyle ValueStyle { get; set; } + public AttributeStructure AttributeStructure { get; set; } public override void Accept(IntermediateNodeVisitor visitor) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIntermediateNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIntermediateNode.cs index 4470ca892f..0abab80389 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/DeclarePreallocatedTagHelperHtmlAttributeIntermediateNode.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Legacy; namespace Microsoft.AspNetCore.Razor.Language.Intermediate { @@ -21,7 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate public string Value { get; set; } - public HtmlAttributeValueStyle ValueStyle { get; set; } + public AttributeStructure AttributeStructure { get; set; } public override void Accept(IntermediateNodeVisitor visitor) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/SetTagHelperPropertyIntermediateNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/SetTagHelperPropertyIntermediateNode.cs index 695521858f..99e71cbde5 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/SetTagHelperPropertyIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/SetTagHelperPropertyIntermediateNode.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Razor.Language.Legacy; namespace Microsoft.AspNetCore.Razor.Language.Intermediate { @@ -37,7 +36,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate public string AttributeName { get; set; } - internal HtmlAttributeValueStyle ValueStyle { get; set; } + public AttributeStructure AttributeStructure { get; set; } public BoundAttributeDescriptor Descriptor { get; set; } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperAttributeNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperAttributeNode.cs index e534633156..7fa090259a 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperAttributeNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperAttributeNode.cs @@ -5,16 +5,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { internal class TagHelperAttributeNode { - public TagHelperAttributeNode(string name, SyntaxTreeNode value, HtmlAttributeValueStyle valueStyle) + public TagHelperAttributeNode(string name, SyntaxTreeNode value, AttributeStructure attributeStructure) { Name = name; Value = value; - ValueStyle = valueStyle; + AttributeStructure = attributeStructure; } // Internal for testing internal TagHelperAttributeNode(string name, SyntaxTreeNode value) - : this(name, value, HtmlAttributeValueStyle.DoubleQuotes) + : this(name, value, AttributeStructure.DoubleQuotes) { } @@ -22,6 +22,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public SyntaxTreeNode Value { get; } - public HtmlAttributeValueStyle ValueStyle { get; } + public AttributeStructure AttributeStructure { get; } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs index 3bda1518c2..014c4cd21b 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs @@ -98,7 +98,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var attributeNode = new TagHelperAttributeNode( result.AttributeName, result.AttributeValueNode, - result.AttributeValueStyle); + result.AttributeStructure); attributes.Add(attributeNode); } @@ -164,7 +164,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Default to DoubleQuotes. We purposefully do not persist NoQuotes ValueStyle to stay consistent with the // TryParseBlock() variation of attribute parsing. - var attributeValueStyle = HtmlAttributeValueStyle.DoubleQuotes; + var attributeValueStyle = AttributeStructure.DoubleQuotes; // The symbolOffset is initialized to 0 to expect worst case: "class=". If a quote is found later on for // the attribute value the symbolOffset is adjusted accordingly. @@ -244,7 +244,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { if (htmlSymbols[i].Type == HtmlSymbolType.SingleQuote) { - attributeValueStyle = HtmlAttributeValueStyle.SingleQuotes; + attributeValueStyle = AttributeStructure.SingleQuotes; } symbolStartLocation = htmlSymbols[i].Start; @@ -311,11 +311,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } else { - attributeValueStyle = HtmlAttributeValueStyle.Minimized; + attributeValueStyle = AttributeStructure.Minimized; } result.AttributeValueNode = attributeValue; - result.AttributeValueStyle = attributeValueStyle; + result.AttributeStructure = attributeValueStyle; return result; } @@ -384,7 +384,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy value.Kind == SpanKindInternal.Markup) { // Attribute value is a string literal. Eg: . - result.AttributeValueStyle = HtmlAttributeValueStyle.NoQuotes; + result.AttributeStructure = AttributeStructure.NoQuotes; } else { @@ -393,17 +393,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // that can break attributes. // Ex: where @value results in the test "hello world". // This way, the above code would render . - result.AttributeValueStyle = HtmlAttributeValueStyle.DoubleQuotes; + result.AttributeStructure = AttributeStructure.DoubleQuotes; } break; case HtmlSymbolType.DoubleQuote: - result.AttributeValueStyle = HtmlAttributeValueStyle.DoubleQuotes; + result.AttributeStructure = AttributeStructure.DoubleQuotes; break; case HtmlSymbolType.SingleQuote: - result.AttributeValueStyle = HtmlAttributeValueStyle.SingleQuotes; + result.AttributeStructure = AttributeStructure.SingleQuotes; break; default: - result.AttributeValueStyle = HtmlAttributeValueStyle.Minimized; + result.AttributeStructure = AttributeStructure.Minimized; break; } } @@ -760,7 +760,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public SyntaxTreeNode AttributeValueNode { get; set; } - public HtmlAttributeValueStyle AttributeValueStyle { get; set; } + public AttributeStructure AttributeStructure { get; set; } public bool IsBoundAttribute { get; set; } diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorPreallocatedTagHelperAttributeOptimizationPass.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorPreallocatedTagHelperAttributeOptimizationPass.cs index 7f6b8540c1..0cc9261bba 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/RazorPreallocatedTagHelperAttributeOptimizationPass.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/RazorPreallocatedTagHelperAttributeOptimizationPass.cs @@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Razor.Language { if (string.Equals(existingDeclaration.Name, node.Name, StringComparison.Ordinal) && string.Equals(existingDeclaration.Value, plainTextValue, StringComparison.Ordinal) && - existingDeclaration.ValueStyle == node.ValueStyle) + existingDeclaration.AttributeStructure == node.AttributeStructure) { declaration = existingDeclaration; break; @@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Razor.Language VariableName = preAllocatedAttributeVariableName, Name = node.Name, Value = plainTextValue, - ValueStyle = node.ValueStyle, + AttributeStructure = node.AttributeStructure, }; _classDeclaration.Children.Insert(_preallocatedDeclarationCount++, declaration); } @@ -107,7 +107,7 @@ namespace Microsoft.AspNetCore.Razor.Language { if (string.Equals(existingDeclaration.Name, node.AttributeName, StringComparison.Ordinal) && string.Equals(existingDeclaration.Value, plainTextValue, StringComparison.Ordinal) && - existingDeclaration.ValueStyle == node.ValueStyle) + existingDeclaration.AttributeStructure == node.AttributeStructure) { declaration = existingDeclaration; break; @@ -124,7 +124,7 @@ namespace Microsoft.AspNetCore.Razor.Language VariableName = preAllocatedAttributeVariableName, Name = node.AttributeName, Value = plainTextValue, - ValueStyle = node.ValueStyle, + AttributeStructure = node.AttributeStructure, }; _classDeclaration.Children.Insert(_preallocatedDeclarationCount++, declaration); } diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt index 793a6467bd..244af2848a 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt @@ -51,7 +51,7 @@ Document - TagHelper - (456:22,4 [31] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - DivTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (468:22,16 [11] RazorPagesWithoutModel.cshtml) IntermediateToken - (468:22,16 [11] RazorPagesWithoutModel.cshtml) - Html - text-danger HtmlContent - (487:22,35 [6] RazorPagesWithoutModel.cshtml) @@ -82,13 +82,13 @@ Document - IntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - IntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n CreateTagHelper - - DivTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (600:25,20 [9] RazorPagesWithoutModel.cshtml) IntermediateToken - (600:25,20 [9] RazorPagesWithoutModel.cshtml) - Html - col-md-10 HtmlContent - (718:28,14 [6] RazorPagesWithoutModel.cshtml) IntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n CreateTagHelper - - DivTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (505:23,16 [10] RazorPagesWithoutModel.cshtml) IntermediateToken - (505:23,16 [10] RazorPagesWithoutModel.cshtml) - Html - form-group HtmlContent - (730:29,10 [6] RazorPagesWithoutModel.cshtml) @@ -109,13 +109,13 @@ Document - IntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - IntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n CreateTagHelper - - DivTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (782:31,20 [25] RazorPagesWithoutModel.cshtml) IntermediateToken - (782:31,20 [25] RazorPagesWithoutModel.cshtml) - Html - col-md-offset-2 col-md-10 HtmlContent - (898:33,14 [6] RazorPagesWithoutModel.cshtml) IntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n CreateTagHelper - - DivTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (748:30,16 [10] RazorPagesWithoutModel.cshtml) IntermediateToken - (748:30,16 [10] RazorPagesWithoutModel.cshtml) - Html - form-group HtmlContent - (910:34,10 [11] RazorPagesWithoutModel.cshtml) diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt index 4477be908d..774bf45c72 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt @@ -11,10 +11,10 @@ Document - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures UsingStatement - (38:3,1 [43] RazorPagesWithoutModel.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel_cshtml - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - text-danger - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - class - col-md-10 - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - class - form-group - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - class - col-md-offset-2 col-md-10 - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - text-danger - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - class - col-md-10 - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - class - form-group - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - class - col-md-offset-2 col-md-10 - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - DivTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync CSharpCode - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt index 92feeae41d..ebae8659a5 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt @@ -52,7 +52,7 @@ Document - TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - DivTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (563:26,16 [11] RazorPages.cshtml) IntermediateToken - (563:26,16 [11] RazorPages.cshtml) - Html - text-danger HtmlContent - (582:26,35 [6] RazorPages.cshtml) @@ -83,13 +83,13 @@ Document - IntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - IntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n CreateTagHelper - - DivTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (701:29,20 [9] RazorPages.cshtml) IntermediateToken - (701:29,20 [9] RazorPages.cshtml) - Html - col-md-10 HtmlContent - (819:32,14 [6] RazorPages.cshtml) IntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n CreateTagHelper - - DivTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (600:27,16 [10] RazorPages.cshtml) IntermediateToken - (600:27,16 [10] RazorPages.cshtml) - Html - form-group HtmlContent - (831:33,10 [6] RazorPages.cshtml) @@ -110,13 +110,13 @@ Document - IntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - IntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n CreateTagHelper - - DivTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (883:35,20 [25] RazorPages.cshtml) IntermediateToken - (883:35,20 [25] RazorPages.cshtml) - Html - col-md-offset-2 col-md-10 HtmlContent - (999:37,14 [6] RazorPages.cshtml) IntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n CreateTagHelper - - DivTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (849:34,16 [10] RazorPages.cshtml) IntermediateToken - (849:34,16 [10] RazorPages.cshtml) - Html - form-group HtmlContent - (1011:38,10 [11] RazorPages.cshtml) diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt index def2df08f9..e60d171b16 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt @@ -11,10 +11,10 @@ Document - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures UsingStatement - (55:4,1 [43] RazorPages.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages_cshtml - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - text-danger - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - class - col-md-10 - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - class - form-group - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - class - col-md-offset-2 col-md-10 - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - text-danger - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - class - col-md-10 - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - class - form-group - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - class - col-md-offset-2 col-md-10 - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - DivTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync CSharpCode - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt index f471148308..8dba13bfc8 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt @@ -2,8 +2,8 @@ Document - NamespaceDeclaration - - Razor ClassDeclaration - - public - Template - - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - value - Hello - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - unbound - foo - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - type - text - AttributeStructure.SingleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - unbound - foo - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - FormTagHelper - InputTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync CSharpCode - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/PreallocatedAttributeTargetExtensionTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/PreallocatedAttributeTargetExtensionTest.cs index 51aa08cd64..8b2e842f0d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/PreallocatedAttributeTargetExtensionTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/PreallocatedAttributeTargetExtensionTest.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { Name = "Foo", Value = "Bar", - ValueStyle = HtmlAttributeValueStyle.DoubleQuotes, + AttributeStructure = AttributeStructure.DoubleQuotes, VariableName = "MyProp" }; @@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { Name = "Foo", Value = "Bar", - ValueStyle = HtmlAttributeValueStyle.Minimized, + AttributeStructure = AttributeStructure.Minimized, VariableName = "_tagHelper1" }; @@ -110,7 +110,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { Name = "Foo", Value = "Bar", - ValueStyle = HtmlAttributeValueStyle.DoubleQuotes, + AttributeStructure = AttributeStructure.DoubleQuotes, VariableName = "_tagHelper1", }; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs index 98662d8a09..10beea43c6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs @@ -208,7 +208,7 @@ namespace Microsoft.AspNetCore.Razor.Language c => Assert.IsType(c), c => TagHelperHtmlAttribute( "val", - HtmlAttributeValueStyle.DoubleQuotes, + AttributeStructure.DoubleQuotes, c, v => CSharpExpressionAttributeValue(string.Empty, "Hello", v), v => LiteralAttributeValue(" ", "World", v)))); @@ -252,7 +252,7 @@ namespace Microsoft.AspNetCore.Razor.Language c => Assert.IsType(c), c => TagHelperHtmlAttribute( "val", - HtmlAttributeValueStyle.DoubleQuotes, + AttributeStructure.DoubleQuotes, c, v => CSharpExpressionAttributeValue(string.Empty, "Hello", v), v => LiteralAttributeValue(" ", "World", v)))); @@ -298,7 +298,7 @@ namespace Microsoft.AspNetCore.Razor.Language c2 => Assert.IsType(c2), c2 => TagHelperHtmlAttribute( "val", - HtmlAttributeValueStyle.DoubleQuotes, + AttributeStructure.DoubleQuotes, c2, v => CSharpExpressionAttributeValue(string.Empty, "Hello", v), v => LiteralAttributeValue(" ", "World", v))), @@ -348,7 +348,7 @@ namespace Microsoft.AspNetCore.Razor.Language c => SetTagHelperProperty( "bound", "FooProp", - HtmlAttributeValueStyle.SingleQuotes, + AttributeStructure.SingleQuotes, c, v => Html("foo", v)))); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ParserTestBase.cs index 7fc8687cc3..0b9072bb85 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ParserTestBase.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ParserTestBase.cs @@ -381,16 +381,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy collector.AddMessage("{0} - PASSED :: Attribute names match", expected.Name); } - if (actual.ValueStyle != expected.ValueStyle) + if (actual.AttributeStructure != expected.AttributeStructure) { - collector.AddError("{0} - FAILED :: Attribute value styles do not match", expected.ValueStyle.ToString()); + collector.AddError("{0} - FAILED :: Attribute value styles do not match", expected.AttributeStructure.ToString()); } else { - collector.AddMessage("{0} - PASSED :: Attribute value style match", expected.ValueStyle); + collector.AddMessage("{0} - PASSED :: Attribute value style match", expected.AttributeStructure); } - if (actual.ValueStyle != HtmlAttributeValueStyle.Minimized) + if (actual.AttributeStructure != AttributeStructure.Minimized) { EvaluateSyntaxTreeNode(collector, actual.Value, expected.Value); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs index f975bbbdf7..65e4664381 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs @@ -25,11 +25,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("ul", attributes: new List { - new TagHelperAttributeNode("bound", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound", null, AttributeStructure.Minimized), new TagHelperAttributeNode( "[item]", factory.CodeMarkup("items").With(new ExpressionChunkGenerator()), - HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.SingleQuotes) })) }, { @@ -38,11 +38,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("ul", attributes: new List { - new TagHelperAttributeNode("bound", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound", null, AttributeStructure.Minimized), new TagHelperAttributeNode( "[(item)]", factory.CodeMarkup("items").With(new ExpressionChunkGenerator()), - HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.SingleQuotes) })) }, { @@ -51,11 +51,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("button", attributes: new List { - new TagHelperAttributeNode("bound", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound", null, AttributeStructure.Minimized), new TagHelperAttributeNode( "(click)", factory.CodeMarkup("doSomething()").With(new ExpressionChunkGenerator()), - HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.SingleQuotes) }, children: factory.Markup("Click Me"))) }, @@ -65,11 +65,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("button", attributes: new List { - new TagHelperAttributeNode("bound", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound", null, AttributeStructure.Minimized), new TagHelperAttributeNode( "(^click)", factory.CodeMarkup("doSomething()").With(new ExpressionChunkGenerator()), - HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.SingleQuotes) }, children: factory.Markup("Click Me"))) }, @@ -79,11 +79,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("template", attributes: new List { - new TagHelperAttributeNode("bound", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound", null, AttributeStructure.Minimized), new TagHelperAttributeNode( "*something", factory.Markup("value"), - HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.SingleQuotes) })) }, { @@ -92,8 +92,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("div", attributes: new List { - new TagHelperAttributeNode("bound", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("#localminimized", null, HtmlAttributeValueStyle.Minimized) + new TagHelperAttributeNode("bound", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("#localminimized", null, AttributeStructure.Minimized) })) }, { @@ -102,8 +102,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("div", attributes: new List { - new TagHelperAttributeNode("bound", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("#local", factory.Markup("value"), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("bound", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("#local", factory.Markup("value"), AttributeStructure.SingleQuotes) })) }, }; @@ -181,7 +181,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagOnly, attributes: new List { - new TagHelperAttributeNode("type", factory.Markup("text"), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("type", factory.Markup("text"), AttributeStructure.SingleQuotes) })) }, { @@ -198,7 +198,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagOnly, attributes: new List { - new TagHelperAttributeNode("type", factory.Markup("text"), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("type", factory.Markup("text"), AttributeStructure.SingleQuotes) }), new MarkupTagHelperBlock("input", TagMode.StartTagOnly)) }, @@ -265,7 +265,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagOnly, attributes: new List { - new TagHelperAttributeNode("type", factory.Markup("text"), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("type", factory.Markup("text"), AttributeStructure.SingleQuotes) })) }, { @@ -286,7 +286,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List { - new TagHelperAttributeNode("type", factory.Markup("text"), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("type", factory.Markup("text"), AttributeStructure.SingleQuotes) })) }, { @@ -373,7 +373,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "class", factory.Markup(string.Empty).With(SpanChunkGenerator.Null), - HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.SingleQuotes) })), new [] { @@ -412,7 +412,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "bar", new MarkupBlock(factory.Markup("false"), factory.Markup(" ")), - HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.SingleQuotes) })), new [] { @@ -437,7 +437,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupBlock( factory.Markup("false"), factory.Markup(" { - new TagHelperAttributeNode("foo", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("bar", null, HtmlAttributeValueStyle.Minimized) + new TagHelperAttributeNode("foo", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("bar", null, AttributeStructure.Minimized) }, new MarkupTagHelperBlock("strong"))), new [] @@ -556,7 +556,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.NoQuotes) + new TagHelperAttributeNode("class", factory.Markup("btn"), AttributeStructure.NoQuotes) })), new [] { @@ -572,7 +572,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.NoQuotes) + new TagHelperAttributeNode("class", factory.Markup("btn"), AttributeStructure.NoQuotes) })), new [] { @@ -591,7 +591,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "class", new MarkupBlock(factory.Markup("btn"), factory.Markup(" bar="))), - new TagHelperAttributeNode("foo", null, HtmlAttributeValueStyle.Minimized) + new TagHelperAttributeNode("foo", null, AttributeStructure.Minimized) }, new MarkupTagHelperBlock("strong"))), new [] @@ -619,7 +619,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "class", new MarkupBlock(factory.Markup("btn"), factory.Markup(" bar="))), - new TagHelperAttributeNode("foo", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("foo", null, AttributeStructure.Minimized), })), new RazorError[0] }, @@ -665,7 +665,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy factory.Code("DateTime.Now") .AsImplicitExpression(CSharpCodeParser.DefaultKeywords) .Accepts(AcceptedCharactersInternal.NonWhiteSpace)))), - HtmlAttributeValueStyle.DoubleQuotes) + AttributeStructure.DoubleQuotes) })), new [] { @@ -757,7 +757,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("class", factory.Markup("some"), HtmlAttributeValueStyle.NoQuotes) + new TagHelperAttributeNode("class", factory.Markup("some"), AttributeStructure.NoQuotes) })), new [] { @@ -1086,7 +1086,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy factory .CSharpCodeMarkup("DateTime.Now") .With(new ExpressionChunkGenerator())))), - HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.SingleQuotes) })) }, { @@ -1238,7 +1238,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("class", factory.Markup("foo"), HtmlAttributeValueStyle.NoQuotes), + new TagHelperAttributeNode("class", factory.Markup("foo"), AttributeStructure.NoQuotes), new TagHelperAttributeNode( "dynamic", new MarkupBlock( @@ -1253,8 +1253,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy factory.Code("DateTime.Now") .AsImplicitExpression(CSharpCodeParser.DefaultKeywords) .Accepts(AcceptedCharactersInternal.NonWhiteSpace)))), - HtmlAttributeValueStyle.DoubleQuotes), - new TagHelperAttributeNode("style", factory.Markup("color:red;"), HtmlAttributeValueStyle.NoQuotes) + AttributeStructure.DoubleQuotes), + new TagHelperAttributeNode("style", factory.Markup("color:red;"), AttributeStructure.NoQuotes) }, new MarkupTagHelperBlock("strong")), blockFactory.MarkupTagBlock("")), @@ -1472,7 +1472,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new List { new TagHelperAttributeNode("class", dateTimeNow(10)), - new TagHelperAttributeNode("style", dateTimeNow(32), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("style", dateTimeNow(32), AttributeStructure.SingleQuotes) })) }; yield return new object[] @@ -1483,7 +1483,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new List { new TagHelperAttributeNode("class", doWhile(10)), - new TagHelperAttributeNode("style", doWhile(83), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("style", doWhile(83), AttributeStructure.SingleQuotes) })) }; @@ -1496,7 +1496,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new List { new TagHelperAttributeNode("class", dateTimeNow(10)), - new TagHelperAttributeNode("style", dateTimeNow(32), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("style", dateTimeNow(32), AttributeStructure.SingleQuotes) }, factory.Markup("Hello World"))) }; @@ -1508,7 +1508,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new List { new TagHelperAttributeNode("class", doWhile(10)), - new TagHelperAttributeNode("style", doWhile(83), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("style", doWhile(83), AttributeStructure.SingleQuotes) }, factory.Markup("Hello World"))) }; @@ -1528,7 +1528,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("style", dateTimeNow(45), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("style", dateTimeNow(45), AttributeStructure.SingleQuotes) }, factory.Markup("World"))) }; @@ -1546,7 +1546,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("style", doWhile(96), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("style", doWhile(96), AttributeStructure.SingleQuotes) }, factory.Markup("World"))) }; @@ -1561,7 +1561,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new List { new TagHelperAttributeNode("class", dateTimeNow(10)), - new TagHelperAttributeNode("style", dateTimeNow(32), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("style", dateTimeNow(32), AttributeStructure.SingleQuotes) }, factory.Markup("Hello World "), new MarkupTagBlock( @@ -1862,7 +1862,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("class", new MarkupBlock(), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("class", new MarkupBlock(), AttributeStructure.SingleQuotes) })) }, { @@ -1876,7 +1876,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "class", factory.Markup("").With(SpanChunkGenerator.Null), - HtmlAttributeValueStyle.DoubleQuotes), + AttributeStructure.DoubleQuotes), })) }, { @@ -1886,11 +1886,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("class1", new MarkupBlock(), HtmlAttributeValueStyle.SingleQuotes), + new TagHelperAttributeNode("class1", new MarkupBlock(), AttributeStructure.SingleQuotes), new TagHelperAttributeNode( "class2", factory.Markup(string.Empty).With(SpanChunkGenerator.Null), - HtmlAttributeValueStyle.DoubleQuotes), + AttributeStructure.DoubleQuotes), new TagHelperAttributeNode("class3", new MarkupBlock()), })) }, @@ -1901,12 +1901,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("class1", new MarkupBlock(), HtmlAttributeValueStyle.SingleQuotes), + new TagHelperAttributeNode("class1", new MarkupBlock(), AttributeStructure.SingleQuotes), new TagHelperAttributeNode("class2", new MarkupBlock()), new TagHelperAttributeNode( "class3", factory.Markup(string.Empty).With(SpanChunkGenerator.Null), - HtmlAttributeValueStyle.DoubleQuotes), + AttributeStructure.DoubleQuotes), })) }, }; @@ -1941,7 +1941,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("bound", new MarkupBlock(), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("bound", new MarkupBlock(), AttributeStructure.SingleQuotes) })), new[] { @@ -1961,7 +1961,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "bound", factory.CodeMarkup(" true").With(new ExpressionChunkGenerator()), - HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.SingleQuotes) })), new RazorError[0] }, @@ -1976,7 +1976,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "bound", factory.CodeMarkup(" ").With(new ExpressionChunkGenerator()), - HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.SingleQuotes) })), new[] { @@ -1993,7 +1993,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("bound", new MarkupBlock(), HtmlAttributeValueStyle.SingleQuotes), + new TagHelperAttributeNode("bound", new MarkupBlock(), AttributeStructure.SingleQuotes), new TagHelperAttributeNode("bound", new MarkupBlock()) })), new[] @@ -2017,7 +2017,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "bound", factory.CodeMarkup(" ").With(new ExpressionChunkGenerator()), - HtmlAttributeValueStyle.SingleQuotes), + AttributeStructure.SingleQuotes), new TagHelperAttributeNode( "bound", factory.CodeMarkup(" ")) @@ -2043,11 +2043,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "bound", factory.CodeMarkup("true").With(new ExpressionChunkGenerator()), - HtmlAttributeValueStyle.SingleQuotes), + AttributeStructure.SingleQuotes), new TagHelperAttributeNode( "bound", factory.CodeMarkup(string.Empty).With(SpanChunkGenerator.Null), - HtmlAttributeValueStyle.DoubleQuotes) + AttributeStructure.DoubleQuotes) })), new[] { @@ -2067,8 +2067,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "bound", factory.CodeMarkup(string.Empty).With(SpanChunkGenerator.Null), - HtmlAttributeValueStyle.DoubleQuotes), - new TagHelperAttributeNode("name", new MarkupBlock(), HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.DoubleQuotes), + new TagHelperAttributeNode("name", new MarkupBlock(), AttributeStructure.SingleQuotes) })), new[] { @@ -2088,8 +2088,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "bound", factory.CodeMarkup(string.Empty).With(SpanChunkGenerator.Null), - HtmlAttributeValueStyle.DoubleQuotes), - new TagHelperAttributeNode("name", factory.Markup(" "), HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.DoubleQuotes), + new TagHelperAttributeNode("name", factory.Markup(" "), AttributeStructure.SingleQuotes) })), new[] { @@ -2109,16 +2109,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "bound", factory.CodeMarkup("true").With(new ExpressionChunkGenerator()), - HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("name", factory.Markup("john"), HtmlAttributeValueStyle.SingleQuotes), + AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("name", factory.Markup("john"), AttributeStructure.SingleQuotes), new TagHelperAttributeNode( "bound", factory.CodeMarkup(string.Empty).With(SpanChunkGenerator.Null), - HtmlAttributeValueStyle.DoubleQuotes), + AttributeStructure.DoubleQuotes), new TagHelperAttributeNode( "name", factory.Markup(string.Empty).With(SpanChunkGenerator.Null), - HtmlAttributeValueStyle.DoubleQuotes) + AttributeStructure.DoubleQuotes) })), new[] { @@ -2135,7 +2135,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("BouND", new MarkupBlock(), HtmlAttributeValueStyle.SingleQuotes) + new TagHelperAttributeNode("BouND", new MarkupBlock(), AttributeStructure.SingleQuotes) })), new[] { @@ -2152,7 +2152,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("BOUND", new MarkupBlock(), HtmlAttributeValueStyle.SingleQuotes), + new TagHelperAttributeNode("BOUND", new MarkupBlock(), AttributeStructure.SingleQuotes), new TagHelperAttributeNode("bOUnd", new MarkupBlock()) })), new[] @@ -2175,8 +2175,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "BOUND", factory.CodeMarkup(string.Empty).With(SpanChunkGenerator.Null), - HtmlAttributeValueStyle.DoubleQuotes), - new TagHelperAttributeNode("nAMe", factory.Markup("john"), HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.DoubleQuotes), + new TagHelperAttributeNode("nAMe", factory.Markup("john"), AttributeStructure.SingleQuotes) })), new[] { @@ -2204,7 +2204,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy factory.CSharpCodeMarkup("true") .With(new ExpressionChunkGenerator()))), factory.CodeMarkup(" ").With(new ExpressionChunkGenerator())), - HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.SingleQuotes) } })), new RazorError[0] @@ -2230,7 +2230,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy .With(new ExpressionChunkGenerator()), factory.CSharpCodeMarkup(")").With(new ExpressionChunkGenerator()))), factory.CodeMarkup(" ").With(new ExpressionChunkGenerator())), - HtmlAttributeValueStyle.SingleQuotes) + AttributeStructure.SingleQuotes) } })), new RazorError[0] @@ -2467,9 +2467,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("class", factory.Markup("foo"), HtmlAttributeValueStyle.NoQuotes), + new TagHelperAttributeNode("class", factory.Markup("foo"), AttributeStructure.NoQuotes), new TagHelperAttributeNode("dynamic", dateTimeNow(21)), - new TagHelperAttributeNode("style", factory.Markup("color:red;"), HtmlAttributeValueStyle.NoQuotes) + new TagHelperAttributeNode("style", factory.Markup("color:red;"), AttributeStructure.NoQuotes) })) }; yield return new object[] @@ -2479,9 +2479,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("class", factory.Markup("foo"), HtmlAttributeValueStyle.NoQuotes), + new TagHelperAttributeNode("class", factory.Markup("foo"), AttributeStructure.NoQuotes), new TagHelperAttributeNode("dynamic", dateTimeNow(21)), - new TagHelperAttributeNode("style", factory.Markup("color:red;"), HtmlAttributeValueStyle.NoQuotes) + new TagHelperAttributeNode("style", factory.Markup("color:red;"), AttributeStructure.NoQuotes) }, factory.Markup("Hello World"))) }; @@ -2492,7 +2492,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("class", factory.Markup("foo"), HtmlAttributeValueStyle.NoQuotes), + new TagHelperAttributeNode("class", factory.Markup("foo"), AttributeStructure.NoQuotes), new TagHelperAttributeNode("dynamic", dateTimeNow(21)), new TagHelperAttributeNode( "style", @@ -2502,7 +2502,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy factory.Markup("@").Accepts(AcceptedCharactersInternal.None), factory.Markup("@").With(SpanChunkGenerator.Null).Accepts(AcceptedCharactersInternal.None)), factory.Markup(":red;")), - HtmlAttributeValueStyle.DoubleQuotes) + AttributeStructure.DoubleQuotes) }, factory.Markup("Hello World"))) }; @@ -2513,7 +2513,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("class", factory.Markup("foo"), HtmlAttributeValueStyle.NoQuotes), + new TagHelperAttributeNode("class", factory.Markup("foo"), AttributeStructure.NoQuotes), new TagHelperAttributeNode("dynamic", dateTimeNow(21)) }, factory.Markup("Hello")), @@ -2521,7 +2521,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("style", factory.Markup("color:red;"), HtmlAttributeValueStyle.NoQuotes), + new TagHelperAttributeNode("style", factory.Markup("color:red;"), AttributeStructure.NoQuotes), new TagHelperAttributeNode("dynamic", dateTimeNow(73)) }, factory.Markup("World"))) @@ -2533,9 +2533,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("p", new List { - new TagHelperAttributeNode("class", factory.Markup("foo"), HtmlAttributeValueStyle.NoQuotes), + new TagHelperAttributeNode("class", factory.Markup("foo"), AttributeStructure.NoQuotes), new TagHelperAttributeNode("dynamic", dateTimeNow(21)), - new TagHelperAttributeNode("style", factory.Markup("color:red;"), HtmlAttributeValueStyle.NoQuotes) + new TagHelperAttributeNode("style", factory.Markup("color:red;"), AttributeStructure.NoQuotes) }, factory.Markup("Hello World "), new MarkupTagBlock( @@ -2725,7 +2725,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "data-required", new MarkupBlock(dateTimeNow), - HtmlAttributeValueStyle.SingleQuotes), + AttributeStructure.SingleQuotes), })) }, { @@ -2736,7 +2736,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("data-required", factory.Markup("value"), HtmlAttributeValueStyle.SingleQuotes), + new TagHelperAttributeNode("data-required", factory.Markup("value"), AttributeStructure.SingleQuotes), })) }, { @@ -2750,7 +2750,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "data-required", new MarkupBlock(factory.Markup("prefix "), dateTimeNow), - HtmlAttributeValueStyle.SingleQuotes), + AttributeStructure.SingleQuotes), })) }, { @@ -2764,7 +2764,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "data-required", new MarkupBlock(dateTimeNow, factory.Markup(" suffix")), - HtmlAttributeValueStyle.SingleQuotes), + AttributeStructure.SingleQuotes), })) }, { @@ -2781,7 +2781,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy factory.Markup("prefix "), dateTimeNow, factory.Markup(" suffix")), - HtmlAttributeValueStyle.SingleQuotes), + AttributeStructure.SingleQuotes), })) }, { @@ -2792,15 +2792,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("pre-attribute", value: null, valueStyle: HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("pre-attribute", value: null, attributeStructure: AttributeStructure.Minimized), new TagHelperAttributeNode( "data-required", new MarkupBlock( factory.Markup("prefix "), dateTimeNow, factory.Markup(" suffix")), - HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("post-attribute", value: null, valueStyle: HtmlAttributeValueStyle.Minimized), + AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("post-attribute", value: null, attributeStructure: AttributeStructure.Minimized), })) }, { @@ -2817,7 +2817,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy dateTimeNow, factory.Markup(" middle "), dateTimeNow), - HtmlAttributeValueStyle.SingleQuotes), + AttributeStructure.SingleQuotes), })) }, }; @@ -2910,7 +2910,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("unbound-required", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("unbound-required", null, AttributeStructure.Minimized), })), noErrors }, @@ -2922,7 +2922,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-string", null, AttributeStructure.Minimized), })), new[] { @@ -2938,7 +2938,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("bound-required-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-required-string", null, AttributeStructure.Minimized), })), new[] { @@ -2954,7 +2954,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("bound-required-int", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-required-int", null, AttributeStructure.Minimized), })), new[] { @@ -2970,7 +2970,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-int", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-int", null, AttributeStructure.Minimized), })), new[] { new RazorError(string.Format(errorFormat, "bound-int", "p", intType), 3, 0, 3, 9) } }, @@ -2982,7 +2982,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("int-dictionary", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("int-dictionary", null, AttributeStructure.Minimized), })), new[] { @@ -3002,7 +3002,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("string-dictionary", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("string-dictionary", null, AttributeStructure.Minimized), })), new[] { @@ -3022,7 +3022,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("int-prefix-", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("int-prefix-", null, AttributeStructure.Minimized), })), new[] { @@ -3048,7 +3048,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("string-prefix-", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("string-prefix-", null, AttributeStructure.Minimized), })), new[] { @@ -3074,7 +3074,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("int-prefix-value", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("int-prefix-value", null, AttributeStructure.Minimized), })), new[] { @@ -3094,7 +3094,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("string-prefix-value", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("string-prefix-value", null, AttributeStructure.Minimized), })), new[] { @@ -3114,7 +3114,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("int-prefix-value", new MarkupBlock(), HtmlAttributeValueStyle.SingleQuotes), + new TagHelperAttributeNode("int-prefix-value", new MarkupBlock(), AttributeStructure.SingleQuotes), })), new[] { @@ -3134,7 +3134,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List { - new TagHelperAttributeNode("string-prefix-value", new MarkupBlock(), HtmlAttributeValueStyle.SingleQuotes), + new TagHelperAttributeNode("string-prefix-value", new MarkupBlock(), AttributeStructure.SingleQuotes), })), new RazorError[0] }, @@ -3149,7 +3149,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new TagHelperAttributeNode( "int-prefix-value", factory.CodeMarkup("3").With(new ExpressionChunkGenerator()), - HtmlAttributeValueStyle.SingleQuotes), + AttributeStructure.SingleQuotes), })), new RazorError[0] }, @@ -3166,7 +3166,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupBlock( factory.Markup("some"), factory.Markup(" string")), - HtmlAttributeValueStyle.SingleQuotes), + AttributeStructure.SingleQuotes), })), new RazorError[0] }, @@ -3178,8 +3178,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("unbound-required", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("bound-required-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("unbound-required", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("bound-required-string", null, AttributeStructure.Minimized), })), new[] { @@ -3199,8 +3199,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-int", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("bound-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-int", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("bound-string", null, AttributeStructure.Minimized), })), new[] { @@ -3216,9 +3216,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("bound-required-int", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("unbound-required", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("bound-required-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-required-int", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("unbound-required", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("bound-required-string", null, AttributeStructure.Minimized), })), new[] { @@ -3240,9 +3240,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-int", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("bound-string", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("bound-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-int", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("bound-string", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("bound-string", null, AttributeStructure.Minimized), })), new[] { @@ -3259,8 +3259,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("unbound-required", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.SingleQuotes), + new TagHelperAttributeNode("unbound-required", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("class", factory.Markup("btn"), AttributeStructure.SingleQuotes), })), noErrors }, @@ -3272,8 +3272,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-string", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.SingleQuotes), + new TagHelperAttributeNode("bound-string", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("class", factory.Markup("btn"), AttributeStructure.SingleQuotes), })), new[] { @@ -3293,8 +3293,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("unbound-required", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("class", factory.Markup("btn"), AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("unbound-required", null, AttributeStructure.Minimized), })), noErrors }, @@ -3306,8 +3306,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("bound-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("class", factory.Markup("btn"), AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("bound-string", null, AttributeStructure.Minimized), })), new[] { @@ -3327,8 +3327,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("bound-required-string", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.SingleQuotes), + new TagHelperAttributeNode("bound-required-string", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("class", factory.Markup("btn"), AttributeStructure.SingleQuotes), })), new[] { @@ -3348,8 +3348,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("bound-required-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("class", factory.Markup("btn"), AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("bound-required-string", null, AttributeStructure.Minimized), })), new[] { @@ -3369,8 +3369,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("bound-required-int", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.SingleQuotes), + new TagHelperAttributeNode("bound-required-int", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("class", factory.Markup("btn"), AttributeStructure.SingleQuotes), })), new[] { @@ -3386,8 +3386,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-int", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.SingleQuotes), + new TagHelperAttributeNode("bound-int", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("class", factory.Markup("btn"), AttributeStructure.SingleQuotes), })), new[] { @@ -3402,8 +3402,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("bound-required-int", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("class", factory.Markup("btn"), AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("bound-required-int", null, AttributeStructure.Minimized), })), new[] { @@ -3418,8 +3418,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("bound-int", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("class", factory.Markup("btn"), AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("bound-int", null, AttributeStructure.Minimized), })), new[] { @@ -3434,8 +3434,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("class", expression(14), HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("bound-required-int", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("class", expression(14), AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("bound-required-int", null, AttributeStructure.Minimized), })), new[] { @@ -3451,8 +3451,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("class", expression(10), HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("bound-int", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("class", expression(10), AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("bound-int", null, AttributeStructure.Minimized), })), new[] { @@ -3468,11 +3468,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.SelfClosing, attributes: new List() { - new TagHelperAttributeNode("bound-required-int", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("class", expression(36), HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("bound-required-string", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("class", expression(86), HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("unbound-required", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-required-int", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("class", expression(36), AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("bound-required-string", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("class", expression(86), AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("unbound-required", null, AttributeStructure.Minimized), })), new[] { @@ -3495,11 +3495,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-int", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("class", expression(23), HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("bound-string", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("class", expression(64), HtmlAttributeValueStyle.SingleQuotes), - new TagHelperAttributeNode("bound-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-int", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("class", expression(23), AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("bound-string", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("class", expression(64), AttributeStructure.SingleQuotes), + new TagHelperAttributeNode("bound-string", null, AttributeStructure.Minimized), })), new[] { @@ -3598,7 +3598,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy tagHelperBlock.Attributes[i] = new TagHelperAttributeNode( attribute.Name, blockBuilder.Build(), - attribute.ValueStyle); + attribute.AttributeStructure); } } } @@ -3650,7 +3650,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("unbound-required", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("unbound-required", null, AttributeStructure.Minimized), })), new[] { @@ -3672,7 +3672,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-required-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-required-string", null, AttributeStructure.Minimized), })), new[] { @@ -3700,7 +3700,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-required-int", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-required-int", null, AttributeStructure.Minimized), })), new[] { @@ -3728,9 +3728,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-required-int", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("unbound-required", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("bound-required-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-required-int", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("unbound-required", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("bound-required-string", null, AttributeStructure.Minimized), })), new[] { @@ -3764,7 +3764,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-string", null, AttributeStructure.Minimized), })), new[] { @@ -3788,7 +3788,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-int", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-int", null, AttributeStructure.Minimized), })), new[] { @@ -3811,8 +3811,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-int", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("bound-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-int", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("bound-string", null, AttributeStructure.Minimized), })), new[] { @@ -3837,17 +3837,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-required-int", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("unbound-required", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("bound-required-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-required-int", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("unbound-required", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("bound-required-string", null, AttributeStructure.Minimized), }, children: new MarkupTagHelperBlock( "p", TagMode.StartTagAndEndTag, attributes: new List() { - new TagHelperAttributeNode("bound-int", null, HtmlAttributeValueStyle.Minimized), - new TagHelperAttributeNode("bound-string", null, HtmlAttributeValueStyle.Minimized), + new TagHelperAttributeNode("bound-int", null, AttributeStructure.Minimized), + new TagHelperAttributeNode("bound-string", null, AttributeStructure.Minimized), }))), new[] { diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs index d453b957e6..3e6886ffae 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs @@ -708,7 +708,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("strong", new List { - new TagHelperAttributeNode("required", null, HtmlAttributeValueStyle.Minimized) + new TagHelperAttributeNode("required", null, AttributeStructure.Minimized) }, blockFactory.MarkupTagBlock(""), blockFactory.MarkupTagBlock(""))); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt index 12dd207502..3437a8f033 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt @@ -19,7 +19,7 @@ Document - HtmlContent - (79:3,29 [5] AttributeTargetingTagHelpers.cshtml) IntermediateToken - (79:3,29 [5] AttributeTargetingTagHelpers.cshtml) - Html - Hello CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - catchAll - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - catchAll - AttributeStructure.DoubleQuotes HtmlContent - (75:3,25 [2] AttributeTargetingTagHelpers.cshtml) IntermediateToken - (75:3,25 [2] AttributeTargetingTagHelpers.cshtml) - Html - hi HtmlContent - (93:3,43 [62] AttributeTargetingTagHelpers.cshtml) @@ -59,12 +59,12 @@ Document - IntermediateToken - (214:6,17 [8] AttributeTargetingTagHelpers.cshtml) - Html - checkbox SetTagHelperProperty - (233:6,36 [4] AttributeTargetingTagHelpers.cshtml) - checked - Checked - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (233:6,36 [4] AttributeTargetingTagHelpers.cshtml) - CSharp - true - AddTagHelperHtmlAttribute - - catchAll - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - catchAll - AttributeStructure.DoubleQuotes HtmlContent - (249:6,52 [2] AttributeTargetingTagHelpers.cshtml) IntermediateToken - (249:6,52 [2] AttributeTargetingTagHelpers.cshtml) - Html - hi HtmlContent - (255:6,58 [2] AttributeTargetingTagHelpers.cshtml) IntermediateToken - (255:6,58 [2] AttributeTargetingTagHelpers.cshtml) - Html - \n CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (43:2,10 [3] AttributeTargetingTagHelpers.cshtml) IntermediateToken - (43:2,10 [3] AttributeTargetingTagHelpers.cshtml) - Html - btn diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.ir.txt index f2a48f414b..344133984a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_Runtime.ir.txt @@ -1,9 +1,9 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeTargetingTagHelpers_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - catchAll - hi - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - catchAll - hi - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_1 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - class - btn - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - class - btn - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.CatchAllTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (31:1,0 [2] AttributeTargetingTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt index d0bd9c4175..77229ed172 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt @@ -23,7 +23,7 @@ Document - TagHelper - (155:4,8 [25] BasicTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - data - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - data - AttributeStructure.DoubleQuotes HtmlContent - (164:4,17 [10] BasicTagHelpers.cshtml) IntermediateToken - (164:4,17 [10] BasicTagHelpers.cshtml) - Html - -delay1000 HtmlContent - (180:4,33 [10] BasicTagHelpers.cshtml) @@ -32,7 +32,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.InputTagHelper2 - AddTagHelperHtmlAttribute - - data-interval - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - data-interval - AttributeStructure.DoubleQuotes HtmlContent - (212:5,30 [7] BasicTagHelpers.cshtml) IntermediateToken - (212:5,30 [7] BasicTagHelpers.cshtml) - Html - 2000 + CSharpExpression - (220:5,38 [23] BasicTagHelpers.cshtml) @@ -62,10 +62,10 @@ Document - HtmlContent - (310:6,47 [6] BasicTagHelpers.cshtml) IntermediateToken - (310:6,47 [6] BasicTagHelpers.cshtml) - Html - \n CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (114:3,14 [11] BasicTagHelpers.cshtml) IntermediateToken - (114:3,14 [11] BasicTagHelpers.cshtml) - Html - Hello World - AddTagHelperHtmlAttribute - - data-delay - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - data-delay - AttributeStructure.DoubleQuotes HtmlContent - (139:3,39 [4] BasicTagHelpers.cshtml) IntermediateToken - (139:3,39 [4] BasicTagHelpers.cshtml) - Html - 1000 HtmlContent - (320:7,8 [8] BasicTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt index 3f2e826176..1b3c57925d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt @@ -42,7 +42,7 @@ Document - HtmlContent - (232:7,49 [6] BasicTagHelpers_Prefixed.cshtml) IntermediateToken - (232:7,49 [6] BasicTagHelpers_Prefixed.cshtml) - Html - \n CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (122:4,17 [11] BasicTagHelpers_Prefixed.cshtml) IntermediateToken - (122:4,17 [11] BasicTagHelpers_Prefixed.cshtml) - Html - Hello World HtmlContent - (245:8,11 [11] BasicTagHelpers_Prefixed.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.ir.txt index 16e5973b72..4c11b62cfc 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_Runtime.ir.txt @@ -2,7 +2,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_Prefixed_Runtime - - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - class - Hello World - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (57:2,0 [52] BasicTagHelpers_Prefixed.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.ir.txt index 11fb3385b6..371393c521 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_RemoveTagHelper_Runtime.ir.txt @@ -3,7 +3,7 @@ Document - ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_RemoveTagHelper_Runtime - - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - type - text - HtmlAttributeValueStyle.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_1 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - class - Hello World - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (72:2,0 [49] BasicTagHelpers_RemoveTagHelper.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.ir.txt index 294a73547e..bc5cdeac19 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Runtime.ir.txt @@ -1,11 +1,11 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - data - -delay1000 - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - data - -delay1000 - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_2 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_4 - data-delay - 1000 - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - class - Hello World - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_4 - data-delay - 1000 - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [71] BasicTagHelpers.cshtml) @@ -31,7 +31,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.InputTagHelper2 - AddTagHelperHtmlAttribute - - data-interval - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - data-interval - AttributeStructure.DoubleQuotes HtmlContent - (212:5,30 [7] BasicTagHelpers.cshtml) IntermediateToken - (212:5,30 [7] BasicTagHelpers.cshtml) - Html - 2000 + CSharpExpression - (220:5,38 [23] BasicTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt index 2a7e03f2fb..fc6346030b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt @@ -27,7 +27,7 @@ Document - IntermediateToken - (150:7,19 [1] ComplexTagHelpers.cshtml) - CSharp - ( IntermediateToken - (151:7,20 [3] ComplexTagHelpers.cshtml) - CSharp - 1+2 IntermediateToken - (154:7,23 [1] ComplexTagHelpers.cshtml) - CSharp - ) - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (164:7,33 [1] ComplexTagHelpers.cshtml) IntermediateToken - (164:7,33 [1] ComplexTagHelpers.cshtml) - Html - @ HtmlContent - (166:7,35 [6] ComplexTagHelpers.cshtml) @@ -58,10 +58,10 @@ Document - SetTagHelperProperty - (342:12,42 [4] ComplexTagHelpers.cshtml) - type - Type - HtmlAttributeValueStyle.DoubleQuotes HtmlContent - (342:12,42 [4] ComplexTagHelpers.cshtml) IntermediateToken - (342:12,42 [4] ComplexTagHelpers.cshtml) - Html - text - AddTagHelperHtmlAttribute - - value - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - value - AttributeStructure.DoubleQuotes HtmlContent - (355:12,55 [0] ComplexTagHelpers.cshtml) IntermediateToken - (355:12,55 [0] ComplexTagHelpers.cshtml) - Html - - AddTagHelperHtmlAttribute - - placeholder - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - placeholder - AttributeStructure.DoubleQuotes HtmlContent - (370:12,70 [22] ComplexTagHelpers.cshtml) IntermediateToken - (370:12,70 [22] ComplexTagHelpers.cshtml) - Html - Enter in a new time... CreateTagHelper - - TestNamespace.PTagHelper @@ -129,7 +129,7 @@ Document - HtmlContent - (705:19,13 [10] ComplexTagHelpers.cshtml) IntermediateToken - (705:19,13 [10] ComplexTagHelpers.cshtml) - Html - \n CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - time - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - time - AttributeStructure.DoubleQuotes HtmlAttributeValue - (197:8,17 [7] ComplexTagHelpers.cshtml) - IntermediateToken - (197:8,17 [7] ComplexTagHelpers.cshtml) - Html - Current HtmlAttributeValue - (204:8,24 [6] ComplexTagHelpers.cshtml) - @@ -158,7 +158,7 @@ Document - HtmlContent - (896:23,40 [10] ComplexTagHelpers.cshtml) IntermediateToken - (896:23,40 [10] ComplexTagHelpers.cshtml) - Html - \n CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes HtmlContent - (741:21,20 [11] ComplexTagHelpers.cshtml) IntermediateToken - (741:21,20 [11] ComplexTagHelpers.cshtml) - Html - first value SetTagHelperProperty - (759:21,38 [31] ComplexTagHelpers.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes @@ -166,7 +166,7 @@ Document - IntermediateToken - (760:21,39 [23] ComplexTagHelpers.cshtml) - CSharp - DateTimeOffset.Now.Year IntermediateToken - (783:21,62 [2] ComplexTagHelpers.cshtml) - CSharp - - IntermediateToken - (785:21,64 [5] ComplexTagHelpers.cshtml) - CSharp - 1970 - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes HtmlContent - (801:21,80 [12] ComplexTagHelpers.cshtml) IntermediateToken - (801:21,80 [12] ComplexTagHelpers.cshtml) - Html - second value HtmlContent - (910:24,12 [10] ComplexTagHelpers.cshtml) @@ -179,10 +179,10 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.InputTagHelper2 - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes HtmlContent - (992:26,28 [5] ComplexTagHelpers.cshtml) IntermediateToken - (992:26,28 [5] ComplexTagHelpers.cshtml) - Html - hello - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes HtmlContent - (1008:26,44 [5] ComplexTagHelpers.cshtml) IntermediateToken - (1008:26,44 [5] ComplexTagHelpers.cshtml) - Html - world SetTagHelperProperty - (1024:26,60 [33] ComplexTagHelpers.cshtml) - checked - Checked - HtmlAttributeValueStyle.DoubleQuotes @@ -262,7 +262,7 @@ Document - CreateTagHelper - - TestNamespace.PTagHelper SetTagHelperProperty - (1375:34,29 [3] ComplexTagHelpers.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (1375:34,29 [3] ComplexTagHelpers.cshtml) - CSharp - 123 - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (1387:34,41 [5] ComplexTagHelpers.cshtml) IntermediateToken - (1387:34,41 [5] ComplexTagHelpers.cshtml) - Html - hello IntermediateToken - (1424:34,78 [1] ComplexTagHelpers.cshtml) - CSharp - ) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt index 9b7d489c93..af802af505 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ComplexTagHelpers_Runtime - - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - type - text - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - value - - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - placeholder - Enter in a new time... - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - unbound - first value - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_4 - unbound - second value - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - unbound - hello - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_6 - unbound - world - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_7 - class - hello - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - value - - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - placeholder - Enter in a new time... - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - unbound - first value - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_4 - unbound - second value - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - unbound - hello - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_6 - unbound - world - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_7 - class - hello - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [2] ComplexTagHelpers.cshtml) @@ -32,7 +32,7 @@ Document - IntermediateToken - (150:7,19 [1] ComplexTagHelpers.cshtml) - CSharp - ( IntermediateToken - (151:7,20 [3] ComplexTagHelpers.cshtml) - CSharp - 1+2 IntermediateToken - (154:7,23 [1] ComplexTagHelpers.cshtml) - CSharp - ) - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (164:7,33 [1] ComplexTagHelpers.cshtml) IntermediateToken - (164:7,33 [1] ComplexTagHelpers.cshtml) - Html - @ HtmlContent - (166:7,35 [6] ComplexTagHelpers.cshtml) @@ -138,7 +138,7 @@ Document - HtmlContent - (707:20,0 [8] ComplexTagHelpers.cshtml) IntermediateToken - (707:20,0 [8] ComplexTagHelpers.cshtml) - Html - CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - time - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - time - AttributeStructure.DoubleQuotes HtmlAttributeValue - (197:8,17 [7] ComplexTagHelpers.cshtml) - IntermediateToken - (197:8,17 [7] ComplexTagHelpers.cshtml) - Html - Current HtmlAttributeValue - (204:8,24 [6] ComplexTagHelpers.cshtml) - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.ir.txt index 627ff38fd8..3253a53346 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CssSelectorTagHelperAttributes_Runtime.ir.txt @@ -1,15 +1,15 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CssSelectorTagHelperAttributes_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - href - ~/ - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - href - ~/hello - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - href - ~/?hello=world - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - href - ~/?hello=world@false - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - href - ~/ - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - href - ~/hello - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - href - ~/?hello=world - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - href - ~/?hello=world@false - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_4 - type - text - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - value - 3 TagHelpers - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - value - 3 TagHelpers - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_6 - type - texty - HtmlAttributeValueStyle.SingleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_7 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_8 - value - 2 TagHelper - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_8 - value - 2 TagHelper - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.ATagHelper - TestNamespace.CatchAllTagHelper - TestNamespace.ATagHelperMultipleSelectors - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 - TestNamespace.CatchAllTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [2] CssSelectorTagHelperAttributes.cshtml) @@ -46,7 +46,7 @@ Document - IntermediateToken - (175:5,31 [12] CssSelectorTagHelperAttributes.cshtml) - Html - 2 TagHelpers CreateTagHelper - - TestNamespace.ATagHelperMultipleSelectors CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - href - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - href - AttributeStructure.DoubleQuotes HtmlAttributeValue - (153:5,9 [2] CssSelectorTagHelperAttributes.cshtml) - IntermediateToken - (153:5,9 [2] CssSelectorTagHelperAttributes.cshtml) - Html - ~/ CSharpExpressionAttributeValue - (155:5,11 [6] CssSelectorTagHelperAttributes.cshtml) - @@ -66,7 +66,7 @@ Document - HtmlContent - (243:7,17 [11] CssSelectorTagHelperAttributes.cshtml) IntermediateToken - (243:7,17 [11] CssSelectorTagHelperAttributes.cshtml) - Html - 1 TagHelper CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - href - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - href - AttributeStructure.DoubleQuotes HtmlAttributeValue - (234:7,8 [2] CssSelectorTagHelperAttributes.cshtml) - IntermediateToken - (234:7,8 [2] CssSelectorTagHelperAttributes.cshtml) - Html - ~/ CSharpExpressionAttributeValue - (236:7,10 [6] CssSelectorTagHelperAttributes.cshtml) - @@ -86,7 +86,7 @@ Document - HtmlContent - (340:9,32 [11] CssSelectorTagHelperAttributes.cshtml) IntermediateToken - (340:9,32 [11] CssSelectorTagHelperAttributes.cshtml) - Html - 1 TagHelper CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - href - HtmlAttributeValueStyle.SingleQuotes + AddTagHelperHtmlAttribute - - href - AttributeStructure.SingleQuotes HtmlAttributeValue - (317:9,9 [14] CssSelectorTagHelperAttributes.cshtml) - IntermediateToken - (317:9,9 [14] CssSelectorTagHelperAttributes.cshtml) - Html - ~/?hello=world CSharpExpressionAttributeValue - (331:9,23 [7] CssSelectorTagHelperAttributes.cshtml) - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt index 8312232265..4bee25f77d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt @@ -23,7 +23,7 @@ Document - SetTagHelperProperty - (84:3,17 [6] DuplicateAttributeTagHelpers.cshtml) - type - Type - HtmlAttributeValueStyle.DoubleQuotes HtmlContent - (84:3,17 [6] DuplicateAttributeTagHelpers.cshtml) IntermediateToken - (84:3,17 [6] DuplicateAttributeTagHelpers.cshtml) - Html - button - AddTagHelperHtmlAttribute - - TYPE - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - TYPE - AttributeStructure.DoubleQuotes HtmlContent - (98:3,31 [8] DuplicateAttributeTagHelpers.cshtml) IntermediateToken - (98:3,31 [8] DuplicateAttributeTagHelpers.cshtml) - Html - checkbox HtmlContent - (110:3,43 [6] DuplicateAttributeTagHelpers.cshtml) @@ -40,10 +40,10 @@ Document - IntermediateToken - (129:4,17 [6] DuplicateAttributeTagHelpers.cshtml) - Html - button SetTagHelperProperty - (146:4,34 [4] DuplicateAttributeTagHelpers.cshtml) - checked - Checked - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (146:4,34 [4] DuplicateAttributeTagHelpers.cshtml) - CSharp - true - AddTagHelperHtmlAttribute - - type - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - type - AttributeStructure.DoubleQuotes HtmlContent - (158:4,46 [8] DuplicateAttributeTagHelpers.cshtml) IntermediateToken - (158:4,46 [8] DuplicateAttributeTagHelpers.cshtml) - Html - checkbox - AddTagHelperHtmlAttribute - - checked - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - checked - AttributeStructure.DoubleQuotes HtmlContent - (177:4,65 [5] DuplicateAttributeTagHelpers.cshtml) IntermediateToken - (177:4,65 [5] DuplicateAttributeTagHelpers.cshtml) - Html - false HtmlContent - (186:4,74 [6] DuplicateAttributeTagHelpers.cshtml) @@ -60,16 +60,16 @@ Document - IntermediateToken - (205:5,17 [6] DuplicateAttributeTagHelpers.cshtml) - Html - button SetTagHelperProperty - (222:5,34 [4] DuplicateAttributeTagHelpers.cshtml) - checked - Checked - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (222:5,34 [4] DuplicateAttributeTagHelpers.cshtml) - CSharp - true - AddTagHelperHtmlAttribute - - type - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - type - AttributeStructure.DoubleQuotes HtmlContent - (233:5,45 [8] DuplicateAttributeTagHelpers.cshtml) IntermediateToken - (233:5,45 [8] DuplicateAttributeTagHelpers.cshtml) - Html - checkbox - AddTagHelperHtmlAttribute - - checked - HtmlAttributeValueStyle.SingleQuotes + AddTagHelperHtmlAttribute - - checked - AttributeStructure.SingleQuotes HtmlContent - (251:5,63 [4] DuplicateAttributeTagHelpers.cshtml) IntermediateToken - (251:5,63 [4] DuplicateAttributeTagHelpers.cshtml) - Html - true - AddTagHelperHtmlAttribute - - type - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - type - AttributeStructure.DoubleQuotes HtmlContent - (263:5,75 [8] DuplicateAttributeTagHelpers.cshtml) IntermediateToken - (263:5,75 [8] DuplicateAttributeTagHelpers.cshtml) - Html - checkbox - AddTagHelperHtmlAttribute - - checked - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - checked - AttributeStructure.DoubleQuotes HtmlContent - (281:5,93 [4] DuplicateAttributeTagHelpers.cshtml) IntermediateToken - (281:5,93 [4] DuplicateAttributeTagHelpers.cshtml) - Html - true HtmlContent - (288:5,100 [2] DuplicateAttributeTagHelpers.cshtml) @@ -77,9 +77,9 @@ Document - CreateTagHelper - - TestNamespace.PTagHelper SetTagHelperProperty - (43:2,8 [1] DuplicateAttributeTagHelpers.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (43:2,8 [1] DuplicateAttributeTagHelpers.cshtml) - CSharp - 3 - AddTagHelperHtmlAttribute - - AGE - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - AGE - AttributeStructure.DoubleQuotes HtmlContent - (51:2,16 [2] DuplicateAttributeTagHelpers.cshtml) IntermediateToken - (51:2,16 [2] DuplicateAttributeTagHelpers.cshtml) - Html - 40 - AddTagHelperHtmlAttribute - - Age - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - Age - AttributeStructure.DoubleQuotes HtmlContent - (60:2,25 [3] DuplicateAttributeTagHelpers.cshtml) IntermediateToken - (60:2,25 [3] DuplicateAttributeTagHelpers.cshtml) - Html - 500 diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.ir.txt index 8595c0adf4..cb51538f66 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_Runtime.ir.txt @@ -2,14 +2,14 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateAttributeTagHelpers_Runtime - - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - type - button - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - TYPE - checkbox - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - checked - false - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - TYPE - checkbox - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - type - checkbox - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - checked - false - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_4 - type - button - HtmlAttributeValueStyle.SingleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - checked - true - HtmlAttributeValueStyle.SingleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_6 - checked - true - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_7 - AGE - 40 - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_8 - Age - 500 - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - checked - true - AttributeStructure.SingleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_6 - checked - true - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_7 - AGE - 40 - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_8 - Age - 500 - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [2] DuplicateAttributeTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt index 3ba86d04fe..346303293e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt @@ -12,7 +12,7 @@ Document - TagHelper - (35:2,0 [40] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes HtmlAttributeValue - (51:2,16 [6] DynamicAttributeTagHelpers.cshtml) - IntermediateToken - (51:2,16 [6] DynamicAttributeTagHelpers.cshtml) - Html - prefix CSharpExpressionAttributeValue - (57:2,22 [14] DynamicAttributeTagHelpers.cshtml) - @@ -22,7 +22,7 @@ Document - TagHelper - (79:4,0 [71] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes CSharpCodeAttributeValue - (95:4,16 [44] DynamicAttributeTagHelpers.cshtml) - IntermediateToken - (96:4,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { CSharpExpression - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml) @@ -46,7 +46,7 @@ Document - IntermediateToken - (176:6,22 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - DateTime.Now HtmlContent - (188:6,34 [7] DynamicAttributeTagHelpers.cshtml) IntermediateToken - (188:6,34 [7] DynamicAttributeTagHelpers.cshtml) - Html - suffix - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes HtmlAttributeValue - (206:6,52 [6] DynamicAttributeTagHelpers.cshtml) - IntermediateToken - (206:6,52 [6] DynamicAttributeTagHelpers.cshtml) - Html - prefix CSharpExpressionAttributeValue - (212:6,58 [14] DynamicAttributeTagHelpers.cshtml) - @@ -77,7 +77,7 @@ Document - IntermediateToken - (314:8,73 [1] DynamicAttributeTagHelpers.cshtml) - Html - CSharpExpression - (316:8,75 [12] DynamicAttributeTagHelpers.cshtml) IntermediateToken - (316:8,75 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - int.MaxValue - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes CSharpExpressionAttributeValue - (347:9,16 [14] DynamicAttributeTagHelpers.cshtml) - IntermediateToken - (348:9,17 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue CSharpCodeAttributeValue - (361:9,30 [45] DynamicAttributeTagHelpers.cshtml) - @@ -95,7 +95,7 @@ Document - TagHelper - (428:11,0 [80] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes CSharpExpressionAttributeValue - (444:11,16 [14] DynamicAttributeTagHelpers.cshtml) - IntermediateToken - (445:11,17 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue CSharpExpressionAttributeValue - (458:11,30 [14] DynamicAttributeTagHelpers.cshtml) - @@ -111,7 +111,7 @@ Document - TagHelper - (512:13,0 [64] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes CSharpCodeAttributeValue - (528:13,16 [44] DynamicAttributeTagHelpers.cshtml) - IntermediateToken - (529:13,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { CSharpExpression - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt index 109d41eeea..43355ffc30 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt @@ -8,7 +8,7 @@ Document - TagHelper - (35:2,0 [40] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes HtmlAttributeValue - (51:2,16 [6] DynamicAttributeTagHelpers.cshtml) - IntermediateToken - (51:2,16 [6] DynamicAttributeTagHelpers.cshtml) - Html - prefix CSharpExpressionAttributeValue - (57:2,22 [14] DynamicAttributeTagHelpers.cshtml) - @@ -18,7 +18,7 @@ Document - TagHelper - (79:4,0 [71] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes CSharpCodeAttributeValue - (95:4,16 [44] DynamicAttributeTagHelpers.cshtml) - IntermediateToken - (96:4,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { CSharpExpression - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml) @@ -42,7 +42,7 @@ Document - IntermediateToken - (176:6,22 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - DateTime.Now HtmlContent - (188:6,34 [7] DynamicAttributeTagHelpers.cshtml) IntermediateToken - (188:6,34 [7] DynamicAttributeTagHelpers.cshtml) - Html - suffix - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes HtmlAttributeValue - (206:6,52 [6] DynamicAttributeTagHelpers.cshtml) - IntermediateToken - (206:6,52 [6] DynamicAttributeTagHelpers.cshtml) - Html - prefix CSharpExpressionAttributeValue - (212:6,58 [14] DynamicAttributeTagHelpers.cshtml) - @@ -73,7 +73,7 @@ Document - IntermediateToken - (314:8,73 [1] DynamicAttributeTagHelpers.cshtml) - Html - CSharpExpression - (316:8,75 [12] DynamicAttributeTagHelpers.cshtml) IntermediateToken - (316:8,75 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - int.MaxValue - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes CSharpExpressionAttributeValue - (347:9,16 [14] DynamicAttributeTagHelpers.cshtml) - IntermediateToken - (348:9,17 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue CSharpCodeAttributeValue - (361:9,30 [45] DynamicAttributeTagHelpers.cshtml) - @@ -91,7 +91,7 @@ Document - TagHelper - (428:11,0 [80] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes CSharpExpressionAttributeValue - (444:11,16 [14] DynamicAttributeTagHelpers.cshtml) - IntermediateToken - (445:11,17 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue CSharpExpressionAttributeValue - (458:11,30 [14] DynamicAttributeTagHelpers.cshtml) - @@ -107,7 +107,7 @@ Document - TagHelper - (512:13,0 [64] DynamicAttributeTagHelpers.cshtml) - input - TagMode.SelfClosing TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes CSharpCodeAttributeValue - (528:13,16 [44] DynamicAttributeTagHelpers.cshtml) - IntermediateToken - (529:13,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { CSharpExpression - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt index 686fa347e8..9c6df94eef 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt @@ -23,7 +23,7 @@ Document - IntermediateToken - (56:3,16 [0] EmptyAttributeTagHelpers.cshtml) - Html - SetTagHelperProperty - (66:3,26 [0] EmptyAttributeTagHelpers.cshtml) - checked - Checked - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (66:3,26 [0] EmptyAttributeTagHelpers.cshtml) - CSharp - - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (74:3,34 [0] EmptyAttributeTagHelpers.cshtml) IntermediateToken - (74:3,34 [0] EmptyAttributeTagHelpers.cshtml) - Html - HtmlContent - (78:3,38 [6] EmptyAttributeTagHelpers.cshtml) @@ -44,7 +44,7 @@ Document - IntermediateToken - (117:5,21 [0] EmptyAttributeTagHelpers.cshtml) - Html - SetTagHelperProperty - (126:5,30 [0] EmptyAttributeTagHelpers.cshtml) - checked - Checked - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (126:5,30 [0] EmptyAttributeTagHelpers.cshtml) - CSharp - - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (134:5,38 [0] EmptyAttributeTagHelpers.cshtml) IntermediateToken - (134:5,38 [0] EmptyAttributeTagHelpers.cshtml) - Html - HtmlContent - (138:5,42 [6] EmptyAttributeTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.ir.txt index 91d8e2e7a6..8ac44d8bbc 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.ir.txt @@ -2,7 +2,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyAttributeTagHelpers_Runtime - - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - type - - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - class - - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - class - - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 - TestNamespace.PTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (31:1,0 [13] EmptyAttributeTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt index b81152a091..cea8c64b83 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt @@ -26,7 +26,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes CSharpExpressionAttributeValue - (130:7,14 [21] EnumTagHelpers.cshtml) - IntermediateToken - (131:7,15 [20] EnumTagHelpers.cshtml) - CSharp - MyEnum.MySecondValue HtmlContent - (155:7,39 [2] EnumTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt index 2c1ceabefb..853f2a6118 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt @@ -22,7 +22,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes CSharpExpressionAttributeValue - (130:7,14 [21] EnumTagHelpers.cshtml) - IntermediateToken - (131:7,15 [20] EnumTagHelpers.cshtml) - CSharp - MyEnum.MySecondValue HtmlContent - (155:7,39 [2] EnumTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt index 40825270bd..9479d07385 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt @@ -12,6 +12,6 @@ Document - TagHelper - (35:2,0 [10] IncompleteTagHelper.cshtml) - p - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (45:2,10 [0] IncompleteTagHelper.cshtml) IntermediateToken - (45:2,10 [0] IncompleteTagHelper.cshtml) - Html - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.ir.txt index 5aca5a5bdc..730ff5a41b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_Runtime.ir.txt @@ -1,7 +1,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteTagHelper_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [2] IncompleteTagHelper.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt index 925e8bb1d9..0701965a3d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt @@ -20,21 +20,21 @@ Document - TagHelper - (98:4,4 [59] MinimizedTagHelpers.cshtml) - input - TagMode.SelfClosing TagHelperBody - CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (112:4,18 [3] MinimizedTagHelpers.cshtml) IntermediateToken - (112:4,18 [3] MinimizedTagHelpers.cshtml) - Html - btn - AddTagHelperHtmlAttribute - - catchall-unbound-required - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - catchall-unbound-required - AttributeStructure.Minimized HtmlContent - (157:5,39 [6] MinimizedTagHelpers.cshtml) IntermediateToken - (157:5,39 [6] MinimizedTagHelpers.cshtml) - Html - \n TagHelper - (163:6,4 [119] MinimizedTagHelpers.cshtml) - input - TagMode.SelfClosing TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (190:7,18 [3] MinimizedTagHelpers.cshtml) IntermediateToken - (190:7,18 [3] MinimizedTagHelpers.cshtml) - Html - btn - AddTagHelperHtmlAttribute - - catchall-unbound-required - HtmlAttributeValueStyle.Minimized - AddTagHelperHtmlAttribute - - input-unbound-required - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - catchall-unbound-required - AttributeStructure.Minimized + AddTagHelperHtmlAttribute - - input-unbound-required - AttributeStructure.Minimized SetTagHelperProperty - (273:7,101 [5] MinimizedTagHelpers.cshtml) - input-bound-required-string - BoundRequiredString - HtmlAttributeValueStyle.DoubleQuotes HtmlContent - (273:7,101 [5] MinimizedTagHelpers.cshtml) IntermediateToken - (273:7,101 [5] MinimizedTagHelpers.cshtml) - Html - hello @@ -44,11 +44,11 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (315:9,18 [3] MinimizedTagHelpers.cshtml) IntermediateToken - (315:9,18 [3] MinimizedTagHelpers.cshtml) - Html - btn - AddTagHelperHtmlAttribute - - catchall-unbound-required - HtmlAttributeValueStyle.Minimized - AddTagHelperHtmlAttribute - - input-unbound-required - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - catchall-unbound-required - AttributeStructure.Minimized + AddTagHelperHtmlAttribute - - input-unbound-required - AttributeStructure.Minimized SetTagHelperProperty - (418:11,57 [5] MinimizedTagHelpers.cshtml) - catchall-bound-string - BoundRequiredString - HtmlAttributeValueStyle.DoubleQuotes HtmlContent - (418:11,57 [5] MinimizedTagHelpers.cshtml) IntermediateToken - (418:11,57 [5] MinimizedTagHelpers.cshtml) - Html - world @@ -61,20 +61,20 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (484:12,18 [3] MinimizedTagHelpers.cshtml) IntermediateToken - (484:12,18 [3] MinimizedTagHelpers.cshtml) - Html - btn - AddTagHelperHtmlAttribute - - catchall-unbound-required - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - catchall-unbound-required - AttributeStructure.DoubleQuotes HtmlContent - (529:13,38 [5] MinimizedTagHelpers.cshtml) IntermediateToken - (529:13,38 [5] MinimizedTagHelpers.cshtml) - Html - hello - AddTagHelperHtmlAttribute - - input-unbound-required - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - input-unbound-required - AttributeStructure.DoubleQuotes HtmlContent - (578:14,40 [6] MinimizedTagHelpers.cshtml) IntermediateToken - (578:14,40 [6] MinimizedTagHelpers.cshtml) - Html - hello2 - AddTagHelperHtmlAttribute - - catchall-unbound-required - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - catchall-unbound-required - AttributeStructure.Minimized SetTagHelperProperty - (667:16,40 [5] MinimizedTagHelpers.cshtml) - input-bound-required-string - BoundRequiredString - HtmlAttributeValueStyle.DoubleQuotes HtmlContent - (667:16,40 [5] MinimizedTagHelpers.cshtml) IntermediateToken - (667:16,40 [5] MinimizedTagHelpers.cshtml) - Html - world HtmlContent - (676:16,49 [2] MinimizedTagHelpers.cshtml) IntermediateToken - (676:16,49 [2] MinimizedTagHelpers.cshtml) - Html - \n CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - catchall-unbound-required - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - catchall-unbound-required - AttributeStructure.Minimized diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.ir.txt index 4ab449de17..4d753b7607 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_Runtime.ir.txt @@ -1,12 +1,12 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MinimizedTagHelpers_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - btn - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - btn - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_1 - input-bound-required-string - hello - HtmlAttributeValueStyle.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_2 - catchall-bound-string - world - HtmlAttributeValueStyle.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_3 - input-bound-required-string - hello2 - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_4 - catchall-unbound-required - hello - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - input-unbound-required - hello2 - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_4 - catchall-unbound-required - hello - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - input-unbound-required - hello2 - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_6 - input-bound-required-string - world - HtmlAttributeValueStyle.DoubleQuotes DeclareTagHelperFields - - TestNamespace.CatchAllTagHelper - TestNamespace.InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync @@ -24,7 +24,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.CatchAllTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - AddTagHelperHtmlAttribute - - catchall-unbound-required - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - catchall-unbound-required - AttributeStructure.Minimized HtmlContent - (157:5,39 [6] MinimizedTagHelpers.cshtml) IntermediateToken - (157:5,39 [6] MinimizedTagHelpers.cshtml) - Html - \n TagHelper - (163:6,4 [119] MinimizedTagHelpers.cshtml) - input - TagMode.SelfClosing @@ -32,8 +32,8 @@ Document - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.CatchAllTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - AddTagHelperHtmlAttribute - - catchall-unbound-required - HtmlAttributeValueStyle.Minimized - AddTagHelperHtmlAttribute - - input-unbound-required - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - catchall-unbound-required - AttributeStructure.Minimized + AddTagHelperHtmlAttribute - - input-unbound-required - AttributeStructure.Minimized SetPreallocatedTagHelperProperty - - __tagHelperAttribute_1 - input-bound-required-string - BoundRequiredString HtmlContent - (282:7,110 [6] MinimizedTagHelpers.cshtml) IntermediateToken - (282:7,110 [6] MinimizedTagHelpers.cshtml) - Html - \n @@ -42,8 +42,8 @@ Document - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.CatchAllTagHelper AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - AddTagHelperHtmlAttribute - - catchall-unbound-required - HtmlAttributeValueStyle.Minimized - AddTagHelperHtmlAttribute - - input-unbound-required - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - catchall-unbound-required - AttributeStructure.Minimized + AddTagHelperHtmlAttribute - - input-unbound-required - AttributeStructure.Minimized SetPreallocatedTagHelperProperty - - __tagHelperAttribute_2 - catchall-bound-string - BoundRequiredString SetPreallocatedTagHelperProperty - - __tagHelperAttribute_3 - input-bound-required-string - BoundRequiredString HtmlContent - (464:11,103 [6] MinimizedTagHelpers.cshtml) @@ -55,9 +55,9 @@ Document - AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_4 AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - AddTagHelperHtmlAttribute - - catchall-unbound-required - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - catchall-unbound-required - AttributeStructure.Minimized SetPreallocatedTagHelperProperty - - __tagHelperAttribute_6 - input-bound-required-string - BoundRequiredString HtmlContent - (676:16,49 [2] MinimizedTagHelpers.cshtml) IntermediateToken - (676:16,49 [2] MinimizedTagHelpers.cshtml) - Html - \n CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - catchall-unbound-required - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - catchall-unbound-required - AttributeStructure.Minimized diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt index 9716c6c697..43c5d82c4c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt @@ -36,7 +36,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.InputTagHelper2 - AddTagHelperHtmlAttribute - - data-interval - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - data-interval - AttributeStructure.DoubleQuotes HtmlContent - (331:7,42 [7] NestedScriptTagTagHelpers.cshtml) IntermediateToken - (331:7,42 [7] NestedScriptTagTagHelpers.cshtml) - Html - 2000 + CSharpExpression - (339:7,50 [23] NestedScriptTagTagHelpers.cshtml) @@ -65,10 +65,10 @@ Document - IntermediateToken - (549:12,12 [9] NestedScriptTagTagHelpers.cshtml) - Html - IntermediateToken - (558:12,21 [10] NestedScriptTagTagHelpers.cshtml) - Html - \n CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (149:4,18 [11] NestedScriptTagTagHelpers.cshtml) IntermediateToken - (149:4,18 [11] NestedScriptTagTagHelpers.cshtml) - Html - Hello World - AddTagHelperHtmlAttribute - - data-delay - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - data-delay - AttributeStructure.DoubleQuotes HtmlContent - (174:4,43 [4] NestedScriptTagTagHelpers.cshtml) IntermediateToken - (174:4,43 [4] NestedScriptTagTagHelpers.cshtml) - Html - 1000 HtmlContent - (572:13,12 [23] NestedScriptTagTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt index 5d1bc82063..d3f2d7f2e3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt @@ -2,8 +2,8 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedScriptTagTagHelpers_Runtime - - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - type - text - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - data-delay - 1000 - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - class - Hello World - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - data-delay - 1000 - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [106] NestedScriptTagTagHelpers.cshtml) @@ -38,7 +38,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper CreateTagHelper - - TestNamespace.InputTagHelper2 - AddTagHelperHtmlAttribute - - data-interval - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - data-interval - AttributeStructure.DoubleQuotes HtmlContent - (331:7,42 [7] NestedScriptTagTagHelpers.cshtml) IntermediateToken - (331:7,42 [7] NestedScriptTagTagHelpers.cshtml) - Html - 2000 + CSharpExpression - (339:7,50 [23] NestedScriptTagTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt index fc5e73e82f..6086c69881 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt @@ -14,7 +14,7 @@ Document - HtmlContent - (46:1,15 [4] NestedTagHelpers.cshtml) IntermediateToken - (46:1,15 [4] NestedTagHelpers.cshtml) - Html - Hola CreateTagHelper - - SpanTagHelper - AddTagHelperHtmlAttribute - - someattr - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - someattr - AttributeStructure.Minimized HtmlContent - (57:1,26 [2] NestedTagHelpers.cshtml) IntermediateToken - (57:1,26 [2] NestedTagHelpers.cshtml) - Html - \n TagHelper - (59:2,0 [66] NestedTagHelpers.cshtml) - div - TagMode.StartTagAndEndTag @@ -27,12 +27,12 @@ Document - SetTagHelperProperty - (97:3,17 [5] NestedTagHelpers.cshtml) - value - FooProp - HtmlAttributeValueStyle.DoubleQuotes HtmlContent - (97:3,17 [5] NestedTagHelpers.cshtml) IntermediateToken - (97:3,17 [5] NestedTagHelpers.cshtml) - Html - Hello - AddTagHelperHtmlAttribute - - type - HtmlAttributeValueStyle.SingleQuotes + AddTagHelperHtmlAttribute - - type - AttributeStructure.SingleQuotes HtmlContent - (109:3,29 [4] NestedTagHelpers.cshtml) IntermediateToken - (109:3,29 [4] NestedTagHelpers.cshtml) - Html - text HtmlContent - (117:3,37 [2] NestedTagHelpers.cshtml) IntermediateToken - (117:3,37 [2] NestedTagHelpers.cshtml) - Html - \n CreateTagHelper - - DivTagHelper - AddTagHelperHtmlAttribute - - unbound - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unbound - AttributeStructure.DoubleQuotes HtmlContent - (73:2,14 [3] NestedTagHelpers.cshtml) IntermediateToken - (73:2,14 [3] NestedTagHelpers.cshtml) - Html - foo diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.ir.txt index 2367424972..77e7b9cf38 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_Runtime.ir.txt @@ -2,8 +2,8 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedTagHelpers_Runtime - - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - value - Hello - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - unbound - foo - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - type - text - AttributeStructure.SingleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - unbound - foo - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - SpanTagHelper - DivTagHelper - InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync TagHelper - (31:1,0 [26] NestedTagHelpers.cshtml) - span - TagMode.StartTagAndEndTag @@ -11,7 +11,7 @@ Document - HtmlContent - (46:1,15 [4] NestedTagHelpers.cshtml) IntermediateToken - (46:1,15 [4] NestedTagHelpers.cshtml) - Html - Hola CreateTagHelper - - SpanTagHelper - AddTagHelperHtmlAttribute - - someattr - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - someattr - AttributeStructure.Minimized HtmlContent - (57:1,26 [2] NestedTagHelpers.cshtml) IntermediateToken - (57:1,26 [2] NestedTagHelpers.cshtml) - Html - \n TagHelper - (59:2,0 [66] NestedTagHelpers.cshtml) - div - TagMode.StartTagAndEndTag diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt index 193c9563c0..1116f6eeb3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt @@ -21,7 +21,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper1 CreateTagHelper - - TestNamespace.InputTagHelper2 - AddTagHelperHtmlAttribute - - type - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - type - AttributeStructure.DoubleQuotes HtmlContent - (344:15,17 [8] PrefixedAttributeTagHelpers.cshtml) IntermediateToken - (344:15,17 [8] PrefixedAttributeTagHelpers.cshtml) - Html - checkbox SetTagHelperProperty - (370:15,43 [13] PrefixedAttributeTagHelpers.cshtml) - int-dictionary - IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes @@ -38,7 +38,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper1 CreateTagHelper - - TestNamespace.InputTagHelper2 - AddTagHelperHtmlAttribute - - type - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - type - AttributeStructure.DoubleQuotes HtmlContent - (442:16,17 [8] PrefixedAttributeTagHelpers.cshtml) IntermediateToken - (442:16,17 [8] PrefixedAttributeTagHelpers.cshtml) - Html - password SetTagHelperProperty - (468:16,43 [13] PrefixedAttributeTagHelpers.cshtml) - int-dictionary - IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes @@ -59,7 +59,7 @@ Document - TagHelperBody - CreateTagHelper - - TestNamespace.InputTagHelper1 CreateTagHelper - - TestNamespace.InputTagHelper2 - AddTagHelperHtmlAttribute - - type - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - type - AttributeStructure.DoubleQuotes HtmlContent - (551:17,17 [5] PrefixedAttributeTagHelpers.cshtml) IntermediateToken - (551:17,17 [5] PrefixedAttributeTagHelpers.cshtml) - Html - radio SetTagHelperProperty - (590:18,31 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-grabber - IntProperty - HtmlAttributeValueStyle.DoubleQuotes @@ -74,7 +74,7 @@ Document - IntermediateToken - (634:18,75 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 98 SetTagHelperProperty - (634:18,75 [2] PrefixedAttributeTagHelpers.cshtml) - int-prefix-pepper - IntDictionaryProperty - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (634:18,75 [2] PrefixedAttributeTagHelpers.cshtml) - CSharp - 98 - AddTagHelperHtmlAttribute - - int-prefix-salt - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - int-prefix-salt - AttributeStructure.DoubleQuotes HtmlContent - (655:18,96 [1] PrefixedAttributeTagHelpers.cshtml) IntermediateToken - (655:18,96 [1] PrefixedAttributeTagHelpers.cshtml) - Html - 8 SetTagHelperProperty - (693:19,34 [6] PrefixedAttributeTagHelpers.cshtml) - string-prefix-grabber - StringProperty - HtmlAttributeValueStyle.DoubleQuotes diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt index 577af59988..bf971ca71f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt @@ -1,10 +1,10 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PrefixedAttributeTagHelpers_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - type - password - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - type - radio - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - int-prefix-salt - 8 - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - type - checkbox - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - type - password - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - type - radio - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - int-prefix-salt - 8 - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_4 - string-prefix-grabber - string - HtmlAttributeValueStyle.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_5 - string-prefix-paprika - another string - HtmlAttributeValueStyle.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_6 - string-prefix-thyme - string - HtmlAttributeValueStyle.DoubleQuotes diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt index a60cf0636e..6be176353a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt @@ -21,7 +21,7 @@ Document - SetTagHelperProperty - (70:3,18 [5] SimpleTagHelpers.cshtml) - value - FooProp - HtmlAttributeValueStyle.SingleQuotes HtmlContent - (70:3,18 [5] SimpleTagHelpers.cshtml) IntermediateToken - (70:3,18 [5] SimpleTagHelpers.cshtml) - Html - Hello - AddTagHelperHtmlAttribute - - type - HtmlAttributeValueStyle.SingleQuotes + AddTagHelperHtmlAttribute - - type - AttributeStructure.SingleQuotes HtmlContent - (83:3,31 [4] SimpleTagHelpers.cshtml) IntermediateToken - (83:3,31 [4] SimpleTagHelpers.cshtml) - Html - text HtmlContent - (91:3,39 [9] SimpleTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.ir.txt index cfd3dc881a..cac1be9ab3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_Runtime.ir.txt @@ -2,7 +2,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleTagHelpers_Runtime - - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - value - Hello - HtmlAttributeValueStyle.SingleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - type - text - AttributeStructure.SingleQuotes DeclareTagHelperFields - - InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (31:1,0 [25] SimpleTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt index 18507c2726..06fc8af8dc 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt @@ -14,7 +14,7 @@ Document - HtmlContent - (73:3,34 [11] SingleTagHelperWithNewlineBeforeAttributes.cshtml) IntermediateToken - (73:3,34 [11] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - Html - Body of Tag CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (49:3,10 [11] SingleTagHelperWithNewlineBeforeAttributes.cshtml) IntermediateToken - (49:3,10 [11] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - Html - Hello World SetTagHelperProperty - (67:3,28 [4] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.ir.txt index 72ac557a9a..9fa1de5fb4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_Runtime.ir.txt @@ -1,7 +1,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelperWithNewlineBeforeAttributes_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - Hello World - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [2] SingleTagHelperWithNewlineBeforeAttributes.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt index f8afd24476..14135cb7b8 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt @@ -14,7 +14,7 @@ Document - HtmlContent - (69:2,34 [11] SingleTagHelper.cshtml) IntermediateToken - (69:2,34 [11] SingleTagHelper.cshtml) - Html - Body of Tag CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (45:2,10 [11] SingleTagHelper.cshtml) IntermediateToken - (45:2,10 [11] SingleTagHelper.cshtml) - Html - Hello World SetTagHelperProperty - (63:2,28 [4] SingleTagHelper.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.ir.txt index 2caf21d8d9..f45daded14 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_Runtime.ir.txt @@ -1,7 +1,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelper_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - Hello World - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [2] SingleTagHelper.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt index e3b7c66619..c46f8f50fa 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt @@ -50,10 +50,10 @@ Document - TagHelper - (284:11,0 [45] SymbolBoundAttributes.cshtml) - ul - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized SetTagHelperProperty - (302:11,18 [5] SymbolBoundAttributes.cshtml) - [item] - ListItems - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (302:11,18 [5] SymbolBoundAttributes.cshtml) - CSharp - items - AddTagHelperHtmlAttribute - - [item] - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - [item] - AttributeStructure.DoubleQuotes HtmlContent - (317:11,33 [5] SymbolBoundAttributes.cshtml) IntermediateToken - (317:11,33 [5] SymbolBoundAttributes.cshtml) - Html - items HtmlContent - (329:11,45 [2] SymbolBoundAttributes.cshtml) @@ -61,10 +61,10 @@ Document - TagHelper - (331:12,0 [49] SymbolBoundAttributes.cshtml) - ul - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized SetTagHelperProperty - (351:12,20 [5] SymbolBoundAttributes.cshtml) - [(item)] - ArrayItems - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (351:12,20 [5] SymbolBoundAttributes.cshtml) - CSharp - items - AddTagHelperHtmlAttribute - - [(item)] - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - [(item)] - AttributeStructure.DoubleQuotes HtmlContent - (368:12,37 [5] SymbolBoundAttributes.cshtml) IntermediateToken - (368:12,37 [5] SymbolBoundAttributes.cshtml) - Html - items HtmlContent - (380:12,49 [2] SymbolBoundAttributes.cshtml) @@ -74,10 +74,10 @@ Document - HtmlContent - (444:13,62 [8] SymbolBoundAttributes.cshtml) IntermediateToken - (444:13,62 [8] SymbolBoundAttributes.cshtml) - Html - Click Me CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized SetTagHelperProperty - (405:13,23 [13] SymbolBoundAttributes.cshtml) - (click) - Event1 - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (405:13,23 [13] SymbolBoundAttributes.cshtml) - CSharp - doSomething() - AddTagHelperHtmlAttribute - - (click) - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - (click) - AttributeStructure.DoubleQuotes HtmlContent - (429:13,47 [13] SymbolBoundAttributes.cshtml) IntermediateToken - (429:13,47 [13] SymbolBoundAttributes.cshtml) - Html - doSomething() HtmlContent - (461:13,79 [2] SymbolBoundAttributes.cshtml) @@ -87,10 +87,10 @@ Document - HtmlContent - (527:14,64 [8] SymbolBoundAttributes.cshtml) IntermediateToken - (527:14,64 [8] SymbolBoundAttributes.cshtml) - Html - Click Me CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized SetTagHelperProperty - (487:14,24 [13] SymbolBoundAttributes.cshtml) - (^click) - Event2 - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (487:14,24 [13] SymbolBoundAttributes.cshtml) - CSharp - doSomething() - AddTagHelperHtmlAttribute - - (^click) - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - (^click) - AttributeStructure.DoubleQuotes HtmlContent - (512:14,49 [13] SymbolBoundAttributes.cshtml) IntermediateToken - (512:14,49 [13] SymbolBoundAttributes.cshtml) - Html - doSomething() HtmlContent - (544:14,81 [2] SymbolBoundAttributes.cshtml) @@ -100,11 +100,11 @@ Document - HtmlContent - (600:15,54 [2] SymbolBoundAttributes.cshtml) IntermediateToken - (600:15,54 [2] SymbolBoundAttributes.cshtml) - Html - \n CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized SetTagHelperProperty - (574:15,28 [5] SymbolBoundAttributes.cshtml) - *something - StringProperty1 - HtmlAttributeValueStyle.DoubleQuotes HtmlContent - (574:15,28 [5] SymbolBoundAttributes.cshtml) IntermediateToken - (574:15,28 [5] SymbolBoundAttributes.cshtml) - Html - value - AddTagHelperHtmlAttribute - - *something - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - *something - AttributeStructure.DoubleQuotes HtmlContent - (593:15,47 [5] SymbolBoundAttributes.cshtml) IntermediateToken - (593:15,47 [5] SymbolBoundAttributes.cshtml) - Html - value HtmlContent - (613:16,11 [2] SymbolBoundAttributes.cshtml) @@ -112,17 +112,17 @@ Document - TagHelper - (615:17,0 [33] SymbolBoundAttributes.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized - AddTagHelperHtmlAttribute - - #localminimized - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized + AddTagHelperHtmlAttribute - - #localminimized - AttributeStructure.Minimized HtmlContent - (648:17,33 [2] SymbolBoundAttributes.cshtml) IntermediateToken - (648:17,33 [2] SymbolBoundAttributes.cshtml) - Html - \n TagHelper - (650:18,0 [47] SymbolBoundAttributes.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized SetTagHelperProperty - (669:18,19 [5] SymbolBoundAttributes.cshtml) - #local - StringProperty2 - HtmlAttributeValueStyle.DoubleQuotes HtmlContent - (669:18,19 [5] SymbolBoundAttributes.cshtml) IntermediateToken - (669:18,19 [5] SymbolBoundAttributes.cshtml) - Html - value - AddTagHelperHtmlAttribute - - #local - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - #local - AttributeStructure.DoubleQuotes HtmlContent - (684:18,34 [5] SymbolBoundAttributes.cshtml) IntermediateToken - (684:18,34 [5] SymbolBoundAttributes.cshtml) - Html - value diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.ir.txt index fa71e23602..f22a13ee9c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_Runtime.ir.txt @@ -1,14 +1,14 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SymbolBoundAttributes_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - [item] - items - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - [(item)] - items - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - (click) - doSomething() - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - (^click) - doSomething() - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - [item] - items - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - [(item)] - items - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - (click) - doSomething() - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - (^click) - doSomething() - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_4 - *something - value - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - *something - value - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - *something - value - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_6 - #local - value - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_7 - #local - value - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_7 - #local - value - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.CatchAllTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (31:1,0 [253] SymbolBoundAttributes.cshtml) @@ -54,7 +54,7 @@ Document - TagHelper - (284:11,0 [45] SymbolBoundAttributes.cshtml) - ul - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized SetTagHelperProperty - (302:11,18 [5] SymbolBoundAttributes.cshtml) - [item] - ListItems - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (302:11,18 [5] SymbolBoundAttributes.cshtml) - CSharp - items AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 @@ -63,7 +63,7 @@ Document - TagHelper - (331:12,0 [49] SymbolBoundAttributes.cshtml) - ul - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized SetTagHelperProperty - (351:12,20 [5] SymbolBoundAttributes.cshtml) - [(item)] - ArrayItems - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (351:12,20 [5] SymbolBoundAttributes.cshtml) - CSharp - items AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 @@ -74,7 +74,7 @@ Document - HtmlContent - (444:13,62 [8] SymbolBoundAttributes.cshtml) IntermediateToken - (444:13,62 [8] SymbolBoundAttributes.cshtml) - Html - Click Me CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized SetTagHelperProperty - (405:13,23 [13] SymbolBoundAttributes.cshtml) - (click) - Event1 - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (405:13,23 [13] SymbolBoundAttributes.cshtml) - CSharp - doSomething() AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 @@ -85,7 +85,7 @@ Document - HtmlContent - (527:14,64 [8] SymbolBoundAttributes.cshtml) IntermediateToken - (527:14,64 [8] SymbolBoundAttributes.cshtml) - Html - Click Me CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized SetTagHelperProperty - (487:14,24 [13] SymbolBoundAttributes.cshtml) - (^click) - Event2 - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (487:14,24 [13] SymbolBoundAttributes.cshtml) - CSharp - doSomething() AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 @@ -96,7 +96,7 @@ Document - HtmlContent - (600:15,54 [2] SymbolBoundAttributes.cshtml) IntermediateToken - (600:15,54 [2] SymbolBoundAttributes.cshtml) - Html - \n CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized SetPreallocatedTagHelperProperty - - __tagHelperAttribute_4 - *something - StringProperty1 AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 HtmlContent - (613:16,11 [2] SymbolBoundAttributes.cshtml) @@ -104,13 +104,13 @@ Document - TagHelper - (615:17,0 [33] SymbolBoundAttributes.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized - AddTagHelperHtmlAttribute - - #localminimized - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized + AddTagHelperHtmlAttribute - - #localminimized - AttributeStructure.Minimized HtmlContent - (648:17,33 [2] SymbolBoundAttributes.cshtml) IntermediateToken - (648:17,33 [2] SymbolBoundAttributes.cshtml) - Html - \n TagHelper - (650:18,0 [47] SymbolBoundAttributes.cshtml) - div - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.CatchAllTagHelper - AddTagHelperHtmlAttribute - - bound - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - bound - AttributeStructure.Minimized SetPreallocatedTagHelperProperty - - __tagHelperAttribute_6 - #local - StringProperty2 AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_7 diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt index 21acc3db0c..5cd6d003bc 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt @@ -35,7 +35,7 @@ Document - IntermediateToken - (155:8,49 [1] TagHelpersInSection.cshtml) - Html - CSharpExpression - (157:8,51 [12] TagHelpersInSection.cshtml) IntermediateToken - (157:8,51 [12] TagHelpersInSection.cshtml) - CSharp - DateTime.Now - AddTagHelperHtmlAttribute - - unboundproperty - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - unboundproperty - AttributeStructure.DoubleQuotes HtmlAttributeValue - (188:8,82 [7] TagHelpersInSection.cshtml) - IntermediateToken - (188:8,82 [7] TagHelpersInSection.cshtml) - Html - Current HtmlAttributeValue - (195:8,89 [6] TagHelpersInSection.cshtml) - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt index 4557309c94..4304cd96ad 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt @@ -17,7 +17,7 @@ Document - SetTagHelperProperty - (56:2,17 [6] TagHelpersWithBoundAttributes.cshtml) - bound - BoundProp - HtmlAttributeValueStyle.DoubleQuotes CSharpExpression - (57:2,18 [5] TagHelpersWithBoundAttributes.cshtml) IntermediateToken - (57:2,18 [5] TagHelpersWithBoundAttributes.cshtml) - CSharp - Hello - AddTagHelperHtmlAttribute - - type - HtmlAttributeValueStyle.SingleQuotes + AddTagHelperHtmlAttribute - - type - AttributeStructure.SingleQuotes HtmlContent - (69:2,30 [4] TagHelpersWithBoundAttributes.cshtml) IntermediateToken - (69:2,30 [4] TagHelpersWithBoundAttributes.cshtml) - Html - text HtmlContent - (77:2,38 [9] TagHelpersWithBoundAttributes.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.ir.txt index fa7bdad675..ed39d9e673 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_Runtime.ir.txt @@ -1,7 +1,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithBoundAttributes_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - type - text - HtmlAttributeValueStyle.SingleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - type - text - AttributeStructure.SingleQuotes DeclareTagHelperFields - - InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (31:1,0 [12] TagHelpersWithBoundAttributes.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt index 9259e8b610..e75fe1f6da 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt @@ -20,7 +20,7 @@ Document - SetTagHelperProperty - (85:3,22 [6] TagHelpersWithPrefix.cshtml) - bound - BoundProp - HtmlAttributeValueStyle.DoubleQuotes CSharpExpression - (86:3,23 [5] TagHelpersWithPrefix.cshtml) IntermediateToken - (86:3,23 [5] TagHelpersWithPrefix.cshtml) - CSharp - Hello - AddTagHelperHtmlAttribute - - type - HtmlAttributeValueStyle.SingleQuotes + AddTagHelperHtmlAttribute - - type - AttributeStructure.SingleQuotes HtmlContent - (98:3,35 [4] TagHelpersWithPrefix.cshtml) IntermediateToken - (98:3,35 [4] TagHelpersWithPrefix.cshtml) - Html - text HtmlContent - (106:3,43 [9] TagHelpersWithPrefix.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.ir.txt index 43c7f9d680..7bd4c48725 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_Runtime.ir.txt @@ -1,7 +1,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithPrefix_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - type - text - HtmlAttributeValueStyle.SingleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - type - text - AttributeStructure.SingleQuotes DeclareTagHelperFields - - InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (55:2,0 [12] TagHelpersWithPrefix.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt index 423519dc35..f0a4e70adc 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.ir.txt @@ -29,14 +29,14 @@ Document - TagHelper - (436:15,49 [40] TagHelpersWithTemplate.cshtml) - input - TagMode.SelfClosing TagHelperBody - CreateTagHelper - - InputTagHelper - AddTagHelperHtmlAttribute - - type - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - type - AttributeStructure.DoubleQuotes HtmlContent - (449:15,62 [8] TagHelpersWithTemplate.cshtml) IntermediateToken - (449:15,62 [8] TagHelpersWithTemplate.cshtml) - Html - checkbox - AddTagHelperHtmlAttribute - - checked - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - checked - AttributeStructure.DoubleQuotes HtmlContent - (468:15,81 [4] TagHelpersWithTemplate.cshtml) IntermediateToken - (468:15,81 [4] TagHelpersWithTemplate.cshtml) - Html - true CreateTagHelper - - DivTagHelper - AddTagHelperHtmlAttribute - - condition - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - condition - AttributeStructure.DoubleQuotes HtmlContent - (416:15,29 [4] TagHelpersWithTemplate.cshtml) IntermediateToken - (416:15,29 [4] TagHelpersWithTemplate.cshtml) - Html - true CSharpCode - (482:15,95 [8] TagHelpersWithTemplate.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt index 189ea92bc4..b62e0dbfe3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_Runtime.ir.txt @@ -1,9 +1,9 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithTemplate_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - type - checkbox - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - checked - true - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - condition - true - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - type - checkbox - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - checked - true - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - condition - true - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - DivTagHelper - InputTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [2] TagHelpersWithTemplate.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt index eed24bc3c6..71efbc2715 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt @@ -14,12 +14,12 @@ Document - HtmlContent - (105:6,25 [11] TagHelpersWithWeirdlySpacedAttributes.cshtml) IntermediateToken - (105:6,25 [11] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - Body of Tag CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (54:5,1 [11] TagHelpersWithWeirdlySpacedAttributes.cshtml) IntermediateToken - (54:5,1 [11] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - Hello World SetTagHelperProperty - (74:5,21 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (74:5,21 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - CSharp - 1337 - AddTagHelperHtmlAttribute - - data-content - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - data-content - AttributeStructure.DoubleQuotes CSharpExpression - (99:6,19 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) IntermediateToken - (99:6,19 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - CSharp - true HtmlContent - (120:6,40 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) @@ -34,7 +34,7 @@ Document - SetTagHelperProperty - (140:8,16 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - type - Type - HtmlAttributeValueStyle.SingleQuotes HtmlContent - (140:8,16 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) IntermediateToken - (140:8,16 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - text - AddTagHelperHtmlAttribute - - data-content - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - data-content - AttributeStructure.DoubleQuotes HtmlContent - (162:8,38 [5] TagHelpersWithWeirdlySpacedAttributes.cshtml) IntermediateToken - (162:8,38 [5] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - hello HtmlContent - (171:8,47 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) @@ -44,7 +44,7 @@ Document - CreateTagHelper - - TestNamespace.PTagHelper SetTagHelperProperty - (186:10,11 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (186:10,11 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - CSharp - 1234 - AddTagHelperHtmlAttribute - - data-content - HtmlAttributeValueStyle.SingleQuotes + AddTagHelperHtmlAttribute - - data-content - AttributeStructure.SingleQuotes HtmlContent - (209:11,3 [6] TagHelpersWithWeirdlySpacedAttributes.cshtml) IntermediateToken - (209:11,3 [6] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - hello2 HtmlContent - (221:11,15 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) @@ -59,6 +59,6 @@ Document - SetTagHelperProperty - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - type - Type - HtmlAttributeValueStyle.DoubleQuotes HtmlContent - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) IntermediateToken - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - password - AddTagHelperHtmlAttribute - - data-content - HtmlAttributeValueStyle.NoQuotes + AddTagHelperHtmlAttribute - - data-content - AttributeStructure.NoQuotes HtmlContent - (270:14,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) IntermediateToken - (270:14,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - blah diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt index 16565e5d99..ac4679f44c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt @@ -1,12 +1,12 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithWeirdlySpacedAttributes_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - Hello World - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - Hello World - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - data-content - hello - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - data-content - hello2 - HtmlAttributeValueStyle.SingleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - data-content - hello - AttributeStructure.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - data-content - hello2 - AttributeStructure.SingleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_4 - type - password - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - data-content - blah - HtmlAttributeValueStyle.NoQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - data-content - blah - AttributeStructure.NoQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (33:1,0 [2] TagHelpersWithWeirdlySpacedAttributes.cshtml) @@ -19,7 +19,7 @@ Document - AddPreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 SetTagHelperProperty - (74:5,21 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (74:5,21 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - CSharp - 1337 - AddTagHelperHtmlAttribute - - data-content - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - data-content - AttributeStructure.DoubleQuotes CSharpExpression - (99:6,19 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) IntermediateToken - (99:6,19 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - CSharp - true HtmlContent - (120:6,40 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt index 8c58ad91f3..0b82aa0a61 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt @@ -18,7 +18,7 @@ Document - HtmlContent - (128:6,29 [11] TransitionsInTagHelperAttributes.cshtml) IntermediateToken - (128:6,29 [11] TransitionsInTagHelperAttributes.cshtml) - Html - Body of Tag CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes CSharpCodeAttributeValue - (109:6,10 [6] TransitionsInTagHelperAttributes.cshtml) - SetTagHelperProperty - (122:6,23 [4] TransitionsInTagHelperAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (122:6,23 [4] TransitionsInTagHelperAttributes.cshtml) - CSharp - 1337 @@ -27,7 +27,7 @@ Document - TagHelper - (145:7,0 [34] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes CSharpExpressionAttributeValue - (155:7,10 [9] TransitionsInTagHelperAttributes.cshtml) - IntermediateToken - (157:7,12 [6] TransitionsInTagHelperAttributes.cshtml) - CSharp - @class SetTagHelperProperty - (171:7,26 [2] TransitionsInTagHelperAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes @@ -37,7 +37,7 @@ Document - TagHelper - (181:8,0 [36] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (191:8,10 [4] TransitionsInTagHelperAttributes.cshtml) IntermediateToken - (191:8,10 [4] TransitionsInTagHelperAttributes.cshtml) - Html - test SetTagHelperProperty - (202:8,21 [9] TransitionsInTagHelperAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes @@ -52,7 +52,7 @@ Document - TagHelper - (219:9,0 [31] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (229:9,10 [4] TransitionsInTagHelperAttributes.cshtml) IntermediateToken - (229:9,10 [4] TransitionsInTagHelperAttributes.cshtml) - Html - test SetTagHelperProperty - (240:9,21 [4] TransitionsInTagHelperAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes @@ -63,7 +63,7 @@ Document - TagHelper - (252:10,0 [34] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlContent - (262:10,10 [4] TransitionsInTagHelperAttributes.cshtml) IntermediateToken - (262:10,10 [4] TransitionsInTagHelperAttributes.cshtml) - Html - test SetTagHelperProperty - (273:10,21 [7] TransitionsInTagHelperAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes @@ -76,7 +76,7 @@ Document - TagHelper - (288:11,0 [54] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlAttributeValue - (298:11,10 [7] TransitionsInTagHelperAttributes.cshtml) - IntermediateToken - (298:11,10 [7] TransitionsInTagHelperAttributes.cshtml) - Html - custom- CSharpExpressionAttributeValue - (305:11,17 [9] TransitionsInTagHelperAttributes.cshtml) - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt index 71084440a0..2a0466ba6d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt @@ -1,7 +1,7 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TransitionsInTagHelperAttributes_Runtime - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - test - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - test - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - TestNamespace.PTagHelper MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync CSharpCode - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) @@ -13,7 +13,7 @@ Document - HtmlContent - (128:6,29 [11] TransitionsInTagHelperAttributes.cshtml) IntermediateToken - (128:6,29 [11] TransitionsInTagHelperAttributes.cshtml) - Html - Body of Tag CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes CSharpCodeAttributeValue - (109:6,10 [6] TransitionsInTagHelperAttributes.cshtml) - SetTagHelperProperty - (122:6,23 [4] TransitionsInTagHelperAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes IntermediateToken - (122:6,23 [4] TransitionsInTagHelperAttributes.cshtml) - CSharp - 1337 @@ -22,7 +22,7 @@ Document - TagHelper - (145:7,0 [34] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes CSharpExpressionAttributeValue - (155:7,10 [9] TransitionsInTagHelperAttributes.cshtml) - IntermediateToken - (157:7,12 [6] TransitionsInTagHelperAttributes.cshtml) - CSharp - @class SetTagHelperProperty - (171:7,26 [2] TransitionsInTagHelperAttributes.cshtml) - age - Age - HtmlAttributeValueStyle.DoubleQuotes @@ -65,7 +65,7 @@ Document - TagHelper - (288:11,0 [54] TransitionsInTagHelperAttributes.cshtml) - p - TagMode.StartTagAndEndTag TagHelperBody - CreateTagHelper - - TestNamespace.PTagHelper - AddTagHelperHtmlAttribute - - class - HtmlAttributeValueStyle.DoubleQuotes + AddTagHelperHtmlAttribute - - class - AttributeStructure.DoubleQuotes HtmlAttributeValue - (298:11,10 [7] TransitionsInTagHelperAttributes.cshtml) - IntermediateToken - (298:11,10 [7] TransitionsInTagHelperAttributes.cshtml) - Html - custom- CSharpExpressionAttributeValue - (305:11,17 [9] TransitionsInTagHelperAttributes.cshtml) - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.ir.txt index 1a719eb3ae..2ac9dcbc32 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/NestedTagHelpers.ir.txt @@ -2,8 +2,8 @@ Document - NamespaceDeclaration - - Razor ClassDeclaration - - public - Template - - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - value - Hello - HtmlAttributeValueStyle.DoubleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - unbound - foo - HtmlAttributeValueStyle.DoubleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - type - text - AttributeStructure.SingleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - unbound - foo - AttributeStructure.DoubleQuotes DeclareTagHelperFields - - PTagHelper - FormTagHelper - InputTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync TagHelper - (31:1,0 [20] NestedTagHelpers.cshtml) - p - TagMode.StartTagAndEndTag @@ -11,7 +11,7 @@ Document - HtmlContent - (43:1,12 [4] NestedTagHelpers.cshtml) IntermediateToken - (43:1,12 [4] NestedTagHelpers.cshtml) - Html - Hola CreateTagHelper - - PTagHelper - AddTagHelperHtmlAttribute - - someattr - HtmlAttributeValueStyle.Minimized + AddTagHelperHtmlAttribute - - someattr - AttributeStructure.Minimized HtmlContent - (51:1,20 [2] NestedTagHelpers.cshtml) IntermediateToken - (51:1,20 [2] NestedTagHelpers.cshtml) - Html - \n TagHelper - (53:2,0 [68] NestedTagHelpers.cshtml) - form - TagMode.StartTagAndEndTag diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.ir.txt index 1b85f4062c..bde2e546ad 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/SimpleTagHelpers.ir.txt @@ -1,8 +1,8 @@ Document - NamespaceDeclaration - - Razor ClassDeclaration - - public - Template - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - value - Hello - HtmlAttributeValueStyle.SingleQuotes - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - type - text - HtmlAttributeValueStyle.SingleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - value - Hello - AttributeStructure.SingleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - type - text - AttributeStructure.SingleQuotes DeclareTagHelperFields - - InputTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (31:1,0 [25] SimpleTagHelpers.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.ir.txt index 810e8fd797..003ff7ca22 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/TagHelpersIntegrationTest/TagHelpersWithBoundAttributes.ir.txt @@ -1,7 +1,7 @@ Document - NamespaceDeclaration - - Razor ClassDeclaration - - public - Template - - - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - type - text - HtmlAttributeValueStyle.SingleQuotes + DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - type - text - AttributeStructure.SingleQuotes DeclareTagHelperFields - - InputTagHelper MethodDeclaration - - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (31:1,0 [12] TagHelpersWithBoundAttributes.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntermediateNodeWriter.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntermediateNodeWriter.cs index 792f71f7dc..06e02028c6 100644 --- a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntermediateNodeWriter.cs +++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntermediateNodeWriter.cs @@ -101,12 +101,12 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests public override void VisitSetTagHelperProperty(SetTagHelperPropertyIntermediateNode node) { - WriteContentNode(node, node.AttributeName, node.PropertyName, string.Format("HtmlAttributeValueStyle.{0}", node.ValueStyle)); + WriteContentNode(node, node.AttributeName, node.PropertyName, string.Format("HtmlAttributeValueStyle.{0}", node.AttributeStructure)); } public override void VisitAddTagHelperHtmlAttribute(AddTagHelperHtmlAttributeIntermediateNode node) { - WriteContentNode(node, node.Name, string.Format("{0}.{1}", nameof(HtmlAttributeValueStyle), node.ValueStyle)); + WriteContentNode(node, node.Name, string.Format("{0}.{1}", nameof(AttributeStructure), node.AttributeStructure)); } public override void VisitExtension(ExtensionIntermediateNode node) @@ -114,13 +114,13 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests switch (node) { case DeclarePreallocatedTagHelperHtmlAttributeIntermediateNode n: - WriteContentNode(n, n.VariableName, n.Name, n.Value, string.Format("{0}.{1}", nameof(HtmlAttributeValueStyle), n.ValueStyle)); + WriteContentNode(n, n.VariableName, n.Name, n.Value, string.Format("{0}.{1}", nameof(AttributeStructure), n.AttributeStructure)); break; case AddPreallocatedTagHelperHtmlAttributeIntermediateNode n: WriteContentNode(n, n.VariableName); break; case DeclarePreallocatedTagHelperAttributeIntermediateNode n: - WriteContentNode(n, n.VariableName, n.Name, n.Value, string.Format("HtmlAttributeValueStyle.{0}", n.ValueStyle)); + WriteContentNode(n, n.VariableName, n.Name, n.Value, string.Format("HtmlAttributeValueStyle.{0}", n.AttributeStructure)); break; case SetPreallocatedTagHelperPropertyIntermediateNode n: WriteContentNode(n, n.VariableName, n.AttributeName, n.PropertyName); diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/Intermediate/IntermediateNodeAssert.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/Intermediate/IntermediateNodeAssert.cs index ee152bab1a..177ba854fc 100644 --- a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/Intermediate/IntermediateNodeAssert.cs +++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/Intermediate/IntermediateNodeAssert.cs @@ -326,7 +326,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate IntermediateNode node, string attributeName, string value, - HtmlAttributeValueStyle valueStyle) + AttributeStructure valueStyle) { var declarePreallocatedTagHelperAttribute = Assert.IsType(node); @@ -334,7 +334,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate { Assert.Equal(attributeName, declarePreallocatedTagHelperAttribute.Name); Assert.Equal(value, declarePreallocatedTagHelperAttribute.Value); - Assert.Equal(valueStyle, declarePreallocatedTagHelperAttribute.ValueStyle); + Assert.Equal(valueStyle, declarePreallocatedTagHelperAttribute.AttributeStructure); } catch (XunitException e) { @@ -363,7 +363,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate internal static void TagHelperHtmlAttribute( string name, - HtmlAttributeValueStyle valueStyle, + AttributeStructure valueStyle, IntermediateNode node, params Action[] valueValidators) { @@ -372,7 +372,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate try { Assert.Equal(name, tagHelperHtmlAttribute.Name); - Assert.Equal(valueStyle, tagHelperHtmlAttribute.ValueStyle); + Assert.Equal(valueStyle, tagHelperHtmlAttribute.AttributeStructure); Children(tagHelperHtmlAttribute, valueValidators); } catch (XunitException e) @@ -399,7 +399,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate internal static void SetTagHelperProperty( string name, string propertyName, - HtmlAttributeValueStyle valueStyle, + AttributeStructure valueStyle, IntermediateNode node, params Action[] valueValidators) { @@ -409,7 +409,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate { Assert.Equal(name, tagHelperBoundAttribute.AttributeName); Assert.Equal(propertyName, tagHelperBoundAttribute.PropertyName); - Assert.Equal(valueStyle, tagHelperBoundAttribute.ValueStyle); + Assert.Equal(valueStyle, tagHelperBoundAttribute.AttributeStructure); Children(tagHelperBoundAttribute, valueValidators); } catch (XunitException e)