Fix indentation analysis (fix #859) (RCS0054)

dotnet · Nov 13, 2021 · 9a0d664 · 9a0d664
1 parent 3a82b0b
commit 9a0d664
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/CSharp/CSharp/SyntaxTriviaAnalysis.cs b/src/CSharp/CSharp/SyntaxTriviaAnalysis.cs
@@ -407,6 +407,10 @@ public static int DetermineIndentationSize(SyntaxNode node, CancellationToken ca
                                         if (size > 0)
                                             return size;
 
+                                        break;
+                                    }
+                                case GlobalStatementSyntax:
+                                    {
                                         break;
                                     }
                                 default:
@@ -431,9 +435,7 @@ public static int DetermineIndentationSize(SyntaxNode node, CancellationToken ca
 
             int DetermineIndentationSize(CompilationUnitSyntax compilationUnit)
             {
-                MemberDeclarationSyntax member = compilationUnit.Members.FirstOrDefault();
-
-                if (member != null)
+                foreach (MemberDeclarationSyntax member in compilationUnit.Members)
                 {
                     if (member is NamespaceDeclarationSyntax namespaceDeclaration)
                     {

diff --git a/src/Tests/Formatting.Analyzers.Tests/RCS0054FixFormattingOfCallChainTests.cs b/src/Tests/Formatting.Analyzers.Tests/RCS0054FixFormattingOfCallChainTests.cs
@@ -228,6 +228,24 @@ C M(string s)
 ");
         }
 
+        [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.FixFormattingOfCallChain)]
+        public async Task Test_TopLevelStatement()
+        {
+            await VerifyNoDiagnosticAsync(@"
+using System;
+
+Console
+    .WriteLine();
+
+class Program
+{
+    void Main(string[] args)
+    {
+    }
+}
+", options: Options.WithCompilationOptions(Options.CompilationOptions.WithOutputKind(OutputKind.ConsoleApplication)));
+        }
+
         [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.FixFormattingOfCallChain)]
         public async Task TestNoDiagnostic()
         {