Move SyntaxExpressibleByStringInterpolation to SwiftSyntaxBuilder

Author: ahoppen

Sources/SwiftParser/CMakeLists.txt

@@ -23,7 +23,6 @@ add_library(SwiftParser STATIC
   RawTokenKindSubset.swift
   Recovery.swift
   Statements.swift
-  Syntax+StringInterpolation.swift
   TokenConsumer.swift
   TokenPrecedence.swift
   TopLevel.swift

Sources/SwiftParser/Parser.swift

@@ -138,7 +138,6 @@ public struct Parser: TokenConsumer {
   ///            arena is created automatically, and `input` copied into the
   ///            arena. If non-`nil`, `input` must be the registered source
   ///            buffer of `arena` or a slice of the source buffer.
-  @_spi(Testing)
   public init(_ input: UnsafeBufferPointer<UInt8>, arena: SyntaxArena? = nil) {
     var sourceBuffer: UnsafeBufferPointer<UInt8>
     if let arena = arena {

Sources/SwiftParser/Patterns.swift

@@ -44,7 +44,8 @@ extension Parser {
   ///     as-pattern → pattern 'as' type
   ///
   ///     expression-pattern → expression
-  mutating func parsePattern() -> RawPatternSyntax {
+  @_spi(RawSyntax)
+  public mutating func parsePattern() -> RawPatternSyntax {
     enum ExpectedTokens: RawTokenKindSubset {
       case leftParen
       case wildcardKeyword

Sources/SwiftSyntaxBuilder/ParserIntegration.swift

@@ -1,5 +1,6 @@
 @_spi(RawSyntax)
 import SwiftSyntax
+import SwiftParser
 
 fileprivate class Indenter: SyntaxRewriter {
   let indentation: Trivia
@@ -112,6 +113,12 @@ extension SyntaxStringInterpolation: StringInterpolationProtocol {
     sourceText.append(contentsOf: value.description.utf8)
     self.lastIndentation = nil
   }
+
+  public mutating func appendInterpolation<Buildable: SyntaxBuildable>(
+    _ buildable: Buildable
+  ) {
+    self.appendInterpolation(buildable.buildSyntax())
+  }
 }
 
 /// Syntax nodes that can be formed by a string interpolation involve source

Sources/SwiftParser/Syntax+StringInterpolation.swift renamed to Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift

@@ -19,6 +19,7 @@
 //===----------------------------------------------------------------------===//
 
 @_spi(RawSyntax) import SwiftSyntax
+@_spi(RawSyntax) import SwiftParser
 
 % STRING_INTERPOLATION_BASE_KINDS = [base_kind for base_kind in SYNTAX_BASE_KINDS if base_kind != 'Syntax' and base_kind != 'SyntaxCollection']
 % for base_kind in STRING_INTERPOLATION_BASE_KINDS:

Sources/SwiftParser/SyntaxExpressilbeByStringInterpolationConformances.swift.gyb renamed to Sources/SwiftSyntaxBuilder/SyntaxExpressibleByStringInterpolationConformances.swift.gyb

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 @_spi(RawSyntax) import SwiftSyntax
+@_spi(RawSyntax) import SwiftParser
 
 extension DeclSyntaxProtocol {
   public static func parse(from parser: inout Parser) -> Self {

Sources/SwiftParser/gyb_generated/SyntaxExpressilbeByStringInterpolationConformances.swift renamed to Sources/SwiftSyntaxBuilder/gyb_generated/SyntaxExpressibleByStringInterpolationConformances.swift

@@ -1,4 +1,5 @@
 import SwiftSyntax
+import SwiftSyntaxBuilder
 import SwiftParser
 
 import XCTest