Add whitespace if needed when returning syntaxTextBytes

Author: TTOzzi

Sources/SwiftSyntax/Raw/RawSyntax.swift

@@ -41,6 +41,21 @@ internal struct RawSyntaxData {
  case parsedToken(ParsedToken)
  case materializedToken(MaterializedToken)
  case layout(Layout)
+ 
+ var tokenKind: RawTokenKind? {
+ switch self {
+ case .parsedToken(let dat):
+ return dat.tokenKind
+ case .materializedToken(let dat):
+ return dat.tokenKind
+ case .layout(let dat):
+ guard dat.descendantCount == 1 else {
+ return nil
+ }
+ let singleChild = dat.layout.compactMap({ $0 }).first
+ return singleChild?.payload.tokenKind
+ }
+ }
  }
 
  /// Token with lazy trivia parsing.
@@ -404,8 +419,16 @@ extension RawSyntax {
  }
  }
  case .layout(let dat):
+ var previousChild: RawSyntax?
  for case let child? in dat.layout {
+ if child.payload.tokenKind != .stringSegment,
+ previousChild?.trailingTriviaPieces?.isEmpty == true,
+ previousChild?.payload.tokenKind?.isPunctuation == false,
+ previousChild?.payload.tokenKind == child.payload.tokenKind {
+ try body(SyntaxText(" "))
+ }
  try child.withEachSyntaxText(body: body)
+ previousChild = child
  }
  }
  }

Tests/SwiftSyntaxBuilderTest/FunctionTests.swift

@@ -399,4 +399,30 @@ final class FunctionTests: XCTestCase {
  """
  )
  }
+ 
+ func testFunctionDeclCreatedByStringInterpolation() throws {
+ let declModifierList = DeclModifierListSyntax {
+ DeclModifierSyntax(name: .keyword(.public))
+ DeclModifierSyntax(name: .keyword(.static))
+ }
+ let identifier = TokenSyntax.identifier("==")
+ let functionParameterClause = FunctionParameterClauseSyntax {
+ FunctionParameterSyntax(firstName: TokenSyntax.identifier("lhs"), colon: .colonToken(), type: TypeSyntax("String"))
+ FunctionParameterSyntax(firstName: TokenSyntax.identifier("rhs"), colon: .colonToken(), type: TypeSyntax("String"))
+ }
+ let returnClause = ReturnClauseSyntax(
+ type: IdentifierTypeSyntax(name: TokenSyntax.identifier("Bool"))
+ )
+ let functionDecl = try FunctionDeclSyntax("\(declModifierList) func \(identifier) \(functionParameterClause) \(returnClause)") {
+ "return lhs < rhs"
+ }
+ assertBuildResult(
+ functionDecl,
+ """
+ public static func == (lhs: String, rhs: String) -> Bool {
+ return lhs < rhs
+ }
+ """
+ )
+ }
 }

Tests/SwiftSyntaxBuilderTest/InitializerDeclTests.swift

@@ -87,4 +87,28 @@ final class InitializerDeclTests: XCTestCase {
  """
  )
  }
+ 
+ func testInitializerDeclCreatedByStringInterpolation() throws {
+ let functionPrameterClause = FunctionParameterClauseSyntax {
+ FunctionParameterSyntax(firstName: "_", secondName: "name", type: TypeSyntax("String"))
+ FunctionParameterSyntax(firstName: "description", type: TypeSyntax("String"))
+ }
+ let functionSignature = FunctionSignatureSyntax(
+ parameterClause: functionPrameterClause,
+ effectSpecifiers: .init(asyncSpecifier: .keyword(.async), throwsSpecifier: .keyword(.throws))
+ )
+ let initializerDeclFromString = try InitializerDeclSyntax("init\(functionSignature)") {
+ "self.name = name"
+ "self.description = description"
+ }
+ assertBuildResult(
+ initializerDeclFromString,
+ """
+ init(_ name: String, description: String) async throws {
+ self.name = name
+ self.description = description
+ }
+ """
+ )
+ }
 }