Use GetEvent.Match()

Author: JohanLarsson

ReflectionAnalyzers/Helpers/Reflection/GetEvent.cs

@@ -42,7 +42,7 @@ private GetEvent(InvocationExpressionSyntax invocation, IMethodSymbol target, Re
     /// </summary>
     internal static GetEvent? Match(InvocationExpressionSyntax candidate, SemanticModel semanticModel, CancellationToken cancellationToken)
     {
-        if (candidate.TryGetTarget(KnownSymbol.Type.GetField, semanticModel, cancellationToken, out var target))
+        if (candidate.TryGetTarget(KnownSymbol.Type.GetEvent, semanticModel, cancellationToken, out var target))
         {
             if (ReflectedMember.TryGetType(candidate, semanticModel, cancellationToken, out var type, out var typeSource) &&
                 Name.TryCreate(candidate, target, semanticModel, cancellationToken, out var name) &&

ReflectionAnalyzers/Helpers/Reflection/GetX.cs

@@ -13,14 +13,6 @@
     /// </summary>
     internal static class GetX
     {
-        /// <summary>
-        /// Check if <paramref name="invocation"/> is a call to Type.GetEvent.
-        /// </summary>
-        internal static bool TryMatchGetEvent(InvocationExpressionSyntax invocation, SemanticModel semanticModel, CancellationToken cancellationToken, out ReflectedMember member, out Name name, out Flags flags)
-        {
-            return TryMatchGetX(invocation, KnownSymbol.Type.GetEvent, semanticModel, cancellationToken, out member, out name, out flags);
-        }
-
         /// <summary>
         /// Check if <paramref name="invocation"/> is a call to Type.GetNestedType.
         /// </summary>

ReflectionAnalyzers/NodeAnalzers/GetXAnalyzer.cs

@@ -274,6 +274,15 @@ private static bool TryGetX(SyntaxNodeAnalysisContext context, out ReflectedMemb
                     return true;
                 }
 
+                if (GetEvent.Match(candidate, context.SemanticModel, context.CancellationToken) is { } getEvent)
+                {
+                    member = getEvent.Member;
+                    name = getEvent.Name;
+                    flags = getEvent.Flags;
+                    types = default;
+                    return true;
+                }
+
                 if (GetProperty.Match(candidate, context.SemanticModel, context.CancellationToken) is { } getProperty)
                 {
                     member = getProperty.Member;
@@ -293,8 +302,7 @@ private static bool TryGetX(SyntaxNodeAnalysisContext context, out ReflectedMemb
                 }
 
                 types = default;
-                return GetX.TryMatchGetEvent(candidate, context.SemanticModel, context.CancellationToken, out member, out name, out flags) ||
-                       GetX.TryMatchGetNestedType(candidate, context.SemanticModel, context.CancellationToken, out member, out name, out flags);
+                return GetX.TryMatchGetNestedType(candidate, context.SemanticModel, context.CancellationToken, out member, out name, out flags);
             }
 
             member = default;