Recognize assignments inside try/finally statements. (#583)

nunit · Sep 6, 2023 · fde37e8 · fde37e8
1 parent eebf3f3
commit fde37e8
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 7 deletions.
diff --git a/...s.tests/DiagnosticSuppressors/NonNullableFieldOrPropertyIsUninitializedSuppressorTests.cs b/...s.tests/DiagnosticSuppressors/NonNullableFieldOrPropertyIsUninitializedSuppressorTests.cs
@@ -123,6 +123,37 @@ public void Test()
             RoslynAssert.Suppressed(suppressor, testCode);
         }
 
+        [Test]
+        public void FieldAssignedInTryFinally()
+        {
+            var testCode = TestUtility.WrapMethodInClassNamespaceAndAddUsings(@"
+                private string ↓field1;
+                private string ↓field2;
+
+                [SetUp]
+                public void SetUp()
+                {
+                    try
+                    {
+                        field1 = ""NUnit"";
+                    }
+                    finally
+                    {
+                        field2 = ""Analyzers"";
+                    }
+                }
+
+                [Test]
+                public void Test()
+                {
+                    Assert.That(field1, Is.Not.Null);
+                    Assert.That(field2, Is.Not.Null);
+                }
+            ");
+
+            RoslynAssert.Suppressed(suppressor, testCode);
+        }
+
         [Test]
         public void PropertyNotAssigned()
         {

diff --git a/...it.analyzers/DiagnosticSuppressors/NonNullableFieldOrPropertyIsUninitializedSuppressor.cs b/...it.analyzers/DiagnosticSuppressors/NonNullableFieldOrPropertyIsUninitializedSuppressor.cs
@@ -127,18 +127,49 @@ private static bool IsAssignedIn(
                 return IsAssignedIn(model, classDeclaration, method.ExpressionBody.Expression, fieldOrPropertyName);
             }
 
-            if (method.Body is null)
+            if (method.Body is not null)
             {
-                return false;
+                return IsAssignedIn(model, classDeclaration, method.Body, fieldOrPropertyName);
             }
 
-            foreach (var statement in method.Body.Statements)
+            return false;
+        }
+
+        private static bool IsAssignedIn(
+            SemanticModel model,
+            ClassDeclarationSyntax classDeclaration,
+            StatementSyntax statement,
+            string fieldOrPropertyName)
+        {
+            switch (statement)
             {
-                if (statement is ExpressionStatementSyntax expressionStatement &&
-                    IsAssignedIn(model, classDeclaration, expressionStatement.Expression, fieldOrPropertyName))
-                {
+                case ExpressionStatementSyntax expressionStatement:
+                    return IsAssignedIn(model, classDeclaration, expressionStatement.Expression, fieldOrPropertyName);
+
+                case BlockSyntax block:
+                    return IsAssignedIn(model, classDeclaration, block.Statements, fieldOrPropertyName);
+
+                case TryStatementSyntax tryStatement:
+                    return IsAssignedIn(model, classDeclaration, tryStatement.Block, fieldOrPropertyName) ||
+                        (tryStatement.Finally is not null &&
+                        IsAssignedIn(model, classDeclaration, tryStatement.Finally.Block, fieldOrPropertyName));
+
+                default:
+                    // Any conditional statement does not guarantee assignment.
+                    return false;
+            }
+        }
+
+        private static bool IsAssignedIn(
+            SemanticModel model,
+            ClassDeclarationSyntax classDeclaration,
+            SyntaxList<StatementSyntax> statements,
+            string fieldOrPropertyName)
+        {
+            foreach (var statement in statements)
+            {
+                if (IsAssignedIn(model, classDeclaration, statement, fieldOrPropertyName))
                     return true;
-                }
             }
 
             return false;