Compiler: Add Parent property to nested tag helper objects

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/DefaultBoundAttributeDescriptorBuilderTest.cs

@@ -16,7 +16,7 @@ public void DisplayName_SetsDescriptorsDisplayName()
 
         var tagHelperBuilder = new TagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
 
-        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder);
         builder.DisplayName(expectedDisplayName);
 
         // Act
@@ -33,7 +33,7 @@ public void DisplayName_DefaultsToPropertyLookingDisplayName()
         var tagHelperBuilder = new TagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
         tagHelperBuilder.Metadata(TypeName("TestTagHelper"));
 
-        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder);
         builder
             .TypeName(typeof(int).FullName)
             .Metadata(PropertyName("SomeProperty"));
@@ -56,12 +56,12 @@ public void Metadata_Same()
 
         var metadata = MetadataCollection.Create(PropertyName("SomeProperty"));
 
-        var builder1 = new BoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind)
+        var builder1 = new BoundAttributeDescriptorBuilder(tagHelperBuilder)
         {
             TypeName = typeof(int).FullName
         };
 
-        var builder2 = new BoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind)
+        var builder2 = new BoundAttributeDescriptorBuilder(tagHelperBuilder)
         {
             TypeName = typeof(int).FullName
         };
@@ -86,12 +86,12 @@ public void Metadata_NotSame()
         // Arrange
         var tagHelperBuilder = new TagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
 
-        var builder1 = new BoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind)
+        var builder1 = new BoundAttributeDescriptorBuilder(tagHelperBuilder)
         {
             TypeName = typeof(int).FullName
         };
 
-        var builder2 = new BoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind)
+        var builder2 = new BoundAttributeDescriptorBuilder(tagHelperBuilder)
         {
             TypeName = typeof(int).FullName
         };

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Extensions/PreallocatedAttributeTargetExtensionTest.cs

@@ -130,7 +130,7 @@ public void WriteTagHelperProperty_RendersCorrectly()
         var tagHelperBuilder = new TagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "FooTagHelper", "Test");
         tagHelperBuilder.Metadata(TypeName("FooTagHelper"));
 
-        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder);
         builder
             .Name("Foo")
             .TypeName("System.String")
@@ -173,7 +173,7 @@ public void WriteSetPreallocatedTagHelperProperty_IndexerAttribute_RendersCorrec
         var tagHelperBuilder = new TagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "FooTagHelper", "Test");
         tagHelperBuilder.Metadata(TypeName("FooTagHelper"));
 
-        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder);
         builder
             .Name("Foo")
             .TypeName("System.Collections.Generic.Dictionary<System.String, System.String>")
@@ -223,7 +223,7 @@ public void WriteSetPreallocatedTagHelperProperty_IndexerAttribute_MultipleValue
         var tagHelperBuilder = new TagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "FooTagHelper", "Test");
         tagHelperBuilder.Metadata(TypeName("FooTagHelper"));
 
-        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder);
         builder
             .Name("Foo")
             .TypeName("System.Collections.Generic.Dictionary<System.String, System.String>")

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TagHelperMatchingConventionsTest.cs

@@ -163,7 +163,7 @@ public void CanSatisfyBoundAttribute_IndexerAttribute_ReturnsFalseIsNotMatching(
     {
         // Arrange
         var tagHelperBuilder = new TagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
-        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder);
         builder.AsDictionary("asp-", typeof(Dictionary<string, string>).FullName);
 
         var boundAttribute = builder.Build();
@@ -180,7 +180,7 @@ public void CanSatisfyBoundAttribute_IndexerAttribute_ReturnsTrueIfMatching()
     {
         // Arrange
         var tagHelperBuilder = new TagHelperDescriptorBuilder(TagHelperConventions.DefaultKind, "TestTagHelper", "Test");
-        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder, TagHelperConventions.DefaultKind);
+        var builder = new BoundAttributeDescriptorBuilder(tagHelperBuilder);
         builder.AsDictionary("asp-", typeof(Dictionary<string, string>).FullName);
 
         var boundAttribute = builder.Build();

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/AllowedChildTagDescriptor.cs

@@ -2,12 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Immutable;
+using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Utilities;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
 public sealed class AllowedChildTagDescriptor : TagHelperObject<AllowedChildTagDescriptor>
 {
+    private TagHelperDescriptor? _parent;
+
     public string Name { get; }
     public string DisplayName { get; }
 
@@ -24,6 +27,17 @@ private protected override void BuildChecksum(in Checksum.Builder builder)
         builder.AppendData(DisplayName);
     }
 
+    public TagHelperDescriptor Parent
+        => _parent ?? ThrowHelper.ThrowInvalidOperationException<TagHelperDescriptor>(Resources.Parent_has_not_been_set);
+
+    internal void SetParent(TagHelperDescriptor parent)
+    {
+        Debug.Assert(parent != null);
+        Debug.Assert(_parent == null);
+
+        _parent = parent;
+    }
+
     public override string ToString()
         => DisplayName ?? base.ToString()!;
 }

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/BoundAttributeDescriptor.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Utilities;
 
