Inline GetDefaultIndentationFromTokenLine

dotnet · Dec 29, 2024 · 9184234 · 9184234
1 parent 3bf6824
commit 9184234
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/...dUtilitiesAndExtensions/Workspace/CSharp/Indentation/CSharpIndentationService.Indenter.cs b/...dUtilitiesAndExtensions/Workspace/CSharp/Indentation/CSharpIndentationService.Indenter.cs
@@ -318,13 +318,17 @@ private static IndentationResult GetIndentationBasedOnToken(Indenter indenter, S
                 }
         }
 
-        var result = TryGetIndentationForQueryExpression(indenter, token);
+        var result = TryGetIndentationForQueryExpression(indenter, token)
+            ?? TryGetIndentationFromMultilineStatement(indenter, token);
+
         if (result is not null)
         {
             return result.Value;
         }
 
-        return GetDefaultIndentationFromTokenLine(indenter, token);
+        var spaceToAdd = indenter.Options.FormattingOptions.IndentationSize;
+
+        return indenter.IndentFromStartOfLine(indenter.Finder.GetIndentationOfCurrentPosition(indenter.Tree, token, position, spaceToAdd, indenter.CancellationToken));
     }
 
     private static IndentationResult? TryGetIndentationFromCommaSeparatedList(Indenter indenter, SyntaxToken token)
@@ -485,18 +489,4 @@ private static bool IsPartOfQueryExpression(SyntaxToken token)
 
         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;
-
-        return indenter.IndentFromStartOfLine(indenter.Finder.GetIndentationOfCurrentPosition(indenter.Tree, token, position, spaceToAdd, indenter.CancellationToken));
-    }
 }