Transition PrimaryMethod annotation to property

Author: DustinCampbell

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

@@ -234,7 +234,7 @@ public void Execute_AddsPrimaryAnnotations()
         Assert.True(@class.IsPrimaryClass);
 
         var method = SingleChild<MethodDeclarationIntermediateNode>(@class);
-        AnnotationEquals(method, CommonAnnotations.PrimaryMethod);
+        Assert.True(method.IsPrimaryMethod);
     }
 
     private class TestDocumentClassifierPass : DocumentClassifierPassBase

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Intermediate/DocumentIntermediateNodeExtensionsTest.cs

@@ -34,8 +34,10 @@ public void FindPrimaryMethod_FindsMethodWithAnnotation()
     {
         // Arrange
         var document = new DocumentIntermediateNode();
-        var method = new MethodDeclarationIntermediateNode();
-        method.Annotations[CommonAnnotations.PrimaryMethod] = CommonAnnotations.PrimaryMethod;
+        var method = new MethodDeclarationIntermediateNode
+        {
+            IsPrimaryMethod = true
+        };
 
         var builder = IntermediateNodeBuilder.Create(document);
         builder.Add(method);

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

@@ -63,8 +63,10 @@ private void Rewrite(RazorCodeDocument codeDocument, DocumentIntermediateNode do
             IsPrimaryClass = true
         };
 
-        var method = new MethodDeclarationIntermediateNode();
-        method.Annotations[CommonAnnotations.PrimaryMethod] = CommonAnnotations.PrimaryMethod;
+        var method = new MethodDeclarationIntermediateNode
+        {
+            IsPrimaryMethod = true
+        };
 
         var documentBuilder = IntermediateNodeBuilder.Create(documentNode);
 

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/CommonAnnotations.cs

@@ -27,7 +27,7 @@ public static MethodDeclarationIntermediateNode FindPrimaryMethod(this DocumentI
             throw new ArgumentNullException(nameof(node));
         }
 
-        return FindWithAnnotation<MethodDeclarationIntermediateNode>(node, CommonAnnotations.PrimaryMethod);
+        return FindNode<MethodDeclarationIntermediateNode>(node, static n => n.IsPrimaryMethod);
     }
 
     public static NamespaceDeclarationIntermediateNode FindPrimaryNamespace(this DocumentIntermediateNode node)
@@ -91,25 +91,6 @@ private static T FindNode<T>(IntermediateNode node, Func<T, bool> predicate)
         return null;
     }
 
-    private static T FindWithAnnotation<T>(IntermediateNode node, object annotation) where T : IntermediateNode
-    {
-        if (node is T target && object.ReferenceEquals(target.Annotations[annotation], annotation))
-        {
-            return target;
-        }
-
-        for (var i = 0; i < node.Children.Count; i++)
-        {
-            var result = FindWithAnnotation<T>(node.Children[i], annotation);
-            if (result != null)
-            {
-                return result;
-            }
-        }
-
-        return null;
-    }
-
     private class DirectiveVisitor : IntermediateNodeWalker
     {
         private readonly DirectiveDescriptor _directive;

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/DocumentIntermediateNodeExtensions.cs

@@ -22,6 +22,8 @@ public sealed class MethodDeclarationIntermediateNode : MemberDeclarationInterme
 
     public string ReturnType { get; set; }
 
+    public bool IsPrimaryMethod { get; set; }
+
     public override void Accept(IntermediateNodeVisitor visitor)
     {
         if (visitor == null)