Update SA1137 for file-scoped namespaces

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp10/ReadabilityRules/SA1137CSharp10UnitTests.cs

@@ -3,9 +3,166 @@
 
 namespace StyleCop.Analyzers.Test.CSharp10.ReadabilityRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
     using StyleCop.Analyzers.Test.CSharp9.ReadabilityRules;
+    using StyleCop.Analyzers.Test.Helpers;
+    using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.ReadabilityRules.SA1137ElementsShouldHaveTheSameIndentation,
+        StyleCop.Analyzers.ReadabilityRules.IndentationCodeFixProvider>;
 
     public class SA1137CSharp10UnitTests : SA1137CSharp9UnitTests
     {
+        [Theory]
+        [MemberData(nameof(CommonMemberData.BaseTypeDeclarationKeywords), MemberType = typeof(CommonMemberData))]
+        public async Task TestFileScopedNamespaceDeclarationAsync(string baseTypeKind)
+        {
+            await new CSharpTest
+            {
+                TestSources =
+                {
+                    $@"
+using System;
+
+namespace Namespace0;
+
+    [My] [My] {baseTypeKind} TypeName {{ }}
+",
+                    $@"
+using System;
+
+namespace Namespace1;
+
+    [My]
+[|  |][My] {baseTypeKind} TypeName {{ }}
+",
+                    $@"
+using System;
+
+namespace Namespace2;
+
+  [My]
+[|    |][My]
+  {baseTypeKind} TypeName {{ }}
+",
+                    $@"
+using System;
+
+namespace Namespace3;
+
+[|    |][My]
+[|    |][My]
+  {baseTypeKind} TypeName {{ }}
+",
+                    $@"
+using System;
+
+namespace Namespace4;
+
+    {baseTypeKind} TypeName1 {{ }}
+
+[|  |][My] {baseTypeKind} TypeName2 {{ }}
+",
+                    $@"
+using System;
+
+namespace Namespace5;
+
+    {baseTypeKind} TypeName1 {{ }}
+
+    [My]
+[|  |][My] {baseTypeKind} TypeName2 {{ }}
+",
+                    $@"
+using System;
+
+namespace Namespace6;
+
+    {baseTypeKind} TypeName1 {{ }}
+
+[|  |][My]
+    [My] {baseTypeKind} TypeName2 {{ }}
+",
+                    $@"
+using System;
+
+[AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
+class MyAttribute : Attribute {{ }}
+",
+                },
+                FixedSources =
+                {
+                    $@"
+using System;
+
+namespace Namespace0;
+
+    [My] [My] {baseTypeKind} TypeName {{ }}
+",
+                    $@"
+using System;
+
+namespace Namespace1;
+
+    [My]
+    [My] {baseTypeKind} TypeName {{ }}
+",
+                    $@"
+using System;
+
+namespace Namespace2;
+
+  [My]
+  [My]
+  {baseTypeKind} TypeName {{ }}
+",
+                    $@"
+using System;
+
+namespace Namespace3;
+
+  [My]
+  [My]
+  {baseTypeKind} TypeName {{ }}
+",
+                    $@"
+using System;
+
+namespace Namespace4;
+
+    {baseTypeKind} TypeName1 {{ }}
+
+    [My] {baseTypeKind} TypeName2 {{ }}
+",
+                    $@"
+using System;
+
+namespace Namespace5;
+
+    {baseTypeKind} TypeName1 {{ }}
+
+    [My]
+    [My] {baseTypeKind} TypeName2 {{ }}
+",
+                    $@"
+using System;
+
+namespace Namespace6;
+
+    {baseTypeKind} TypeName1 {{ }}
+
+    [My]
+    [My] {baseTypeKind} TypeName2 {{ }}
+",
+                    $@"
+using System;
+
+[AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
+class MyAttribute : Attribute {{ }}
+",
+                },
+            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1137ElementsShouldHaveTheSameIndentation.cs

@@ -32,7 +32,7 @@ internal class SA1137ElementsShouldHaveTheSameIndentation : DiagnosticAnalyzer
             new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.ReadabilityRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink);
 
         private static readonly Action<SyntaxNodeAnalysisContext> CompilationUnitAction = HandleCompilationUnit;
-        private static readonly Action<SyntaxNodeAnalysisContext> NamespaceDeclarationAction = HandleNamespaceDeclaration;
+        private static readonly Action<SyntaxNodeAnalysisContext> BaseNamespaceDeclarationAction = HandleBaseNamespaceDeclaration;
         private static readonly Action<SyntaxNodeAnalysisContext> TypeDeclarationAction = HandleTypeDeclaration;
         private static readonly Action<SyntaxNodeAnalysisContext> EnumDeclarationAction = HandleEnumDeclaration;
         private static readonly Action<SyntaxNodeAnalysisContext> MethodDeclarationAction = HandleMethodDeclaration;
@@ -61,7 +61,7 @@ public override void Initialize(AnalysisContext context)
             context.EnableConcurrentExecution();
 
             context.RegisterSyntaxNodeAction(CompilationUnitAction, SyntaxKind.CompilationUnit);
-            context.RegisterSyntaxNodeAction(NamespaceDeclarationAction, SyntaxKind.NamespaceDeclaration);
+            context.RegisterSyntaxNodeAction(BaseNamespaceDeclarationAction, SyntaxKinds.BaseNamespaceDeclaration);
             context.RegisterSyntaxNodeAction(TypeDeclarationAction, SyntaxKinds.TypeDeclaration);
             context.RegisterSyntaxNodeAction(EnumDeclarationAction, SyntaxKind.EnumDeclaration);
             context.RegisterSyntaxNodeAction(MethodDeclarationAction, SyntaxKind.MethodDeclaration);
@@ -94,9 +94,9 @@ private static void HandleCompilationUnit(SyntaxNodeAnalysisContext context)
             CheckElements(context, elements.ToImmutable());
         }
 
-        private static void HandleNamespaceDeclaration(SyntaxNodeAnalysisContext context)
+        private static void HandleBaseNamespaceDeclaration(SyntaxNodeAnalysisContext context)
         {
-            var namespaceDeclaration = (NamespaceDeclarationSyntax)context.Node;
+            var namespaceDeclaration = (BaseNamespaceDeclarationSyntaxWrapper)context.Node;
 
             var elements = ImmutableList.CreateBuilder<SyntaxNode>();