@@ -31,7 +32,8 @@ private enum BoundAttributeFlags
     private readonly BoundAttributeFlags _flags;
     private readonly DocumentationObject _documentationObject;
 
-    public string Kind { get; }
+    private TagHelperDescriptor? _parent;
+
     public string Name { get; }
     public string TypeName { get; }
     public string DisplayName { get; }
@@ -54,7 +56,6 @@ private enum BoundAttributeFlags
     public MetadataCollection Metadata { get; }
 
     internal BoundAttributeDescriptor(
-        string kind,
         string name,
         string typeName,
         bool isEnum,
@@ -71,7 +72,6 @@ internal BoundAttributeDescriptor(
         ImmutableArray<RazorDiagnostic> diagnostics)
         : base(diagnostics)
     {
-        Kind = kind;
         Name = name;
         TypeName = typeName;
         IndexerNamePrefix = indexerNamePrefix;
@@ -82,6 +82,11 @@ internal BoundAttributeDescriptor(
         Parameters = parameters.NullToEmpty();
         Metadata = metadata ?? MetadataCollection.Empty;
 
+        foreach (var parameter in Parameters)
+        {
+            parameter.SetParent(this);
+        }
+
         BoundAttributeFlags flags = 0;
 
         if (isEnum)
@@ -134,7 +139,6 @@ internal BoundAttributeDescriptor(
 
     private protected override void BuildChecksum(in Checksum.Builder builder)
     {
-        builder.AppendData(Kind);
         builder.AppendData(Name);
         builder.AppendData(TypeName);
         builder.AppendData(IndexerNamePrefix);
@@ -161,6 +165,17 @@ private protected override void BuildChecksum(in Checksum.Builder builder)
         builder.AppendData(Metadata.Checksum);
     }
 
+    public TagHelperDescriptor Parent
+        => _parent ?? ThrowHelper.ThrowInvalidOperationException<TagHelperDescriptor>(Resources.Parent_has_not_been_set);
+
+    internal void SetParent(TagHelperDescriptor parent)
+    {
+        Debug.Assert(parent != null);
+        Debug.Assert(_parent == null);
+
+        _parent = parent;
+    }
+
     public string? Documentation => _documentationObject.GetText();
 
     internal DocumentationObject DocumentationObject => _documentationObject;

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/BoundAttributeDescriptorBuilder.cs

@@ -35,8 +35,6 @@ public sealed partial class BoundAttributeDescriptorBuilder : TagHelperObjectBui
 
     [AllowNull]
     private TagHelperDescriptorBuilder _parent;
-    [AllowNull]
-    private string _kind;
     private DocumentationObject _documentationObject;
     private MetadataHolder _metadata;
     private bool? _caseSensitive;
@@ -45,10 +43,9 @@ private BoundAttributeDescriptorBuilder()
     {
     }
 
-    internal BoundAttributeDescriptorBuilder(TagHelperDescriptorBuilder parent, string kind)
+    internal BoundAttributeDescriptorBuilder(TagHelperDescriptorBuilder parent)
     {
         _parent = parent;
-        _kind = kind;
     }
 
     [AllowNull]
@@ -93,7 +90,7 @@ public void BindAttributeParameter(Action<BoundAttributeParameterDescriptorBuild
             throw new ArgumentNullException(nameof(configure));
         }
 
-        var builder = BoundAttributeParameterDescriptorBuilder.GetInstance(this, _kind);
+        var builder = BoundAttributeParameterDescriptorBuilder.GetInstance(this);
         configure(builder);
         Parameters.Add(builder);
     }
@@ -111,7 +108,6 @@ internal void SetDocumentation(DocumentationDescriptor? documentation)
     private protected override BoundAttributeDescriptor BuildCore(ImmutableArray<RazorDiagnostic> diagnostics)
     {
         return new BoundAttributeDescriptor(
-            _kind,
             Name ?? string.Empty,
             TypeName ?? string.Empty,
             IsEnum,

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/BoundAttributeDescriptorBuilder_Pooling.cs

@@ -10,20 +10,18 @@ public partial class BoundAttributeDescriptorBuilder
 {
     internal static readonly ObjectPool<BoundAttributeDescriptorBuilder> Pool = DefaultPool.Create(Policy.Instance);
 
-    internal static BoundAttributeDescriptorBuilder GetInstance(TagHelperDescriptorBuilder parent, string kind)
+    internal static BoundAttributeDescriptorBuilder GetInstance(TagHelperDescriptorBuilder parent)
     {
         var builder = Pool.Get();
 
         builder._parent = parent;
-        builder._kind = kind;
 
         return builder;
     }
 
     private protected override void Reset()
     {
         _parent = null;
-        _kind = null;
         _documentationObject = default;
         _caseSensitive = null;
 

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/BoundAttributeDescriptorExtensions.cs

@@ -1,44 +1,33 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
 public static class BoundAttributeDescriptorExtensions
 {
-    public static string GetPropertyName(this BoundAttributeDescriptor attribute)
+    public static string? GetPropertyName(this BoundAttributeDescriptor attribute)
     {
-        if (attribute == null)
-        {
-            throw new ArgumentNullException(nameof(attribute));
-        }
+        ArgHelper.ThrowIfNull(attribute);
 
         attribute.Metadata.TryGetValue(TagHelperMetadata.Common.PropertyName, out var propertyName);
         return propertyName;
     }
 
-    public static string GetGloballyQualifiedTypeName(this BoundAttributeDescriptor attribute)
+    public static string? GetGloballyQualifiedTypeName(this BoundAttributeDescriptor attribute)
     {
-        if (attribute == null)
-        {
-            throw new ArgumentNullException(nameof(attribute));
-        }
+        ArgHelper.ThrowIfNull(attribute);
 
         attribute.Metadata.TryGetValue(TagHelperMetadata.Common.GloballyQualifiedTypeName, out var propertyName);
         return propertyName;
     }
 
     public static bool IsDefaultKind(this BoundAttributeDescriptor attribute)
     {
-        if (attribute == null)
-        {
-            throw new ArgumentNullException(nameof(attribute));
-        }
+        ArgHelper.ThrowIfNull(attribute);
 
-        return attribute.Kind == TagHelperConventions.DefaultKind;
+        return attribute.Parent.Kind == TagHelperConventions.DefaultKind;
     }
 
     internal static bool ExpectsStringValue(this BoundAttributeDescriptor attribute, string name)
@@ -65,20 +54,14 @@ internal static bool ExpectsBooleanValue(this BoundAttributeDescriptor attribute
 
     public static bool IsDefaultKind(this BoundAttributeParameterDescriptor parameter)
     {
-        if (parameter == null)
-        {
-            throw new ArgumentNullException(nameof(parameter));
-        }
+        ArgHelper.ThrowIfNull(parameter);
 
-        return parameter.Kind == TagHelperConventions.DefaultKind;
+        return parameter.Parent.Parent.Kind == TagHelperConventions.DefaultKind;
     }
 
-    public static string GetPropertyName(this BoundAttributeParameterDescriptor parameter)
+    public static string? GetPropertyName(this BoundAttributeParameterDescriptor parameter)
     {
-        if (parameter == null)
-        {
-            throw new ArgumentNullException(nameof(parameter));
-        }
+        ArgHelper.ThrowIfNull(parameter);
 
         parameter.Metadata.TryGetValue(TagHelperMetadata.Common.PropertyName, out var propertyName);
         return propertyName;

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/BoundAttributeParameterDescriptor.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Immutable;
+using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Utilities;
 
 namespace Microsoft.AspNetCore.Razor.Language;
@@ -21,7 +22,8 @@ private enum BoundAttributeParameterFlags
     private readonly BoundAttributeParameterFlags _flags;
     private readonly DocumentationObject _documentationObject;
 
-    public string Kind { get; }
+    private BoundAttributeDescriptor? _parent;
+
     public string Name { get; }
     public string TypeName { get; }
     public string DisplayName { get; }
@@ -34,7 +36,6 @@ private enum BoundAttributeParameterFlags
     public MetadataCollection Metadata { get; }
 
     internal BoundAttributeParameterDescriptor(
-        string kind,
         string name,
         string typeName,
         bool isEnum,
@@ -45,7 +46,6 @@ internal BoundAttributeParameterDescriptor(
         ImmutableArray<RazorDiagnostic> diagnostics)
         : base(diagnostics)
     {
-        Kind = kind;
         Name = name;
         TypeName = typeName;
         _documentationObject = documentationObject;
@@ -79,7 +79,6 @@ internal BoundAttributeParameterDescriptor(
 
     private protected override void BuildChecksum(in Checksum.Builder builder)
     {
-        builder.AppendData(Kind);
         builder.AppendData(Name);
         builder.AppendData(TypeName);
         builder.AppendData(DisplayName);
@@ -93,6 +92,17 @@ private protected override void BuildChecksum(in Checksum.Builder builder)
         builder.AppendData(Metadata.Checksum);
     }
 
+    public BoundAttributeDescriptor Parent
+        => _parent ?? ThrowHelper.ThrowInvalidOperationException<BoundAttributeDescriptor>(Resources.Parent_has_not_been_set);
+
+    internal void SetParent(BoundAttributeDescriptor parent)
+    {
+        Debug.Assert(parent != null);
+        Debug.Assert(_parent == null);
+
+        _parent = parent;
+    }
+
     public string? Documentation => _documentationObject.GetText();
 
     internal DocumentationObject DocumentationObject => _documentationObject;