IDISP003 don't warn when assigned with injected.

IDISP008 is the correct warning.
#185

Author: JohanLarsson

IDisposableAnalyzers.Test/IDISP003DisposeBeforeReassigningTests/Valid.cs

@@ -1354,5 +1354,58 @@ public static C M(IDisposable d)
 
             RoslynAssert.Valid(Analyzer, code);
         }
+
+        [Test]
+        public static void Issue185()
+        {
+            var c1 = @"
+namespace N
+{
+    using System;
+
+    public class C1 : IDisposable
+    {
+        public void Dispose()
+        {
+        }
+    }
+}";
+            var code = @"
+namespace N
+{
+    using System;
+
+    public class C
+    {
+        C1 _c1;
+
+        public C() { }
+
+        public C(C1 c1)
+        {
+            _c1 = c1;
+        }
+
+        public C1 M1() => _c1;
+
+        public C1 M2() => _c1 = new C1();
+
+        public C1 GetOrCreateFoo()
+        {
+            var c1 = this.M1();
+            if (c1 != null)
+                return c1;
+
+            c1 = M2();
+            if (c1 != null)
+                return c1;
+
+            throw new Exception();
+        }
+    }
+}";
+
+            RoslynAssert.Valid(Analyzer, c1, code);
+        }
     }
 }

IDisposableAnalyzers/Analyzers/AssignmentAnalyzer.cs

@@ -80,11 +80,18 @@ private static bool IsReassignedWithCreated(AssignmentExpressionSyntax assignmen
                 return false;
             }
 
-            if (FieldOrProperty.TryCreate(assignedSymbol, out var fieldOrProperty) &&
-                context.Node.FirstAncestor<TypeDeclarationSyntax>() is { } containingType &&
-                TestFixture.IsAssignedAndDisposedInSetupAndTearDown(fieldOrProperty, containingType, context.SemanticModel, context.CancellationToken))
+            if (FieldOrProperty.TryCreate(assignedSymbol, out var fieldOrProperty))
             {
-                return false;
+                if (context.Node.FirstAncestor<TypeDeclarationSyntax>() is { } containingType &&
+                    TestFixture.IsAssignedAndDisposedInSetupAndTearDown(fieldOrProperty, containingType, context.SemanticModel, context.CancellationToken))
+                {
+                    return false;
+                }
+
+                if (Disposable.IsAssignedWithInjected(fieldOrProperty.Symbol, assignment, context.SemanticModel, context.CancellationToken))
+                {
+                    return false;
+                }
             }
 
             if (IsNullChecked(assignedSymbol, assignment, context.SemanticModel, context.CancellationToken))

IDisposableAnalyzers/Helpers/Disposable.IsInjected.cs

@@ -90,6 +90,13 @@ internal static Result IsAnyCachedOrInjected(RecursiveValues values, SemanticMod
             return result;
         }
 
+        internal static bool IsAssignedWithInjected(ISymbol symbol, ExpressionSyntax location, SemanticModel semanticModel, CancellationToken cancellationToken)
+        {
+            using var assignedValues = AssignedValueWalker.Borrow(symbol, location, semanticModel, cancellationToken);
+            using var recursive = RecursiveValues.Borrow(assignedValues, semanticModel, cancellationToken);
+            return IsAnyCachedOrInjected(recursive, semanticModel, cancellationToken).IsEither(Result.Yes, Result.AssumeYes);
+        }
+
         private static Result IsInjectedCore(ISymbol symbol)
         {
             if (symbol == null)
@@ -149,12 +156,5 @@ private static Result IsInjectedCore(ISymbol symbol)
 
             return Result.No;
         }
-
-        private static bool IsAssignedWithInjected(ISymbol symbol, ExpressionSyntax location, SemanticModel semanticModel, CancellationToken cancellationToken)
-        {
-            using var assignedValues = AssignedValueWalker.Borrow(symbol, location, semanticModel, cancellationToken);
-            using var recursive = RecursiveValues.Borrow(assignedValues, semanticModel, cancellationToken);
-            return IsAnyCachedOrInjected(recursive, semanticModel, cancellationToken).IsEither(Result.Yes, Result.AssumeYes);
-        }
     }
 }