Fix CA1515 nested types false positives

dotnet · Nov 26, 2024 · 0f683f3 · 0f683f3
1 parent 5435ba7
commit 0f683f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 27 deletions.
diff --git a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/Maintainability/MakeTypesInternal.cs b/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/Maintainability/MakeTypesInternal.cs
@@ -48,7 +48,7 @@ public override void Initialize(AnalysisContext context)
         private void AnalyzeType(SymbolAnalysisContext context)
         {
             INamedTypeSymbol namedTypeSymbol = (INamedTypeSymbol)context.Symbol;
-            if (namedTypeSymbol.IsPublic()
+            if (namedTypeSymbol.IsExternallyVisible()
                 && GetIdentifier(namedTypeSymbol.DeclaringSyntaxReferences[0].GetSyntax()) is SyntaxToken identifier)
             {
                 context.ReportDiagnostic(identifier.CreateDiagnostic(Rule));

diff --git a/...yzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/MakeTypesInternalTests.cs b/...yzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/MakeTypesInternalTests.cs
@@ -440,20 +440,9 @@ class Program
                 {
                     public static void Main() {}
 
-                    public struct [|MyValueType|]
+                    public struct MyValueType
                     {
-                        public class [|Nested|] {}
-                    }
-                }
-                """,
-                """
-                class Program
-                {
-                    public static void Main() {}
-
-                    internal struct MyValueType
-                    {
-                        internal class Nested {}
+                        public class Nested {}
                     }
                 }
                 """);
@@ -463,19 +452,8 @@ Class Program
                     Public Shared Sub Main()
                     End Sub
 
-                    Public Structure [|MyValueType|]
-                        Public Class [|Nested|]
-                        End Class
-                    End Structure
-                End Class
-                """,
-                """
-                Class Program
-                    Public Shared Sub Main()
-                    End Sub
-
-                    Friend Structure MyValueType
-                        Friend Class Nested
+                    Public Structure MyValueType
+                        Public Class Nested
                         End Class
                     End Structure
                 End Class