Generate field for const arrays in constructor declarations (#7231)

dotnet · Jun 7, 2024 · 4d5fd9d · 4d5fd9d
1 parent be1b0f0
commit 4d5fd9d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/AvoidConstArrays.Fixer.cs b/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/AvoidConstArrays.Fixer.cs
@@ -74,6 +74,7 @@ private static async Task<Document> ExtractConstArrayAsync(Document document, Sy
             // Get method containing the symbol that is being diagnosed
             IOperation? methodContext = arrayArgument.GetAncestor<IMethodBodyOperation>(OperationKind.MethodBody);
             methodContext ??= arrayArgument.GetAncestor<IBlockOperation>(OperationKind.Block); // VB methods have a different structure than CS methods
+            methodContext ??= arrayArgument.GetAncestor<IConstructorBodyOperation>(OperationKind.ConstructorBody);
 
             // Create the new member
             SyntaxNode newMember = generator.FieldDeclaration(

diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/AvoidConstArraysTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/AvoidConstArraysTests.cs
@@ -1053,5 +1053,38 @@ partial class Program
                 }
             }.RunAsync();
         }
+
+        [Fact, WorkItem(7216, "https://github.com/dotnet/roslyn-analyzers/issues/7216")]
+        public Task BaseDeclaration_Diagnostic()
+        {
+            const string code = """
+                                public class Class1
+                                {
+                                    public Class1(int[] arr) { }
+                                }
+
+                                public class Class2 : Class1
+                                {
+                                    public Class2()
+                                        : base([|new int[] { 1, 2, 3 }|]) { }
+                                }
+                                """;
+            const string fixedCode = """
+                                     public class Class1
+                                     {
+                                         public Class1(int[] arr) { }
+                                     }
+                                     
+                                     public class Class2 : Class1
+                                     {
+                                         private static readonly int[] arr = new int[] { 1, 2, 3 };
+                                     
+                                         public Class2()
+                                             : base(arr) { }
+                                     }
+                                     """;
+
+            return VerifyCS.VerifyCodeFixAsync(code, fixedCode);
+        }
     }
 }