Simplify

Author: JohanLarsson

ReflectionAnalyzers/Helpers/Reflection/GetConstructor.cs

@@ -59,17 +59,16 @@ when semanticModel.TryGetSymbol(identifierName, cancellationToken, out ILocalSym
         {
             if (ReflectedMember.TryGetType(candidate, semanticModel, cancellationToken, out var type, out var typeSource) &&
                 Flags.TryCreate(candidate, target, semanticModel, cancellationToken, out var flags) &&
-                Types.TryCreate(candidate, target, semanticModel, cancellationToken, out var types))
+                Types.TryCreate(candidate, target, semanticModel, cancellationToken, out var types) &&
+                ReflectedMember.TryCreate(target, candidate, type, typeSource, Name.Ctor, flags.Effective, types, semanticModel.Compilation, out var member))
             {
-                return ReflectedMember.TryCreate(target, candidate, type, typeSource, Name.Ctor, flags.Effective, types, semanticModel.Compilation, out var member)
-                    ? new GetConstructor(candidate, target, member, flags, types)
-                    : null;
+                return new GetConstructor(candidate, target, member, flags, types);
             }
 
             if (Flags.TryCreate(candidate, target, semanticModel, cancellationToken, out flags) &&
                 flags.AreInSufficient)
             {
-                var member = new ReflectedMember(type, typeSource, null, target, candidate, FilterMatch.InSufficientFlags);
+                member = new ReflectedMember(type, typeSource, null, target, candidate, FilterMatch.InSufficientFlags);
                 _ = Types.TryCreate(candidate, target, semanticModel, cancellationToken, out types);
                 return new GetConstructor(candidate, target, member, flags, types);
             }

ReflectionAnalyzers/Helpers/Reflection/GetMethod.cs

@@ -62,19 +62,18 @@ when semanticModel.TryGetSymbol(identifierName, cancellationToken, out ILocalSym
             if (ReflectedMember.TryGetType(candidate, semanticModel, cancellationToken, out var type, out var typeSource) &&
                 Name.TryCreate(candidate, target, semanticModel, cancellationToken, out var name) &&
                 Flags.TryCreate(candidate, target, semanticModel, cancellationToken, out var flags) &&
-                Types.TryCreate(candidate, target, semanticModel, cancellationToken, out var types))
+                Types.TryCreate(candidate, target, semanticModel, cancellationToken, out var types) &&
+                ReflectedMember.TryCreate(target, candidate, type, typeSource, name, flags.Effective, types, semanticModel.Compilation, out var member))
             {
-                return ReflectedMember.TryCreate(target, candidate, type, typeSource, name, flags.Effective, types, semanticModel.Compilation, out var member)
-                    ? new GetMethod(candidate, target, member, name, flags, types)
-                    : null;
+                return new GetMethod(candidate, target, member, name, flags, types);
             }
 
             if (Flags.TryCreate(candidate, target, semanticModel, cancellationToken, out flags) &&
                 flags.AreInSufficient)
             {
                 _ = Name.TryCreate(candidate, target, semanticModel, cancellationToken, out name);
                 _ = Types.TryCreate(candidate, target, semanticModel, cancellationToken, out types);
-                var member = new ReflectedMember(type, typeSource, null, target, candidate, FilterMatch.InSufficientFlags);
+                member = new ReflectedMember(type, typeSource, null, target, candidate, FilterMatch.InSufficientFlags);
                 return new GetMethod(candidate, target, member, name, flags, types);
             }
         }