Extract getting indentation from multiline statement

dotnet · Dec 29, 2024 · 3bf6824 · 3bf6824
1 parent 619c525
commit 3bf6824
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...dUtilitiesAndExtensions/Workspace/CSharp/Indentation/CSharpIndentationService.Indenter.cs b/...dUtilitiesAndExtensions/Workspace/CSharp/Indentation/CSharpIndentationService.Indenter.cs
@@ -461,9 +461,8 @@ private static bool IsPartOfQueryExpression(SyntaxToken token)
         return queryExpression != null;
     }
 
-    private static IndentationResult GetDefaultIndentationFromTokenLine(Indenter indenter, SyntaxToken token)
+    private static IndentationResult? TryGetIndentationFromMultilineStatement(Indenter indenter, SyntaxToken token)
     {
-        // find containing non expression node
         var nonExpressionNode = token.GetAncestors<SyntaxNode>().FirstOrDefault(n => n is StatementSyntax);
         if (nonExpressionNode != null)
         {
@@ -484,7 +483,16 @@ private static IndentationResult GetDefaultIndentationFromTokenLine(Indenter ind
             }
         }
 
-        // well, I can't find any non expression node. use default behavior
+        return null;
+    }
+
+    private static IndentationResult GetDefaultIndentationFromTokenLine(Indenter indenter, SyntaxToken token)
+    {
+        if (TryGetIndentationFromMultilineStatement(indenter, token) is { } result)
+        {
+            return result;
+        }
+
         var position = indenter.GetCurrentPositionNotBelongToEndOfFileToken(indenter.LineToBeIndented.Start);
 
         var spaceToAdd = indenter.Options.FormattingOptions.IndentationSize;