Cleanup.

Author: JohanLarsson

ReflectionAnalyzers/Helpers/GetX.cs

@@ -182,7 +182,7 @@ internal static GetXResult TryGetMember(IMethodSymbol getX, ITypeSymbol targetTy
                     if (member == null)
                     {
                         member = candidate;
-                        if (IsOfWrongType(member))
+                        if (IsWrongMemberType(member))
                         {
                             return GetXResult.WrongMemberType;
                         }
@@ -200,15 +200,7 @@ internal static GetXResult TryGetMember(IMethodSymbol getX, ITypeSymbol targetTy
 
                 if (targetType.TryFindFirstMemberRecursive(name, out member))
                 {
-                    if (getX == KnownSymbol.Type.GetNestedType &&
-                        !targetType.Equals(member.ContainingType))
-                    {
-                        return GetXResult.UseContainingType;
-                    }
-
-                    if (member.IsStatic &&
-                        member.DeclaredAccessibility == Accessibility.Private &&
-                        !targetType.Equals(member.ContainingType))
+                    if (IsUseContainingType(member))
                     {
                         return GetXResult.UseContainingType;
                     }
@@ -251,12 +243,15 @@ internal static GetXResult TryGetMember(IMethodSymbol getX, ITypeSymbol targetTy
                         continue;
                     }
 
+                    if (IsOverriding(member, candidate))
+                    {
+                        continue;
+                    }
+
                     if (member == null)
                     {
                         member = candidate;
-                        if (member.IsStatic &&
-                            member.DeclaredAccessibility == Accessibility.Private &&
-                            !member.ContainingType.Equals(targetType))
+                        if (IsUseContainingType(member))
                         {
                             return GetXResult.UseContainingType;
                         }
@@ -268,15 +263,11 @@ internal static GetXResult TryGetMember(IMethodSymbol getX, ITypeSymbol targetTy
                             return GetXResult.WrongFlags;
                         }
 
-                        if (IsOfWrongType(candidate))
+                        if (IsWrongMemberType(candidate))
                         {
                             return GetXResult.WrongMemberType;
                         }
                     }
-                    else if (IsOverriding(member, candidate))
-                    {
-                        // continue
-                    }
                     else
                     {
                         return GetXResult.Ambiguous;
@@ -312,34 +303,34 @@ internal static GetXResult TryGetMember(IMethodSymbol getX, ITypeSymbol targetTy
 
             return GetXResult.Single;
 
-            bool IsOfWrongType(ISymbol candidate)
+            bool IsWrongMemberType(ISymbol symbol)
             {
                 if (getX.ReturnType == KnownSymbol.EventInfo &&
-                    !(candidate is IEventSymbol))
+                    !(symbol is IEventSymbol))
                 {
                     return true;
                 }
 
                 if (getX.ReturnType == KnownSymbol.FieldInfo &&
-                    !(candidate is IFieldSymbol))
+                    !(symbol is IFieldSymbol))
                 {
                     return true;
                 }
 
                 if (getX.ReturnType == KnownSymbol.MethodInfo &&
-                    !(candidate is IMethodSymbol))
+                    !(symbol is IMethodSymbol))
                 {
                     return true;
                 }
 
                 if (getX.ReturnType == KnownSymbol.PropertyInfo &&
-                    !(candidate is IPropertySymbol))
+                    !(symbol is IPropertySymbol))
                 {
                     return true;
                 }
 
                 if (getX.ReturnType == KnownSymbol.Type &&
-                    !(candidate is ITypeSymbol))
+                    !(symbol is ITypeSymbol))
                 {
                     return true;
                 }
@@ -349,6 +340,11 @@ bool IsOfWrongType(ISymbol candidate)
 
             bool IsOverriding(ISymbol symbol, ISymbol candidateBase)
             {
+                if (symbol == null)
+                {
+                    return false;
+                }
+
                 if (symbol.IsOverride)
                 {
                     switch (symbol)
@@ -368,6 +364,14 @@ bool IsOverriding(ISymbol symbol, ISymbol candidateBase)
                 return false;
             }
 
+            bool IsUseContainingType(ISymbol symbol)
+            {
+                return !targetType.Equals(symbol.ContainingType) &&
+                       (getX == KnownSymbol.Type.GetNestedType ||
+                        (symbol.IsStatic &&
+                         symbol.DeclaredAccessibility == Accessibility.Private));
+            }
+
             bool IsExplicitImplementation(out ISymbol result)
             {
                 foreach (var @interface in targetType.AllInterfaces)