Merge pull request #1558 from ahoppen/ahoppen/update-basic-format

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/Trivia.swift

@@ -15,7 +15,6 @@ public class Trivia {
   public let comment: String
   public let characters: [Character]
   public let swiftCharacters: [Character]
-  public let isNewLine: Bool
   public let isComment: Bool
 
   public var lowerName: String { lowercaseFirstWord(name: name) }
@@ -36,17 +35,23 @@ public class Trivia {
 
   public var isCollection: Bool { charactersLen > 0 }
 
+  public var isBlank: Bool {
+    characters.contains { $0.isWhitespace }
+  }
+
+  public var isNewLine: Bool {
+    characters.contains { $0.isNewline }
+  }
+
   init(
     name: String,
     comment: String,
     characters: [Character] = [],
     swiftCharacters: [Character] = [],
-    isNewLine: Bool = false,
     isComment: Bool = false
   ) {
     self.name = name
     self.comment = comment
-    self.isNewLine = isNewLine
     self.isComment = isComment
     self.characters = characters
 
@@ -86,8 +91,7 @@ public let TRIVIAS: [Trivia] = [
     ],
     swiftCharacters: [
       Character("\r")
-    ],
-    isNewLine: true
+    ]
   ),
 
   Trivia(
@@ -100,8 +104,7 @@ public let TRIVIAS: [Trivia] = [
     swiftCharacters: [
       Character("\r"),
       Character("\n"),
-    ],
-    isNewLine: true
+    ]
   ),
 
   Trivia(
@@ -142,8 +145,7 @@ public let TRIVIAS: [Trivia] = [
     ],
     swiftCharacters: [
       Character("\n")
-    ],
-    isNewLine: true
+    ]
   ),
 
   Trivia(

CodeGeneration/Sources/Utils/CodeGenerationFormat.swift

@@ -15,7 +15,13 @@ import SwiftSyntax
 
 /// A format style for files generated by CodeGeneration.
 public class CodeGenerationFormat: BasicFormat {
-  public override var indentation: TriviaPiece { .spaces(indentationLevel * 2) }
+  public init() {
+    super.init(indentationWidth: .spaces(2))
+  }
+
+  var indentedNewline: Trivia {
+    .newline + currentIndentationLevel
+  }
 
   public override func visit(_ node: ArrayElementListSyntax) -> ArrayElementListSyntax {
     let children = node.children(viewMode: .all)
@@ -100,7 +106,7 @@ public class CodeGenerationFormat: BasicFormat {
   }
 
   private func formatChildrenSeparatedByNewline<SyntaxType: SyntaxProtocol>(children: SyntaxChildren, elementType: SyntaxType.Type) -> [SyntaxType] {
-    indentationLevel += 1
+    increaseIndentationLevel()
     var formattedChildren = children.map {
       self.visit($0).as(SyntaxType.self)!
     }
@@ -111,7 +117,7 @@ public class CodeGenerationFormat: BasicFormat {
         return $0.with(\.leadingTrivia, indentedNewline + $0.leadingTrivia)
       }
     }
-    indentationLevel -= 1
+    decreaseIndentationLevel()
     if !formattedChildren.isEmpty {
       formattedChildren[formattedChildren.count - 1] = formattedChildren[formattedChildren.count - 1].with(\.trailingTrivia, indentedNewline)
     }

CodeGeneration/Sources/generate-swiftsyntax/GenerateSwiftSyntax.swift

@@ -80,7 +80,7 @@ struct GenerateSwiftSyntax: ParsableCommand {
     let fileSpecs: [GeneratedFileSpec] =
       [
         // SwiftBasicFormat
-        GeneratedFileSpec(swiftBasicFormatGeneratedDir + ["BasicFormat.swift"], basicFormatFile),
+        GeneratedFileSpec(swiftBasicFormatGeneratedDir + ["BasicFormat+Extensions.swift"], basicFormatExtensionsFile),
 
         // IDEUtils
         GeneratedFileSpec(ideUtilsGeneratedDir + ["SyntaxClassification.swift"], syntaxClassificationFile),