Use GetField

Author: JohanLarsson

ReflectionAnalyzers/Helpers/Reflection/GetX.cs

@@ -21,14 +21,6 @@ internal static bool TryMatchGetEvent(InvocationExpressionSyntax invocation, Sem
             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.GetField.
-        /// </summary>
-        internal static bool TryMatchGetField(InvocationExpressionSyntax invocation, SemanticModel semanticModel, CancellationToken cancellationToken, out ReflectedMember member, out Name name, out Flags flags)
-        {
-            return TryMatchGetX(invocation, KnownSymbol.Type.GetField, semanticModel, cancellationToken, out member, out name, out flags);
-        }
-
         /// <summary>
         /// Check if <paramref name="invocation"/> is a call to Type.GetNestedType.
         /// </summary>

ReflectionAnalyzers/Helpers/Reflection/Type.cs

@@ -160,13 +160,8 @@ private static bool TryGet(ExpressionSyntax expression, Recursion recursion, [No
         {
             switch (expression)
             {
-                case MemberAccessExpressionSyntax { Expression: InvocationExpressionSyntax invocation, Name: { Identifier: { ValueText: "ReturnType" } } } memberAccess
-                    when GetMethod.Match(invocation, recursion.SemanticModel, recursion.CancellationToken) is { Single: { } single }:
-                    source = memberAccess;
-                    result = single.ReturnType;
-                    return true;
                 case MemberAccessExpressionSyntax { Expression: InvocationExpressionSyntax invocation, Name: { Identifier: { ValueText: "FieldType" } } } memberAccess
-                    when GetField.Match(invocation, recursion.SemanticModel, recursion.CancellationToken) is { Single:{} single }:
+                    when GetField.Match(invocation, recursion.SemanticModel, recursion.CancellationToken) is { Single: { } single }:
                     source = memberAccess;
                     result = single.Type;
                     return true;
@@ -177,6 +172,11 @@ when GetX.TryMatchGetProperty(invocation, recursion.SemanticModel, recursion.Can
                     source = memberAccess;
                     result = field.Type;
                     return true;
+                case MemberAccessExpressionSyntax { Expression: InvocationExpressionSyntax invocation, Name: { Identifier: { ValueText: "ReturnType" } } } memberAccess
+                    when GetMethod.Match(invocation, recursion.SemanticModel, recursion.CancellationToken) is { Single: { } single }:
+                    source = memberAccess;
+                    result = single.ReturnType;
+                    return true;
                 case TypeOfExpressionSyntax typeOf:
                     source = typeOf;
                     return recursion.SemanticModel.TryGetType(typeOf.Type, recursion.CancellationToken, out result);

ReflectionAnalyzers/NodeAnalzers/GetXAnalyzer.cs

@@ -256,12 +256,12 @@ private static bool TryGetX(SyntaxNodeAnalysisContext context, out ReflectedMemb
             name = default;
             if (context.Node is InvocationExpressionSyntax candidate)
             {
-                if (GetMethod.Match(candidate, context.SemanticModel, context.CancellationToken) is { } getMethod)
+                if (GetField.Match(candidate, context.SemanticModel, context.CancellationToken) is { } getField)
                 {
-                    member = getMethod.Member;
-                    name = getMethod.Name;
-                    flags = getMethod.Flags;
-                    types = getMethod.Types;
+                    member = getField.Member;
+                    name = getField.Name;
+                    flags = getField.Flags;
+                    types = default;
                     return true;
                 }
 
@@ -274,9 +274,17 @@ private static bool TryGetX(SyntaxNodeAnalysisContext context, out ReflectedMemb
                     return true;
                 }
 
+                if (GetMethod.Match(candidate, context.SemanticModel, context.CancellationToken) is { } getMethod)
+                {
+                    member = getMethod.Member;
+                    name = getMethod.Name;
+                    flags = getMethod.Flags;
+                    types = getMethod.Types;
+                    return true;
+                }
+
                 types = default;
                 return GetX.TryMatchGetEvent(candidate, context.SemanticModel, context.CancellationToken, out member, out name, out flags) ||
-                       GetX.TryMatchGetField(candidate, context.SemanticModel, context.CancellationToken, out member, out name, out flags) ||
                        GetX.TryMatchGetNestedType(candidate, context.SemanticModel, context.CancellationToken, out member, out name, out flags) ||
                        GetX.TryMatchGetProperty(candidate, context.SemanticModel, context.CancellationToken, out member, out name, out flags, out types);
             }