Add TagHelperInfo and TagHelperAttributeInfo to syntax model and remove from annotations

Author: DustinCampbell

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/TagHelperBlockRewriter.cs

@@ -236,10 +236,13 @@ private static TryParseResult TryParseMinimizedAttribute(
         {
             var rewritten = SyntaxFactory.MarkupMinimizedTagHelperAttribute(
                 attributeBlock.NamePrefix,
-                attributeBlock.Name);
-
-            rewritten = rewritten.WithTagHelperAttributeInfo(
-                    new TagHelperAttributeInfo(result.AttributeName, parameterName: null, result.AttributeStructure, result.IsBoundAttribute, isDirectiveAttribute: false));
+                attributeBlock.Name,
+                new TagHelperAttributeInfo(
+                    result.AttributeName,
+                    parameterName: null,
+                    result.AttributeStructure,
+                    result.IsBoundAttribute,
+                    isDirectiveAttribute: false));
 
             result.RewrittenAttribute = rewritten;
 
@@ -314,10 +317,13 @@ private static TryParseResult TryParseAttribute(
                 attributeBlock.EqualsToken,
                 attributeBlock.ValuePrefix,
                 rewrittenValue,
-                attributeBlock.ValueSuffix);
-
-            rewritten = rewritten.WithTagHelperAttributeInfo(
-                new TagHelperAttributeInfo(result.AttributeName, parameterName: null, result.AttributeStructure, result.IsBoundAttribute, isDirectiveAttribute: false));
+                attributeBlock.ValueSuffix,
+                new TagHelperAttributeInfo(
+                    result.AttributeName,
+                    parameterName: null,
+                    result.AttributeStructure,
+                    result.IsBoundAttribute,
+                    isDirectiveAttribute: false));
 
             result.RewrittenAttribute = rewritten;
 
@@ -368,7 +374,7 @@ private static MarkupTagHelperDirectiveAttributeSyntax RewriteToDirectiveAttribu
             parameterName = SyntaxFactory.MarkupTextLiteral(parameterNameToken);
         }
 
-        var rewritten = SyntaxFactory.MarkupTagHelperDirectiveAttribute(
+        return SyntaxFactory.MarkupTagHelperDirectiveAttribute(
             attributeBlock.NamePrefix,
             transition,
             attributeNameSyntax,
@@ -378,12 +384,13 @@ private static MarkupTagHelperDirectiveAttributeSyntax RewriteToDirectiveAttribu
             attributeBlock.EqualsToken,
             attributeBlock.ValuePrefix,
             rewrittenValue,
-            attributeBlock.ValueSuffix);
-
-        rewritten = rewritten.WithTagHelperAttributeInfo(
-            new TagHelperAttributeInfo(result.AttributeName, parameterName?.GetContent(), result.AttributeStructure, result.IsBoundAttribute, isDirectiveAttribute: true));
-
-        return rewritten;
+            attributeBlock.ValueSuffix,
+            new TagHelperAttributeInfo(
+                result.AttributeName,
+                parameterName?.GetContent(),
+                result.AttributeStructure,
+                result.IsBoundAttribute,
+                isDirectiveAttribute: true));
     }
 
     private static MarkupMinimizedTagHelperDirectiveAttributeSyntax RewriteToMinimizedDirectiveAttribute(
@@ -428,17 +435,18 @@ private static MarkupMinimizedTagHelperDirectiveAttributeSyntax RewriteToMinimiz
             parameterName = SyntaxFactory.MarkupTextLiteral(parameterNameToken);
         }
 
-        var rewritten = SyntaxFactory.MarkupMinimizedTagHelperDirectiveAttribute(
+        return SyntaxFactory.MarkupMinimizedTagHelperDirectiveAttribute(
             attributeBlock.NamePrefix,
             transition,
             attributeNameSyntax,
             colon,
-            parameterName);
-
-        rewritten = rewritten.WithTagHelperAttributeInfo(
-            new TagHelperAttributeInfo(result.AttributeName, parameterName?.GetContent(), result.AttributeStructure, result.IsBoundAttribute, isDirectiveAttribute: true));
-
-        return rewritten;
+            parameterName,
+            new TagHelperAttributeInfo(
+                result.AttributeName,
+                parameterName?.GetContent(),
+                result.AttributeStructure,
+                result.IsBoundAttribute,
+                isDirectiveAttribute: true));
     }
 
     private static MarkupTagHelperAttributeValueSyntax RewriteAttributeValue(TryParseResult result, RazorBlockSyntax attributeValue, RazorParserOptions options)

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/TagHelperParseTreeRewriter.cs

@@ -120,17 +120,17 @@ public override SyntaxNode VisitMarkupElement(MarkupElementSyntax node)
                     // This is a tag helper.
                     if (tagHelperInfo.TagMode == TagMode.SelfClosing || tagHelperInfo.TagMode == TagMode.StartTagOnly)
                     {
-                        var tagHelperElement = SyntaxFactory.MarkupTagHelperElement(tagHelperStart, body: default, endTag: null);
-                        var rewrittenTagHelper = tagHelperElement.WithTagHelperInfo(tagHelperInfo);
+                        var tagHelperElement = SyntaxFactory.MarkupTagHelperElement(tagHelperStart, body: default, endTag: null, tagHelperInfo);
+
                         if (node.Body.Count == 0 && node.EndTag == null)
                         {
-                            return rewrittenTagHelper;
+                            return tagHelperElement;
                         }
 
                         // This tag contains a body and/or an end tag which needs to be moved to the parent.
                         using PooledArrayBuilder<RazorSyntaxNode> rewrittenNodes = [];
 
-                        rewrittenNodes.Add(rewrittenTagHelper);
+                        rewrittenNodes.Add(tagHelperElement);
                         var rewrittenBody = VisitList(node.Body);
                         rewrittenNodes.AddRange(rewrittenBody);
 
@@ -208,8 +208,7 @@ public override SyntaxNode VisitMarkupElement(MarkupElementSyntax node)
             if (tagHelperInfo != null)
             {
                 // If we get here it means this element was rewritten as a tag helper.
-                var tagHelperElement = SyntaxFactory.MarkupTagHelperElement(tagHelperStart, body, tagHelperEnd);
-                return tagHelperElement.WithTagHelperInfo(tagHelperInfo);
+                return SyntaxFactory.MarkupTagHelperElement(tagHelperStart, body, tagHelperEnd, tagHelperInfo);
             }
 
             // There was no matching tag helper for this element. Return.

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/TagHelperSpanVisitor.cs

@@ -30,7 +30,7 @@ public static ImmutableArray<TagHelperSpanInternal> VisitRoot(RazorSyntaxTree sy
 
     public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
     {
-        var span = new TagHelperSpanInternal(node.GetSourceSpan(_source), node.TagHelperInfo.AssumeNotNull().BindingResult);
+        var span = new TagHelperSpanInternal(node.GetSourceSpan(_source), node.TagHelperInfo.BindingResult);
         _spans.Add(span);
 
         base.VisitMarkupTagHelperElement(node);