Address code review feedback

sharwell · sharwell · commit 17afb7b5e1ab · 2025-11-24T08:06:58.000-06:00
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForClassCSharp11UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForClassCSharp11UnitTests.cs
@@ -3,7 +3,6 @@
 
 namespace StyleCop.Analyzers.Test.CSharp11.MaintainabilityRules
 {
-    using System;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
@@ -20,20 +19,14 @@ public partial class SA1402ForClassCSharp11UnitTests : SA1402ForClassCSharp10Uni
         [WorkItem(3803, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3803")]
         public async Task VerifyFileLocalClassExemptionAsync()
         {
-            var testCode = $@"namespace TestNamespace;
+            var testCode = @"namespace TestNamespace;
 
-public class TestClass1 {{ }}
+public class TestClass1 { }
 
-file class TestClass2 {{ }}
+file class TestClass2 { }
 ";
 
-            var expectedDiagnostic = this.Diagnostic().WithLocation(0);
-
-            await this.VerifyCSharpDiagnosticAsync(
-                testCode,
-                this.GetSettings(),
-                Array.Empty<DiagnosticResult>(),
-                CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(testCode, this.GetSettings(), DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -44,20 +37,14 @@ await this.VerifyCSharpDiagnosticAsync(
         [WorkItem(3803, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3803")]
         public async Task VerifyFileLocalStaticClassExemptionAsync()
         {
-            var testCode = $@"namespace TestNamespace;
+            var testCode = @"namespace TestNamespace;
 
-public class TestClass1 {{ }}
+public class TestClass1 { }
 
-file static class TestClass2 {{ }}
+file static class TestClass2 { }
 ";
 
-            var expectedDiagnostic = this.Diagnostic().WithLocation(0);
-
-            await this.VerifyCSharpDiagnosticAsync(
-                testCode,
-                this.GetSettings(),
-                Array.Empty<DiagnosticResult>(),
-                CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(testCode, this.GetSettings(), DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForDelegateCSharp11UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForDelegateCSharp11UnitTests.cs
@@ -3,7 +3,6 @@
 
 namespace StyleCop.Analyzers.Test.CSharp11.MaintainabilityRules
 {
-    using System;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
@@ -20,20 +19,14 @@ public partial class SA1402ForDelegateCSharp11UnitTests : SA1402ForDelegateCShar
         [WorkItem(3803, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3803")]
         public async Task VerifyFileLocalDelegateExemptionAsync()
         {
-            var testCode = $@"namespace TestNamespace;
+            var testCode = @"namespace TestNamespace;
 
-public class TestClass {{ }}
+public class TestClass { }
 
 file delegate void TestDelegate();
 ";
 
-            var expectedDiagnostic = Diagnostic().WithLocation(0);
-
-            await VerifyCSharpDiagnosticAsync(
-                testCode,
-                this.GetSettings(),
-                Array.Empty<DiagnosticResult>(),
-                CancellationToken.None).ConfigureAwait(false);
+            await VerifyCSharpDiagnosticAsync(testCode, this.GetSettings(), DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForEnumCSharp11UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForEnumCSharp11UnitTests.cs
@@ -3,7 +3,6 @@
 
 namespace StyleCop.Analyzers.Test.CSharp11.MaintainabilityRules
 {
-    using System;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
@@ -20,20 +19,14 @@ public partial class SA1402ForEnumCSharp11UnitTests : SA1402ForEnumCSharp10UnitT
         [WorkItem(3803, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3803")]
         public async Task VerifyFileLocalEnumExemptionAsync()
         {
-            var testCode = $@"namespace TestNamespace;
+            var testCode = @"namespace TestNamespace;
 
-public class TestClass1 {{ }}
+public class TestClass1 { }
 
-file enum TestEnum {{ }}
+file enum TestEnum { }
 ";
 
-            var expectedDiagnostic = Diagnostic().WithLocation(0);
-
-            await VerifyCSharpDiagnosticAsync(
-                testCode,
-                this.GetSettings(),
-                Array.Empty<DiagnosticResult>(),
-                CancellationToken.None).ConfigureAwait(false);
+            await VerifyCSharpDiagnosticAsync(testCode, this.GetSettings(), DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForInterfaceCSharp11UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForInterfaceCSharp11UnitTests.cs
@@ -3,7 +3,6 @@
 
 namespace StyleCop.Analyzers.Test.CSharp11.MaintainabilityRules
 {
-    using System;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
@@ -20,20 +19,14 @@ public partial class SA1402ForInterfaceCSharp11UnitTests : SA1402ForInterfaceCSh
         [WorkItem(3803, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3803")]
         public async Task VerifyFileLocalInterfaceExemptionAsync()
         {
-            var testCode = $@"namespace TestNamespace;
+            var testCode = @"namespace TestNamespace;
 
-public interface TestInterface1 {{ }}
+public interface TestInterface1 { }
 
-file interface TestInterface2 {{ }}
+file interface TestInterface2 { }
 ";
 
-            var expectedDiagnostic = this.Diagnostic().WithLocation(0);
-
-            await this.VerifyCSharpDiagnosticAsync(
-                testCode,
-                this.GetSettings(),
-                Array.Empty<DiagnosticResult>(),
-                CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(testCode, this.GetSettings(), DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForRecordCSharp11UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForRecordCSharp11UnitTests.cs
@@ -3,7 +3,6 @@
 
 namespace StyleCop.Analyzers.Test.CSharp11.MaintainabilityRules
 {
-    using System;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
@@ -20,20 +19,14 @@ public partial class SA1402ForRecordCSharp11UnitTests : SA1402ForRecordCSharp10U
         [WorkItem(3803, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3803")]
         public async Task VerifyFileLocalRecordExemptionAsync()
         {
-            var testCode = $@"namespace TestNamespace;
+            var testCode = @"namespace TestNamespace;
 
-public record TestRecord1 {{ }}
+public record TestRecord1 { }
 
-file record TestRecord2 {{ }}
+file record TestRecord2 { }
 ";
 
-            var expectedDiagnostic = this.Diagnostic().WithLocation(0);
-
-            await this.VerifyCSharpDiagnosticAsync(
-                testCode,
-                this.GetSettings(),
-                Array.Empty<DiagnosticResult>(),
-                CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(testCode, this.GetSettings(), DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForRecordClassCSharp11UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForRecordClassCSharp11UnitTests.cs
@@ -3,7 +3,6 @@
 
 namespace StyleCop.Analyzers.Test.CSharp11.MaintainabilityRules
 {
-    using System;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
@@ -20,20 +19,14 @@ public partial class SA1402ForRecordClassCSharp11UnitTests : SA1402ForRecordClas
         [WorkItem(3803, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3803")]
         public async Task VerifyFileLocalRecordClassExemptionAsync()
         {
-            var testCode = $@"namespace TestNamespace;
+            var testCode = @"namespace TestNamespace;
 
-public class TestClass {{ }}
+public class TestClass { }
 
-file record class TestRecordClass {{ }}
+file record class TestRecordClass { }
 ";
 
-            var expectedDiagnostic = this.Diagnostic().WithLocation(0);
-
-            await this.VerifyCSharpDiagnosticAsync(
-                testCode,
-                this.GetSettings(),
-                Array.Empty<DiagnosticResult>(),
-                CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(testCode, this.GetSettings(), DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForRecordStructCSharp11UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForRecordStructCSharp11UnitTests.cs
@@ -3,7 +3,6 @@
 
 namespace StyleCop.Analyzers.Test.CSharp11.MaintainabilityRules
 {
-    using System;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
@@ -20,20 +19,14 @@ public partial class SA1402ForRecordStructCSharp11UnitTests : SA1402ForRecordStr
         [WorkItem(3803, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3803")]
         public async Task VerifyFileLocalRecordStructExemptionAsync()
         {
-            var testCode = $@"namespace TestNamespace;
+            var testCode = @"namespace TestNamespace;
 
-public class TestClass {{ }}
+public class TestClass { }
 
-file record struct TestRecordStruct {{ }}
+file record struct TestRecordStruct { }
 ";
 
-            var expectedDiagnostic = this.Diagnostic().WithLocation(0);
-
-            await this.VerifyCSharpDiagnosticAsync(
-                testCode,
-                this.GetSettings(),
-                Array.Empty<DiagnosticResult>(),
-                CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(testCode, this.GetSettings(), DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForStructCSharp11UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/MaintainabilityRules/SA1402ForStructCSharp11UnitTests.cs
@@ -3,7 +3,6 @@
 
 namespace StyleCop.Analyzers.Test.CSharp11.MaintainabilityRules
 {
-    using System;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
@@ -20,20 +19,14 @@ public partial class SA1402ForStructCSharp11UnitTests : SA1402ForStructCSharp10U
         [WorkItem(3803, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3803")]
         public async Task VerifyFileLocalStructExemptionAsync()
         {
-            var testCode = $@"namespace TestNamespace;
+            var testCode = @"namespace TestNamespace;
 
-public struct TestStruct1 {{ }}
+public struct TestStruct1 { }
 
-file struct TestStruct2 {{ }}
+file struct TestStruct2 { }
 ";
 
-            var expectedDiagnostic = this.Diagnostic().WithLocation(0);
-
-            await this.VerifyCSharpDiagnosticAsync(
-                testCode,
-                this.GetSettings(),
-                Array.Empty<DiagnosticResult>(),
-                CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(testCode, this.GetSettings(), DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1402FileMayOnlyContainASingleType.cs b/StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1402FileMayOnlyContainASingleType.cs
@@ -99,7 +99,7 @@ private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context, StyleCop
         private static IEnumerable<MemberDeclarationSyntax> GetTopLevelTypeDeclarations(SyntaxNode root, StyleCopSettings settings)
         {
             var allTypeDeclarations = root.DescendantNodes(descendIntoChildren: node => ContainsTopLevelTypeDeclarations(node)).OfType<MemberDeclarationSyntax>().ToList();
-            var relevantTypeDeclarations = allTypeDeclarations.Where(x => IsRelevantType(x, settings)).Where(x => !IsFileLocalType(x)).ToList();
+            var relevantTypeDeclarations = allTypeDeclarations.Where(x => IsRelevantType(x, settings)).ToList();
             return relevantTypeDeclarations;
         }
 
@@ -110,6 +110,11 @@ private static bool ContainsTopLevelTypeDeclarations(SyntaxNode node)
 
         private static bool IsRelevantType(SyntaxNode node, StyleCopSettings settings)
         {
+            if (IsFileLocalType(node))
+            {
+                return false;
+            }
+
             var topLevelTypes = settings.MaintainabilityRules.TopLevelTypes;
             var isRelevant = false;
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`namespace StyleCop.Analyzers.Test.CSharp11.MaintainabilityRules`
`5`	`5`	`{`
`6`		`- using System;`
`7`	`6`	`using System.Threading;`
`8`	`7`	`using System.Threading.Tasks;`
`9`	`8`	`using Microsoft.CodeAnalysis.Testing;`
`@@ -20,20 +19,14 @@ public partial class SA1402ForDelegateCSharp11UnitTests : SA1402ForDelegateCShar`
`20`	`19`	`[WorkItem(3803, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3803")]`
`21`	`20`	`public async Task VerifyFileLocalDelegateExemptionAsync()`
`22`	`21`	`{`
`23`		`- var testCode = $@"namespace TestNamespace;`
	`22`	`+ var testCode = @"namespace TestNamespace;`
`24`	`23`
`25`		`-public class TestClass {{ }}`
	`24`	`+public class TestClass { }`
`26`	`25`
`27`	`26`	`file delegate void TestDelegate();`
`28`	`27`	`";`
`29`	`28`
`30`		`- var expectedDiagnostic = Diagnostic().WithLocation(0);`
`31`		`-`
`32`		`- await VerifyCSharpDiagnosticAsync(`
`33`		`- testCode,`
`34`		`- this.GetSettings(),`
`35`		`- Array.Empty<DiagnosticResult>(),`
`36`		`- CancellationToken.None).ConfigureAwait(false);`
	`29`	`+ await VerifyCSharpDiagnosticAsync(testCode, this.GetSettings(), DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);`
`37`	`30`	`}`
`38`	`31`	`}`
`39`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context, StyleCop`
`99`	`99`	`private static IEnumerable<MemberDeclarationSyntax> GetTopLevelTypeDeclarations(SyntaxNode root, StyleCopSettings settings)`
`100`	`100`	`{`
`101`	`101`	`var allTypeDeclarations = root.DescendantNodes(descendIntoChildren: node => ContainsTopLevelTypeDeclarations(node)).OfType<MemberDeclarationSyntax>().ToList();`
`102`		`- var relevantTypeDeclarations = allTypeDeclarations.Where(x => IsRelevantType(x, settings)).Where(x => !IsFileLocalType(x)).ToList();`
	`102`	`+ var relevantTypeDeclarations = allTypeDeclarations.Where(x => IsRelevantType(x, settings)).ToList();`
`103`	`103`	`return relevantTypeDeclarations;`
`104`	`104`	`}`
`105`	`105`
`@@ -110,6 +110,11 @@ private static bool ContainsTopLevelTypeDeclarations(SyntaxNode node)`
`110`	`110`
`111`	`111`	`private static bool IsRelevantType(SyntaxNode node, StyleCopSettings settings)`
`112`	`112`	`{`
	`113`	`+ if (IsFileLocalType(node))`
	`114`	`+ {`
	`115`	`+ return false;`
	`116`	`+ }`
	`117`	`+`
`113`	`118`	`var topLevelTypes = settings.MaintainabilityRules.TopLevelTypes;`
`114`	`119`	`var isRelevant = false;`
`115`	`120`