Improve implementation of BasicFormat (yet again)

This re-writes the implementation of BasicFormat once again to better handle user-indented code.

Co-authored-by: Ben Barham <[email protected]>

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/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),