More tests.

Author: JohanLarsson

ReflectionAnalyzers.Tests/REFL013MemberIsOfWrongTypeTests/Diagnostics.cs

@@ -9,12 +9,21 @@ internal class Diagnostics
         private static readonly DiagnosticAnalyzer Analyzer = new GetXAnalyzer();
         private static readonly ExpectedDiagnostic ExpectedDiagnostic = ExpectedDiagnostic.Create(REFL013MemberIsOfWrongType.DiagnosticId);
 
-        [Test]
-        public void GetMethodMatchingProperty()
+        [TestCase("GetEvent(nameof(this.Bar))")]
+        [TestCase("GetEvent(nameof(this.Bar), BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)")]
+        [TestCase("GetField(nameof(this.Bar))")]
+        [TestCase("GetField(nameof(this.Bar), BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)")]
+        [TestCase("GetMethod(nameof(this.Bar))")]
+        [TestCase("GetMethod(nameof(this.Bar), BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)")]
+        [TestCase("GetNestedType(nameof(this.Bar))")]
+        [TestCase("GetNestedType(nameof(this.Bar), BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)")]
+        public void WhenMatchIsProperty(string call)
         {
             var code = @"
 namespace RoslynSandbox
 {
+    using System.Reflection;
+
     class Foo
     {
         public Foo()
@@ -24,17 +33,26 @@ public Foo()
 
         public int Bar { get; }
     }
-}";
+}".AssertReplace("GetMethod(nameof(this.Bar))", call);
             var message = "The type RoslynSandbox.Foo has a member named Bar of type SourcePropertySymbol.";
             AnalyzerAssert.Diagnostics(Analyzer, ExpectedDiagnostic.WithMessage(message), code);
         }
 
-        [Test]
-        public void GetPropertyMatchingMethod()
+        [TestCase("GetEvent(nameof(this.Bar))")]
+        [TestCase("GetEvent(nameof(this.Bar), BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)")]
+        [TestCase("GetField(nameof(this.Bar))")]
+        [TestCase("GetField(nameof(this.Bar), BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)")]
+        [TestCase("GetProperty(nameof(this.Bar))")]
+        [TestCase("GetProperty(nameof(this.Bar), BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)")]
+        [TestCase("GetNestedType(nameof(this.Bar))")]
+        [TestCase("GetNestedType(nameof(this.Bar), BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)")]
+        public void GetPropertyMatchingMethod(string call)
         {
             var code = @"
 namespace RoslynSandbox
 {
+    using System.Reflection;
+
     class Foo
     {
         public Foo()
@@ -44,7 +62,7 @@ public Foo()
 
         public int Bar() => 0;
     }
-}";
+}".AssertReplace("GetProperty(nameof(this.Bar))", call);
             var message = "The type RoslynSandbox.Foo has a member named Bar of type SourceMemberMethodSymbol.";
             AnalyzerAssert.Diagnostics(Analyzer, ExpectedDiagnostic.WithMessage(message), code);
         }

ReflectionAnalyzers/Helpers/GetX.cs

@@ -172,16 +172,20 @@ internal static GetXResult TryGetTarget(IMethodSymbol getX, ITypeSymbol targetTy
                  !flags.HasFlagFast(BindingFlags.Instance) &&
                  !flags.HasFlagFast(BindingFlags.FlattenHierarchy)))
             {
-                foreach (var member in targetType.GetMembers(name))
+                foreach (var candidate in targetType.GetMembers(name))
                 {
-                    if (!MatchesFilter(member, targetMetadataName, flags, types))
+                    if (!MatchesFilter(candidate, targetMetadataName, flags, types))
                     {
                         continue;
                     }
 
                     if (target == null)
                     {
-                        target = member;
+                        target = candidate;
+                        if (IsOfWrongType(target))
+                        {
+                            return GetXResult.WrongMemberType;
+                        }
                     }
                     else
                     {
@@ -334,6 +338,12 @@ bool IsOfWrongType(ISymbol member)
                     return true;
                 }
 
+                if (getX.ReturnType == KnownSymbol.Type &&
+                    !(member is ITypeSymbol))
+                {
+                    return true;
+                }
+
                 return false;
             }