Merge pull request #1791 from gibachan/basic-format-indentation

Fix the indentation for nodes that have a parent node

Author: ahoppen

Sources/SwiftBasicFormat/BasicFormat.swift

@@ -293,6 +293,7 @@ open class BasicFormat: SyntaxRewriter {
     defer {
       self.previousToken = token
     }
+    let isInitialToken = self.previousToken == nil
     let previousToken = self.previousToken ?? token.previousToken(viewMode: viewMode)
     let nextToken = token.nextToken(viewMode: viewMode)
 
@@ -393,7 +394,7 @@ open class BasicFormat: SyntaxRewriter {
       }
     }
 
-    if leadingTrivia.indentation(isOnNewline: previousTokenWillEndWithNewline) == [] {
+    if leadingTrivia.indentation(isOnNewline: isInitialToken || previousTokenWillEndWithNewline) == [] {
       // If the token starts on a new line and does not have indentation, this
       // is the last non-indented token. Store its indentation level
       anchorPoints[token] = currentIndentationLevel

Tests/SwiftBasicFormatTest/BasicFormatTests.swift

@@ -341,4 +341,43 @@ final class BasicFormatTest: XCTestCase {
         """
     )
   }
+
+  func testSubTreeNode() {
+    let decl: DeclSyntax = """
+      func test() {
+          print(1)
+      }
+      """
+    let body = decl.cast(FunctionDeclSyntax.self).body!
+
+    assertFormatted(
+      source: body.formatted().description,
+      expected: """
+        {
+            print(1)
+        }
+        """
+    )
+  }
+
+  func testSubTreeNodeWithIndentedParentNode() {
+    let decl: DeclSyntax = """
+      struct X {
+          func test() {
+              print(1)
+          }
+      }
+      """
+
+    let body = decl.cast(StructDeclSyntax.self).memberBlock.members.first!.decl.cast(FunctionDeclSyntax.self).body!
+
+    assertFormatted(
+      source: body.formatted().description,
+      expected: """
+        {
+                print(1)
+            }
+        """
+    )
+  }
 }