Simplify.

Author: JohanLarsson

IDisposableAnalyzers/Analyzers/FieldAndPropertyDeclarationAnalyzer.cs

@@ -58,13 +58,24 @@ private static void HandleFieldOrProperty(SyntaxNodeAnalysisContext context, Fie
                 {
                     context.ReportDiagnostic(Diagnostic.Create(Descriptors.IDISP008DoNotMixInjectedAndCreatedForMember, context.Node.GetLocation()));
                 }
-                else if (DisposableMember.IsDisposed(member, context.SemanticModel, context.CancellationToken).IsEither(Result.No, Result.AssumeNo) &&
-                         !TestFixture.IsAssignedInInitializeAndDisposedInCleanup(member, context.SemanticModel, context.CancellationToken))
+                else if (TestFixture.IsAssignedInInitialize(member, context.SemanticModel, context.CancellationToken, out _, out var setupAttribute))
+                {
+                    if (!DisposedInTearDown())
+                    {
+                        context.ReportDiagnostic(Diagnostic.Create(Descriptors.IDISP002DisposeMember, context.Node.GetLocation()));
+                    }
+
+                    bool DisposedInTearDown()
+                    {
+                        return TestFixture.FindTearDown(setupAttribute!, context.SemanticModel, context.CancellationToken) is { } tearDown &&
+                               DisposableMember.IsDisposed(member.FieldOrProperty, tearDown, context.SemanticModel, context.CancellationToken);
+                    }
+                }
+                else if (DisposableMember.IsDisposed(member, context.SemanticModel, context.CancellationToken).IsEither(Result.No, Result.AssumeNo))
                 {
                     context.ReportDiagnostic(Diagnostic.Create(Descriptors.IDISP002DisposeMember, context.Node.GetLocation()));
 
-                    if (!TestFixture.IsAssignedInInitialize(member, context.SemanticModel, context.CancellationToken, out _, out _) &&
-                        DisposeMethod.FindFirst(member.FieldOrProperty.ContainingType, context.Compilation, Search.TopLevel) is null)
+                    if (DisposeMethod.FindFirst(member.FieldOrProperty.ContainingType, context.Compilation, Search.TopLevel) is null)
                     {
                         context.ReportDiagnostic(Diagnostic.Create(Descriptors.IDISP006ImplementIDisposable, member.Declaration.GetLocation()));
                     }

IDisposableAnalyzers/CodeFixes/DisposeInTearDownFix.cs

@@ -41,7 +41,7 @@ protected override async Task RegisterCodeFixesAsync(DocumentEditorCodeFixContex
                     TestFixture.IsAssignedInInitialize(fieldOrProperty, classDeclaration, semanticModel, context.CancellationToken, out var assignment, out var setupAttribute) &&
                     assignment is { Left: { } left })
                 {
-                    if (TestFixture.TryGetTearDownMethod(setupAttribute, semanticModel, context.CancellationToken, out var tearDown))
+                    if (TestFixture.FindTearDown(setupAttribute, semanticModel, context.CancellationToken) is { } tearDown)
                     {
                         switch (tearDown)
                         {

IDisposableAnalyzers/Helpers/TestFixture.cs

@@ -63,13 +63,12 @@ internal static bool IsAssignedInInitialize(FieldOrProperty fieldOrProperty, Typ
             return false;
         }
 
-        internal static bool TryGetTearDownMethod(AttributeSyntax setupAttribute, SemanticModel semanticModel, CancellationToken cancellationToken, [NotNullWhen(true)] out MethodDeclarationSyntax? result)
+        internal static MethodDeclarationSyntax? FindTearDown(AttributeSyntax setupAttribute, SemanticModel semanticModel, CancellationToken cancellationToken)
         {
-            result = null;
             var typeDeclarationSyntax = setupAttribute.FirstAncestor<TypeDeclarationSyntax>();
             if (typeDeclarationSyntax is null)
             {
-                return false;
+                return null;
             }
 
             if (TearDown(semanticModel.GetTypeInfoSafe(setupAttribute, cancellationToken).Type) is { } tearDownAttributeType)
@@ -80,14 +79,13 @@ internal static bool TryGetTearDownMethod(AttributeSyntax setupAttribute, Semant
                     {
                         if (Attribute.TryFind(methodDeclaration, tearDownAttributeType, semanticModel, cancellationToken, out _))
                         {
-                            result = methodDeclaration;
-                            return true;
+                            return methodDeclaration;
                         }
                     }
                 }
             }
 
-            return false;
+            return null;
 
             static QualifiedType? TearDown(ITypeSymbol? initialize)
             {