Remove RequiredAttributeDescriptor.Metadata property

RequiredAttributeDescriptor no longer needs a Metadata property.

Author: DustinCampbell

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

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.Generic;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language;
@@ -41,56 +40,4 @@ public void Build_DisplayNameIsNameWithDots_NameComparisonPrefixMatch()
         // Assert
         Assert.Equal("asp-route-...", attribute.DisplayName);
     }
-
-    [Fact]
-    public void Metadata_Same()
-    {
-        // When SetMetadata is called on multiple builders with the same metadata collection,
-        // they should share the instance.
-
-        // Arrange
-        var metadata = MetadataCollection.Create(KeyValuePair.Create<string, string?>("TestKey", "TestValue"));
-
-        var builder = TagHelperDescriptorBuilder.Create(TagHelperConventions.DefaultKind, "TestTagHelper", "Test")
-            .TagMatchingRuleDescriptor(rule => rule
-                .RequireAttributeDescriptor(attribute => attribute
-                    .Name("test1")
-                    .SetMetadata(metadata))
-                .RequireAttributeDescriptor(attribute => attribute
-                    .Name("test2")
-                    .SetMetadata(metadata)));
-
-        // Act
-        var tagHelper = builder.Build();
-        var attribute1 = tagHelper.TagMatchingRules[0].Attributes[0];
-        var attribute2 = tagHelper.TagMatchingRules[0].Attributes[1];
-
-        // Assert
-        Assert.Same(attribute1.Metadata, attribute2.Metadata);
-    }
-
-    [Fact]
-    public void Metadata_NotSame()
-    {
-        // When Metadata is accessed on multiple builders with the same metadata,
-        // they do not share the instance.
-
-        // Arrange
-        var builder = TagHelperDescriptorBuilder.Create(TagHelperConventions.DefaultKind, "TestTagHelper", "Test")
-            .TagMatchingRuleDescriptor(rule => rule
-                .RequireAttributeDescriptor(attribute => attribute
-                    .Name("test1")
-                    .Metadata.Add("TestKey", "TestValue"))
-                .RequireAttributeDescriptor(attribute => attribute
-                    .Name("test2")
-                    .Metadata.Add("TestKey", "TestValue")));
-
-        // Act
-        var tagHelper = builder.Build();
-        var attribute1 = tagHelper.TagMatchingRules[0].Attributes[0];
-        var attribute2 = tagHelper.TagMatchingRules[0].Attributes[1];
-
-        // Assert
-        Assert.NotSame(attribute1.Metadata, attribute2.Metadata);
-    }
 }

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

@@ -24,24 +24,20 @@ public sealed class RequiredAttributeDescriptor : TagHelperObject<RequiredAttrib
     public bool CaseSensitive => _flags.IsFlagSet(RequiredAttributeDescriptorFlags.CaseSensitive);
     public bool IsDirectiveAttribute => _flags.IsFlagSet(RequiredAttributeDescriptorFlags.IsDirectiveAttribute);
 
-    public MetadataCollection Metadata { get; }
-
     internal RequiredAttributeDescriptor(
         RequiredAttributeDescriptorFlags flags,
         string name,
         RequiredAttributeNameComparison nameComparison,
         string? value,
         RequiredAttributeValueComparison valueComparison,
-        ImmutableArray<RazorDiagnostic> diagnostics,
-        MetadataCollection metadata)
+        ImmutableArray<RazorDiagnostic> diagnostics)
         : base(diagnostics)
     {
         _flags = flags;
         Name = name;
         NameComparison = nameComparison;
         Value = value;
         ValueComparison = valueComparison;
-        Metadata = metadata ?? MetadataCollection.Empty;
     }
 
     private protected override void BuildChecksum(in Checksum.Builder builder)
@@ -51,7 +47,6 @@ private protected override void BuildChecksum(in Checksum.Builder builder)
         builder.AppendData((int)NameComparison);
         builder.AppendData(Value);
         builder.AppendData((int)ValueComparison);
-        builder.AppendData(Metadata.Checksum);
     }
 
     public TagMatchingRuleDescriptor Parent

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

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -15,7 +14,6 @@ public sealed partial class RequiredAttributeDescriptorBuilder : TagHelperObject
     [AllowNull]
     private TagMatchingRuleDescriptorBuilder _parent;
     private RequiredAttributeDescriptorFlags _flags;
-    private MetadataHolder _metadata;
 
     private RequiredAttributeDescriptorBuilder()
     {
@@ -39,14 +37,8 @@ public bool IsDirectiveAttribute
         set => _flags.UpdateFlag(RequiredAttributeDescriptorFlags.IsDirectiveAttribute, value);
     }
 
