Align generating header in templates

kimdv · kimdv · commit 955bd354f02e · 2023-02-14T12:50:51.000+01:00
diff --git a/CodeGeneration/Sources/Utils/CopyrightHeader.swift b/CodeGeneration/Sources/Utils/CopyrightHeader.swift
@@ -10,7 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-public func generateCopyrightHeader(for generator: String) -> String {
+import SwiftSyntax
+
+public func generateCopyrightHeader(for generator: String) -> Trivia {
   return """
     //// Automatically Generated by \(generator)
     //// Do Not Edit Directly!
@@ -25,7 +27,5 @@ public func generateCopyrightHeader(for generator: String) -> String {
     // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
     //
     //===----------------------------------------------------------------------===//
-
-
-    """
+    """ + .newlines(2)
 }
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/basicformat/BasicFormatFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/basicformat/BasicFormatFile.swift
@@ -49,13 +49,8 @@ extension Child {
   }
 }
 
-let basicFormatFile = SourceFileSyntax {
-  DeclSyntax(
-    """
-    \(raw: generateCopyrightHeader(for: "generate-swiftbasicformat"))
-    import SwiftSyntax
-    """
-  )
+let basicFormatFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftbasicformat")) {
+  DeclSyntax("import SwiftSyntax")
 
   try! ClassDeclSyntax("open class BasicFormat: SyntaxRewriter") {
     DeclSyntax("public var indentationLevel: Int = 0")
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/ideutils/SyntaxClassificationFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/ideutils/SyntaxClassificationFile.swift
@@ -29,13 +29,8 @@ fileprivate var node_child_classifications: [ChildClassification] {
   return result
 }
 
-let syntaxClassificationFile = SourceFileSyntax {
-  DeclSyntax(
-    """
-    \(raw: generateCopyrightHeader(for: "generate-ideutils"))
-    @_spi(RawSyntax) import SwiftSyntax
-    """
-  )
+let syntaxClassificationFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-ideutils")) {
+  DeclSyntax("@_spi(RawSyntax) import SwiftSyntax")
 
   try! EnumDeclSyntax("public enum SyntaxClassification") {
     for classification in SYNTAX_CLASSIFICATIONS {
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/DeclarationModifierFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/DeclarationModifierFile.swift
@@ -15,14 +15,8 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let declarationModifierFile = SourceFileSyntax {
-  DeclSyntax(
-    """
-    \(raw: generateCopyrightHeader(for: "generate-swiftparser"))
-    @_spi(RawSyntax) import SwiftSyntax
-
-    """
-  )
+let declarationModifierFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftparser")) {
+  DeclSyntax("@_spi(RawSyntax) import SwiftSyntax")
 
   try! EnumDeclSyntax("enum DeclarationModifier: TokenSpecSet") {
     for attribute in DECL_MODIFIER_KINDS {
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/ParserEntryFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/ParserEntryFile.swift
@@ -15,14 +15,8 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let parserEntryFile = SourceFileSyntax {
-  DeclSyntax(
-    """
-    \(raw: generateCopyrightHeader(for: "generate-swiftparser"))
-    @_spi(RawSyntax) import SwiftSyntax
-
-    """
-  )
+let parserEntryFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftparser")) {
+  DeclSyntax("@_spi(RawSyntax) import SwiftSyntax")
 
   try! ExtensionDeclSyntax("extension Parser") {
     DeclSyntax(
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/TokenSpecStaticMembersFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/TokenSpecStaticMembersFile.swift
@@ -15,9 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let tokenSpecStaticMembersFile = SourceFileSyntax(
-  leadingTrivia: .docLineComment(generateCopyrightHeader(for: "generate-swiftparser"))
-) {
+let tokenSpecStaticMembersFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftparser")) {
   DeclSyntax("import SwiftSyntax")
 
   try! ExtensionDeclSyntax("extension TokenSpec") {
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/TypeAttributeFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/TypeAttributeFile.swift
@@ -15,14 +15,8 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let typeAttributeFile = SourceFileSyntax {
-  DeclSyntax(
-    """
-    \(raw: generateCopyrightHeader(for: "generate-swiftparser"))
-    @_spi(RawSyntax) import SwiftSyntax
-
-    """
-  )
+let typeAttributeFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftparser")) {
+  DeclSyntax("@_spi(RawSyntax) import SwiftSyntax")
 
   try! ExtensionDeclSyntax("extension Parser") {
     try EnumDeclSyntax("enum TypeAttribute: TokenSpecSet") {
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/KeywordFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/KeywordFile.swift
@@ -21,11 +21,9 @@ let lookupTable = ArrayExprSyntax(leftSquare: .leftSquareBracketToken(trailingTr
   }
 }
 
-let keywordFile = SourceFileSyntax {
+let keywordFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   DeclSyntax(
     """
-    \(raw: generateCopyrightHeader(for: "generate-swiftparser"))
-
     /// Make `StaticString` equatable so we can use it as the raw value for Keyword.
     extension StaticString: Equatable {
       public static func == (lhs: StaticString, rhs: StaticString) -> Bool {
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/MiscFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/MiscFile.swift
@@ -15,13 +15,8 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let miscFile = SourceFileSyntax {
-  try! ExtensionDeclSyntax(
-    """
-    \(raw: generateCopyrightHeader(for: "generate-swiftsyntax"))
-    extension Syntax
-    """
-  ) {
+let miscFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
+  try! ExtensionDeclSyntax("extension Syntax") {
     try VariableDeclSyntax("public static var structure: SyntaxNodeStructure") {
       let choices = ArrayExprSyntax {
         ArrayElementSyntax(
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift
@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: "\(generateCopyrightHeader(for: "generate-swiftsyntax"))" + .newline) {
+let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   for node in SYNTAX_NODES where node.isBase {
     DeclSyntax(
       """
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxAnyVisitorFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxAnyVisitorFile.swift
@@ -15,11 +15,9 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let syntaxAnyVisitorFile = SourceFileSyntax {
+let syntaxAnyVisitorFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   try! ClassDeclSyntax(
     """
-    \(raw: generateCopyrightHeader(for: "generate-swiftsyntax"))
-
     /// A `SyntaxVisitor` that can visit the nodes as generic `Syntax` values.
     ///
     /// This subclass of `SyntaxVisitor` is slower than the type-specific visitation
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxBaseNodesFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxBaseNodesFile.swift
@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let syntaxBaseNodesFile = SourceFileSyntax(leadingTrivia: [.blockComment(generateCopyrightHeader(for: "generate-swiftsyntax"))]) {
+let syntaxBaseNodesFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   for node in SYNTAX_NODES where node.isBase {
     DeclSyntax(
       """
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxCollectionsFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxCollectionsFile.swift
@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let syntaxCollectionsFile = SourceFileSyntax(leadingTrivia: [.blockComment(generateCopyrightHeader(for: "generate-swiftsyntax"))]) {
+let syntaxCollectionsFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   DeclSyntax(
     """
     public protocol SyntaxCollection: SyntaxProtocol, Sequence where Element: SyntaxProtocol {
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxEnumFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxEnumFile.swift
@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let syntaxEnumFile = SourceFileSyntax(leadingTrivia: .docLineComment(generateCopyrightHeader(for: "generate-swiftsyntax"))) {
+let syntaxEnumFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   try! EnumDeclSyntax(
     """
     /// Enum to exhaustively switch over all different syntax nodes.
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxKindFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxKindFile.swift
@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let syntaxKindFile = SourceFileSyntax(leadingTrivia: .docLineComment(generateCopyrightHeader(for: "generate-swiftsyntax"))) {
+let syntaxKindFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   try! EnumDeclSyntax(
     """
     /// Enumerates the known kinds of Syntax represented in the Syntax tree.
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodeFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodeFile.swift
@@ -20,7 +20,7 @@ import Utils
 /// variable `emitKind` set to a base kind listed in
 /// It then only emits those syntax nodes whose base kind are that specified kind.
 func syntaxNode(emitKind: String) -> SourceFileSyntax {
-  SourceFileSyntax(leadingTrivia: .docLineComment(generateCopyrightHeader(for: "generate-swiftsyntax"))) {
+  SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
     for node in SYNTAX_NODES where !node.isBase && node.collectionElement.isEmpty && node.baseKind == emitKind {
       // We are actually handling this node now
       let nodeDoc = node.description.map { "/// \($0)" }
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxRewriterFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxRewriterFile.swift
@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: .docLineComment(generateCopyrightHeader(for: "generate-swiftsyntax"))) {
+let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   try! ClassDeclSyntax(
     """
     //
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxTraitsFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxTraitsFile.swift
@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let syntaxTraitsFile = SourceFileSyntax {
+let syntaxTraitsFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   for trait in TRAITS {
     try! ProtocolDeclSyntax(
       """
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxTransformFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxTransformFile.swift
@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let syntaxTransformFile = SourceFileSyntax(leadingTrivia: .docLineComment(generateCopyrightHeader(for: "generate-swiftsyntax"))) {
+let syntaxTransformFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   try! ProtocolDeclSyntax("public protocol SyntaxTransformVisitor") {
     DeclSyntax("associatedtype ResultType = Void")
 
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxVisitorFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxVisitorFile.swift
@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let syntaxVisitorFile = SourceFileSyntax {
+let syntaxVisitorFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   DeclSyntax(
     """
     /// The enum describes how the SyntaxVistor should continue after visiting
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TokenKindFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TokenKindFile.swift
@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let tokenKindFile = SourceFileSyntax {
+let tokenKindFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   try! EnumDeclSyntax(
     """
     /// Enumerates the kinds of tokens in the Swift language.
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TokensFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TokensFile.swift
@@ -15,9 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let tokensFile = SourceFileSyntax(
-  leadingTrivia: .docLineComment(generateCopyrightHeader(for: "generate-swiftsyntax"))
-) {
+let tokensFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   try! ExtensionDeclSyntax("extension TokenSyntax") {
     for token in SYNTAX_TOKENS {
       if token.isKeyword {
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TriviaFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TriviaFile.swift
@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let triviaFile = SourceFileSyntax(leadingTrivia: .docLineComment(generateCopyrightHeader(for: "generate-swiftsyntax"))) {
+let triviaFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   DeclSyntax(
     """
     public enum TriviaPosition {
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/BuildableCollectionNodesFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/BuildableCollectionNodesFile.swift
@@ -16,11 +16,8 @@ import SyntaxSupport
 import Utils
 import SwiftBasicFormat
 
-let buildableCollectionNodesFile = SourceFileSyntax {
-  ImportDeclSyntax(
-    leadingTrivia: .docLineComment(generateCopyrightHeader(for: "generate-swiftsyntaxbuilder")),
-    path: [AccessPathComponentSyntax(name: "SwiftSyntax")]
-  )
+let buildableCollectionNodesFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntaxbuilder")) {
+  DeclSyntax("import SwiftSyntax")
 
   for node in SYNTAX_NODES where node.isSyntaxCollection {
     let elementType = node.collectionElementType
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/BuildableNodesFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/BuildableNodesFile.swift
@@ -15,11 +15,8 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let buildableNodesFile = SourceFileSyntax {
-  ImportDeclSyntax(
-    leadingTrivia: .docLineComment(generateCopyrightHeader(for: "generate-swiftsyntaxbuilder")),
-    path: [AccessPathComponentSyntax(name: "SwiftSyntax")]
-  )
+let buildableNodesFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntaxbuilder")) {
+  DeclSyntax("import SwiftSyntax")
 
   for node in SYNTAX_NODES where node.isBuildable {
     let type = node.type
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift
@@ -15,11 +15,9 @@ import SyntaxSupport
 import SwiftSyntaxBuilder
 import Utils
 
-let resultBuildersFile = SourceFileSyntax {
-  ImportDeclSyntax(
-    leadingTrivia: .docLineComment(generateCopyrightHeader(for: "generate-swiftsyntaxbuilder")),
-    path: [AccessPathComponentSyntax(name: "SwiftSyntax")]
-  )
+let resultBuildersFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntaxbuilder")) {
+  DeclSyntax("import SwiftSyntax")
+
   for node in SYNTAX_NODES where node.isSyntaxCollection {
     let type = SyntaxBuildableType(syntaxKind: node.syntaxKind)
     let elementType = node.collectionElementType
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift
@@ -15,13 +15,8 @@ import SyntaxSupport
 import SwiftSyntaxBuilder
 import Utils
 
-let syntaxExpressibleByStringInterpolationConformancesFile = SourceFileSyntax {
-  DeclSyntax(
-    """
-    \(raw: generateCopyrightHeader(for: "generate-swiftsyntaxbuilder"))
-    import SwiftSyntax
-    """
-  )
+let syntaxExpressibleByStringInterpolationConformancesFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntaxbuilder")) {
+  DeclSyntax("import SwiftSyntax")
   DeclSyntax("import SwiftParser")
   DeclSyntax("import SwiftParserDiagnostics")
 
diff --git a/Sources/IDEUtils/generated/SyntaxClassification.swift b/Sources/IDEUtils/generated/SyntaxClassification.swift
@@ -13,7 +13,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 @_spi(RawSyntax) import SwiftSyntax
 
 public enum SyntaxClassification {
diff --git a/Sources/SwiftBasicFormat/generated/BasicFormat.swift b/Sources/SwiftBasicFormat/generated/BasicFormat.swift
@@ -13,7 +13,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 import SwiftSyntax
 
 open class BasicFormat: SyntaxRewriter {
diff --git a/Sources/SwiftParser/generated/DeclarationModifier.swift b/Sources/SwiftParser/generated/DeclarationModifier.swift
@@ -13,7 +13,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 @_spi(RawSyntax) import SwiftSyntax
 
 enum DeclarationModifier: TokenSpecSet {
diff --git a/Sources/SwiftParser/generated/Parser+Entry.swift b/Sources/SwiftParser/generated/Parser+Entry.swift
@@ -13,7 +13,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 @_spi(RawSyntax) import SwiftSyntax
 
 extension Parser {
diff --git a/Sources/SwiftParser/generated/TypeAttribute.swift b/Sources/SwiftParser/generated/TypeAttribute.swift
@@ -13,7 +13,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 @_spi(RawSyntax) import SwiftSyntax
 
 extension Parser {
diff --git a/Sources/SwiftSyntax/generated/Keyword.swift b/Sources/SwiftSyntax/generated/Keyword.swift
@@ -1,6 +1,6 @@
 
 
-//// Automatically Generated by generate-swiftparser
+//// Automatically Generated by generate-swiftsyntax
 //// Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 //
@@ -14,8 +14,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-
-
 /// Make `StaticString` equatable so we can use it as the raw value for Keyword.
 extension StaticString: Equatable {
   public static func == (lhs: StaticString, rhs: StaticString) -> Bool {
diff --git a/Sources/SwiftSyntax/generated/Misc.swift b/Sources/SwiftSyntax/generated/Misc.swift
@@ -14,7 +14,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 extension Syntax {
   public static var structure: SyntaxNodeStructure {
     return .choices([
diff --git a/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift b/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift
diff --git a/Sources/SwiftSyntax/generated/SyntaxTraits.swift b/Sources/SwiftSyntax/generated/SyntaxTraits.swift
diff --git a/Sources/SwiftSyntax/generated/SyntaxVisitor.swift b/Sources/SwiftSyntax/generated/SyntaxVisitor.swift
diff --git a/Sources/SwiftSyntax/generated/TokenKind.swift b/Sources/SwiftSyntax/generated/TokenKind.swift
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift
diff --git a/Sources/SwiftSyntaxBuilder/generated/SyntaxExpressibleByStringInterpolationConformances.swift b/Sources/SwiftSyntaxBuilder/generated/SyntaxExpressibleByStringInterpolationConformances.swift

Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,8 @@ extension Child {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`-let basicFormatFile = SourceFileSyntax {`
`53`		`- DeclSyntax(`
`54`		`- """`
`55`		`- \(raw: generateCopyrightHeader(for: "generate-swiftbasicformat"))`
`56`		`- import SwiftSyntax`
`57`		`- """`
`58`		`- )`
	`52`	`+let basicFormatFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftbasicformat")) {`
	`53`	`+ DeclSyntax("import SwiftSyntax")`
`59`	`54`
`60`	`55`	`try! ClassDeclSyntax("open class BasicFormat: SyntaxRewriter") {`
`61`	`56`	`DeclSyntax("public var indentationLevel: Int = 0")`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,9 @@ let lookupTable = ArrayExprSyntax(leftSquare: .leftSquareBracketToken(trailingTr`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-let keywordFile = SourceFileSyntax {`
	`24`	`+let keywordFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {`
`25`	`25`	`DeclSyntax(`
`26`	`26`	`"""`
`27`		`- \(raw: generateCopyrightHeader(for: "generate-swiftparser"))`
`28`		`-`
`29`	`27`	/// Make `StaticString` equatable so we can use it as the raw value for Keyword.
`30`	`28`	`extension StaticString: Equatable {`
`31`	`29`	`public static func == (lhs: StaticString, rhs: StaticString) -> Bool {`