Winform.IsAddedToComponents

Author: JohanLarsson

IDisposableAnalyzers.Test/Helpers/DisposableMemberTests.cs

@@ -4,7 +4,6 @@
     using Gu.Roslyn.AnalyzerExtensions;
     using Gu.Roslyn.Asserts;
     using Microsoft.CodeAnalysis.CSharp;
-    using Microsoft.CodeAnalysis.CSharp.Syntax;
     using NUnit.Framework;
 
     public static class DisposableMemberTests

IDisposableAnalyzers.Test/IDISP002DisposeMemberTests/Valid.cs

@@ -1088,7 +1088,6 @@ public class Winform : Form
             RoslynAssert.NoAnalyzerDiagnostics(Analyzer, code);
         }
 
-        [Ignore("tbd")]
         [TestCase("this.components.Add(this.stream)")]
         [TestCase("components.Add(stream)")]
         public static void FieldAddedToFormComponents(string expression)

IDisposableAnalyzers.Test/IDISP006ImplementIDisposableTests/ValidCode.Inheritance.cs

@@ -237,7 +237,6 @@ public class Winform : Form
                 RoslynAssert.NoAnalyzerDiagnostics(Analyzer, code);
             }
 
-            [Ignore("tbd")]
             [TestCase("this.components.Add(this.stream)")]
             [TestCase("components.Add(stream)")]
             public static void FieldAddedToFormComponents(string expression)

IDisposableAnalyzers/Helpers/DisposableMember.cs

@@ -19,7 +19,21 @@ internal static Result IsDisposed(FieldOrProperty member, INamedTypeSymbol conte
             }
 
             using var walker = DisposeWalker.Borrow(context, semanticModel, cancellationToken);
-            return walker.IsMemberDisposed(member.Symbol);
+            var isMemberDisposed = walker.IsMemberDisposed(member.Symbol);
+            switch (isMemberDisposed)
+            {
+                case Result.Yes:
+                case Result.AssumeYes:
+                    return isMemberDisposed;
+                default:
+                    if (context.IsAssignableTo(KnownSymbol.SystemWindowsFormsForm, semanticModel.Compilation) &&
+                        Winform.IsAddedToComponents(member, context, semanticModel, cancellationToken))
+                    {
+                        return Result.Yes;
+                    }
+
+                    return isMemberDisposed;
+            }
         }
 
         internal static bool IsDisposed(FieldOrProperty member, IMethodSymbol disposeMethod, SemanticModel semanticModel, CancellationToken cancellationToken)

IDisposableAnalyzers/Helpers/Temp/FieldOrPropertyAndDeclaration.cs

@@ -25,5 +25,27 @@ bool IsInWinForm()
                        containingType.IsAssignableTo(KnownSymbol.SystemWindowsFormsForm, semanticModel.Compilation);
             }
         }
+
+        internal static bool IsAddedToComponents(FieldOrProperty member, INamedTypeSymbol context, SemanticModel semanticModel, CancellationToken cancellationToken)
+        {
+            if (context.TrySingleDeclaration(cancellationToken, out ClassDeclarationSyntax? containingType))
+            {
+                using var walker = UsagesWalker.Borrow(member.Symbol, containingType, semanticModel, cancellationToken);
+                foreach (var usage in walker.Usages)
+                {
+                    switch (usage)
+                    {
+                        case { Parent: ArgumentSyntax { Parent: ArgumentListSyntax { Parent: InvocationExpressionSyntax invocation } } }
+                            when IsComponentsAdd(invocation, semanticModel, cancellationToken):
+                            return true;
+                        case { Parent: MemberAccessExpressionSyntax { Expression: ThisExpressionSyntax _, Parent: ArgumentSyntax { Parent: ArgumentListSyntax { Parent: InvocationExpressionSyntax invocation } } } }
+                            when IsComponentsAdd(invocation, semanticModel, cancellationToken):
+                            return true;
+                    }
+                }
+            }
+
+            return false;
+        }
     }
 }

IDisposableAnalyzers/Helpers/Winform.cs

@@ -44,7 +44,7 @@ BUGFIX IDISP025 seal disposable.</Description>
 
   <ItemGroup>
     <PackageReference Include="Gu.Analyzers" Version="1.6.6.6-dev" PrivateAssets="all" />
-    <PackageReference Include="Gu.Roslyn.Extensions" Version="0.12.2-dev" />
+    <PackageReference Include="Gu.Roslyn.Extensions" Version="0.12.3-dev" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.3.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="all" />
     <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(AnnotatedReferenceAssemblyVersion)]" />