-    public IDictionary<string, string?> Metadata => _metadata.MetadataDictionary;
-
-    public void SetMetadata(MetadataCollection metadata) => _metadata.SetMetadataCollection(metadata);
-
     private protected override RequiredAttributeDescriptor BuildCore(ImmutableArray<RazorDiagnostic> diagnostics)
     {
-        var metadata = _metadata.GetMetadataCollection();
-
         var flags = _flags;
 
         if (CaseSensitive)
@@ -60,8 +52,7 @@ private protected override RequiredAttributeDescriptor BuildCore(ImmutableArray<
             NameComparison,
             Value,
             ValueComparison,
-            diagnostics,
-            metadata);
+            diagnostics);
     }
 
     private protected override void CollectDiagnostics(ref PooledHashSet<RazorDiagnostic> diagnostics)

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

@@ -28,8 +28,6 @@ private protected override void Reset()
         NameComparison = default;
         Value = null;
         ValueComparison = default;
-
-        _metadata.Clear();
     }
 
     private sealed class Policy : PooledBuilderPolicy<RequiredAttributeDescriptorBuilder>

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Serialization/MessagePack/Formatters/TagHelpers/RequiredAttributeFormatter.cs

@@ -9,7 +9,7 @@ namespace Microsoft.CodeAnalysis.Razor.Serialization.MessagePack.Formatters.TagH
 
 internal sealed class RequiredAttributeFormatter : ValueFormatter<RequiredAttributeDescriptor>
 {
-    private const int PropertyCount = 7;
+    private const int PropertyCount = 6;
 
     public static readonly ValueFormatter<RequiredAttributeDescriptor> Instance = new RequiredAttributeFormatter();
 
@@ -27,13 +27,10 @@ public override RequiredAttributeDescriptor Deserialize(ref MessagePackReader re
         var value = CachedStringFormatter.Instance.Deserialize(ref reader, options);
         var valueComparison = (RequiredAttributeValueComparison)reader.ReadInt32();
 
-        var metadata = reader.Deserialize<MetadataCollection>(options);
         var diagnostics = reader.Deserialize<ImmutableArray<RazorDiagnostic>>(options);
 
         return new RequiredAttributeDescriptor(
-            flags, name!, nameComparison,
-            value, valueComparison,
-            diagnostics, metadata);
+            flags, name!, nameComparison, value, valueComparison, diagnostics);
     }
 
     public override void Serialize(ref MessagePackWriter writer, RequiredAttributeDescriptor value, SerializerCachingOptions options)
@@ -46,7 +43,6 @@ public override void Serialize(ref MessagePackWriter writer, RequiredAttributeDe
         CachedStringFormatter.Instance.Serialize(ref writer, value.Value, options);
         writer.Write((int)value.ValueComparison);
 
-        writer.Serialize(value.Metadata, options);
         writer.Serialize(value.Diagnostics, options);
     }
 
@@ -60,7 +56,6 @@ public override void Skim(ref MessagePackReader reader, SerializerCachingOptions
         CachedStringFormatter.Instance.Skim(ref reader, options); // Value
         reader.Skip(); // ValueComparison
 
-        MetadataCollectionFormatter.Instance.Skim(ref reader, options); // Metadata
         RazorDiagnosticFormatter.Instance.SkimArray(ref reader, options); // Diagnostics
     }
 }

src/Shared/Microsoft.AspNetCore.Razor.Serialization.Json/ObjectReaders_TagHelpers.cs

@@ -135,13 +135,10 @@ static RequiredAttributeDescriptor ReadFromProperties(JsonDataReader reader)
                 var value = reader.ReadStringOrNull(nameof(RequiredAttributeDescriptor.Value));
                 var valueComparison = (RequiredAttributeValueComparison)reader.ReadInt32OrZero(nameof(RequiredAttributeDescriptor.ValueComparison));
 
-                var metadata = ReadMetadata(reader, nameof(RequiredAttributeDescriptor.Metadata));
                 var diagnostics = reader.ReadImmutableArrayOrEmpty(nameof(RequiredAttributeDescriptor.Diagnostics), ReadDiagnostic);
 
                 return new RequiredAttributeDescriptor(
-                    flags, Cached(name)!, nameComparison,
-                    Cached(value), valueComparison,
-                    diagnostics, metadata);
+                    flags, Cached(name)!, nameComparison, Cached(value), valueComparison, diagnostics);
             }
         }
 

src/Shared/Microsoft.AspNetCore.Razor.Serialization.Json/ObjectWriters_TagHelpers.cs

@@ -94,8 +94,6 @@ static void WriteRequiredAttribute(JsonDataWriter writer, RequiredAttributeDescr
                 writer.WriteIfNotZero(nameof(value.NameComparison), (int)value.NameComparison);
                 writer.WriteIfNotNull(nameof(value.Value), value.Value);
                 writer.WriteIfNotZero(nameof(value.ValueComparison), (int)value.ValueComparison);
-
-                WriteMetadata(writer, nameof(value.Metadata), value.Metadata);
                 writer.WriteArrayIfNotDefaultOrEmpty(nameof(value.Diagnostics), value.Diagnostics, Write);
             });
         }