Generate @resultbuilder with SwiftSyntaxBuilder

Author: kimdv

Package.swift

@@ -80,6 +80,7 @@ let package = Package(
         "BuildableCollectionNodes.swift.gyb",
         "BuildableNodes.swift.gyb",
         "ResultBuilders.swift.gyb",
+        "TokenSyntax.swift.gyb",
       ]
     ),
     .target(

Sources/SwiftSyntaxBuilderGeneration/gyb_generated/Kinds.swift renamed to Sources/SwiftSyntaxBuilder/ArrayElementConvenienceInitializers.swift

@@ -1,5 +1,3 @@
-//// Automatically Generated From Kinds.swift.gyb.
-//// Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
@@ -12,12 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-let SyntaxBaseKinds: [String] = [
-  "Decl",
-  "Expr",
-  "Pattern",
-  "Stmt",
-  "Syntax",
-  "SyntaxCollection",
-  "Type"
-]
+import SwiftSyntax
+
+extension ArrayElement: ExpressibleAsArrayExpr {
+  public func createArrayExpr() -> ArrayExpr {
+    ArrayExpr(elements: ArrayElementList([self]))
+  }
+}

Sources/SwiftSyntaxBuilderGeneration/Kinds.swift.gyb renamed to Sources/SwiftSyntaxBuilder/ArrayElementListConvenienceInitializers.swift

@@ -1,11 +1,3 @@
-%{
-  from gyb_syntax_support import *
-  from gyb_syntax_support.kinds import SYNTAX_BASE_KINDS
-  # -*- mode: Swift -*-
-  # Ignore the following admonition it applies to the resulting .swift file only
-}%
-//// Automatically Generated From Kinds.swift.gyb.
-//// Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
@@ -18,7 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-% quotedSyntaxBaseKinds = map(lambda x: '"%s"' % x, SYNTAX_BASE_KINDS)
-let SyntaxBaseKinds: [String] = [
-  ${",\n  ".join(quotedSyntaxBaseKinds)}
-]
+import SwiftSyntax
+
+extension ArrayElementList: ExpressibleAsArrayExpr {
+  public func createArrayExpr() -> ArrayExpr {
+    ArrayExpr(elements: self)
+  }
+}

Sources/SwiftSyntaxBuilder/ResultBuilders.swift.gyb

@@ -21,36 +21,42 @@ extension Trivia {
   func addSpacingAfterNewlinesIfNeeded() -> Trivia {
     var updatedTriviaPieces = self.pieces
     if updatedTriviaPieces.count > 2,
-       isNewline(trivia: updatedTriviaPieces[0]),
-       let toInset = self.makeIndentation(trivia: updatedTriviaPieces[1]) {
-
-      for i in (2..<updatedTriviaPieces.count).reversed() where isNewline(trivia: updatedTriviaPieces[i]) {
-          updatedTriviaPieces.insert(toInset, at: i + 1)
-        }
-      }
+       updatedTriviaPieces[0].isNewline,
+       let toInset = makeIndentation(trivia: updatedTriviaPieces[1]) {
 
-      return Trivia(pieces: updatedTriviaPieces)
+      for i in (2..<updatedTriviaPieces.count).reversed() where updatedTriviaPieces[i].isNewline {
+        updatedTriviaPieces.insert(toInset, at: i + 1)
+      }
     }
 
-    private func isNewline(trivia: TriviaPiece) -> Bool {
-        switch trivia {
-        case .newlines,
-             .carriageReturns,
-             .carriageReturnLineFeeds:
-            return true
-        default:
-            return false
-        }
+    return Trivia(pieces: updatedTriviaPieces)
+  }
+  
+  private func makeIndentation(trivia: TriviaPiece) -> TriviaPiece? {
+    switch trivia {
+    case .spaces(let spaces):
+      return .spaces(spaces)
+    case .tabs(let tabs):
+      return .tabs(tabs)
+    default:
+      return nil
     }
-    
-    private func makeIndentation(trivia: TriviaPiece) -> TriviaPiece? {
-        switch trivia {
-        case .spaces(let spaces):
-            return .spaces(spaces)
-        case .tabs(let tabs):
-            return .tabs(tabs)
-        default:
-            return nil
-        }
+  }
+}
+
+extension TriviaPiece {
+  /// Returns true, if the ``TriviaPiece`` is a
+  /// - ``TriviaPiece.newlines``
+  /// - ``TriviaPiece.carriageReturns``
+  /// - ``TriviaPiece.carriageReturnLineFeeds``
+  var isNewline: Bool {
+    switch self {
+    case .newlines,
+        .carriageReturns,
+        .carriageReturnLineFeeds:
+      return true
+    default:
+      return false
     }
+  }
 }