Fix Disposable Analyzer with Primary Constructor (#1398)

thomhurst · Dec 12, 2024 · 2e48379 · 2e48379
1 parent 31060e5
commit 2e48379
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 4 deletions.
diff --git a/TUnit.Analyzers.Tests/DisposableFieldPropertyAnalyzerTests.cs b/TUnit.Analyzers.Tests/DisposableFieldPropertyAnalyzerTests.cs
@@ -183,7 +183,41 @@ public void Test1()
                 """
             );
     }
-
+
+    [Test]
+    public async Task New_Disposable_No_Issue_When_Cleaned_Up_PrimaryConstructor()
+    {
+        await Verifier
+            .VerifyAnalyzerAsync(
+                """
+                using System.Net.Http;
+                using TUnit.Core;
+                
+                public class Test() // note the use of primary constructor here
+                {
+                    private HttpClient _client = null!;
+                
+                    [Before(HookType.Test)]
+                    public void Setup()
+                    {
+                        _client = new HttpClient();
+                    }
+                
+                    [After(HookType.Test)]
+                    public void Cleanup()
+                    {
+                        _client.Dispose();
+                    }
+                
+                    [Test]
+                    public void TestMethod()
+                    {
+                    }
+                }
+                """
+            );
+    }
+
     [Test]
     public async Task New_Disposable__Static_No_Issue_When_Cleaned_Up_Nullable()
     {

diff --git a/TUnit.Analyzers/DisposableFieldPropertyAnalyzer.cs b/TUnit.Analyzers/DisposableFieldPropertyAnalyzer.cs
@@ -70,7 +70,17 @@ private static void CheckSetUps(SyntaxNodeAnalysisContext context, IMethodSymbol
         var syntaxNodes = methodSymbol.DeclaringSyntaxReferences
             .SelectMany(x => x.GetSyntax().DescendantNodesAndSelf()).ToArray();
 
-        methodSymbol.IsHookMethod(context.Compilation, out _, out var level, out _);
+        var isHookMethod = methodSymbol.IsHookMethod(context.Compilation, out _, out var level, out _);
+
+        if (!isHookMethod && methodSymbol.MethodKind != MethodKind.Constructor)
+        {
+            return;
+        }
+
+        if (methodSymbol.MethodKind == MethodKind.Constructor)
+        {
+            level = HookLevel.Test;
+        }
 
         foreach (var assignment in syntaxNodes
                      .Where(x => x.IsKind(SyntaxKind.SimpleAssignmentExpression)))

diff --git a/TUnit.Analyzers/Extensions/TypeExtensions.cs b/TUnit.Analyzers/Extensions/TypeExtensions.cs
@@ -24,7 +24,7 @@ public static IEnumerable<INamedTypeSymbol> GetSelfAndBaseTypes(this INamedTypeS
     {
         var type = namedTypeSymbol;
 
-        while (type != null)
+        while (type != null && type.SpecialType != SpecialType.System_Object)
         {
             yield return type;
             type = type.BaseType;

diff --git a/TUnit.Assertions.Analyzers/Extensions/TypeExtensions.cs b/TUnit.Assertions.Analyzers/Extensions/TypeExtensions.cs
@@ -17,7 +17,7 @@ public static IEnumerable<ITypeSymbol> GetSelfAndBaseTypes(this ITypeSymbol name
     {
         var type = namedTypeSymbol;
 
-        while (type != null)
+        while (type != null && type.SpecialType != SpecialType.System_Object)
         {
             yield return type;
             type = type.BaseType;