Merge pull request #1144 from kimdv/kimdv/update-syntax-in-codegen

Author: kimdv

CodeGeneration/Package.swift

@@ -15,7 +15,7 @@ let package = Package(
     .executable(name: "generate-swiftsyntaxbuilder", targets: ["generate-swiftsyntaxbuilder"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax.git", revision: "cdbdcbabb78d14e5e8d4915a115e3d843868ab8d"),
+    .package(url: "https://github.com/apple/swift-syntax.git", revision: "74b1286795d6a4e4f5a106638dc99eb482df609d"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.1.4")),
   ],
   targets: [

CodeGeneration/Sources/Utils/SyntaxBuildableChild.swift

@@ -80,7 +80,7 @@ public extension Child {
       }))
     }
     let disjunction = ExprList(assertChoices.flatMap { [$0, Expr(BinaryOperatorExpr(text: "||"))] }.dropLast())
-    return FunctionCallExpr(callee: "assert") {
+    return FunctionCallExpr(callee: Expr("assert")) {
       TupleExprElement(expression: SequenceExpr(elements: disjunction))
     }
   }

CodeGeneration/Sources/generate-swiftsyntaxbuilder/BuildableNodesFile.swift

@@ -153,7 +153,7 @@ private func createConvenienceInitializer(node: Node) -> InitializerDecl? {
       }
     )
   ) {
-    FunctionCallExpr(callee: "self.init") {
+    FunctionCallExpr(callee: Expr("self.init")) {
       TupleExprElement(label: "leadingTrivia", expression: "leadingTrivia")
       for arg in delegatedInitArgs {
         arg

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -60,10 +60,10 @@ open class BasicFormat: SyntaxRewriter {
     leadingTrivia = leadingTrivia.indented(indentation: indentation)
     trailingTrivia = trailingTrivia.indented(indentation: indentation)
     let rewritten = TokenSyntax(
-    node.tokenKind, 
-    leadingTrivia: leadingTrivia, 
-    trailingTrivia: trailingTrivia, 
-    presence: node.presence
+      node.tokenKind, 
+      leadingTrivia: leadingTrivia, 
+      trailingTrivia: trailingTrivia, 
+      presence: node.presence
     )
     lastRewrittenToken = rewritten
     putNextTokenOnNewLine = false

Sources/SwiftParser/generated/DeclarationModifier.swift

@@ -81,7 +81,7 @@ enum DeclarationModifier: SyntaxText, ContextualKeywords, RawTokenKindSubset {
 
   case _local = "_local"
 
-  init ?(lexeme: Lexer.Lexeme) {
+  init?(lexeme: Lexer.Lexeme) {
     switch lexeme.tokenKind {
     case .staticKeyword: 
       self = .staticKeyword
@@ -96,7 +96,7 @@ enum DeclarationModifier: SyntaxText, ContextualKeywords, RawTokenKindSubset {
     case .publicKeyword: 
       self = .publicKeyword
     case .identifier: 
-      self.init (rawValue: lexeme.tokenText)
+      self.init(rawValue: lexeme.tokenText)
     default: 
       return nil
     }

Sources/SwiftParser/generated/Parser+Entry.swift

@@ -20,8 +20,8 @@ extension Parser {
   /// Parse the source code in the given string as Swift source file. See
   /// `Parser.init` for more details.
   public static func parse(
-  source: String, 
-  parseTransition: IncrementalParseTransition? = nil
+    source: String, 
+    parseTransition: IncrementalParseTransition? = nil
   ) -> SourceFileSyntax {
     var parser = Parser(source)
     return SourceFileSyntax.parse(from: &parser)
@@ -30,9 +30,9 @@ extension Parser {
   /// Parse the source code in the given string as Swift source file. See
   /// `Parser.init` for more details.
   public static func parse(
-  source: UnsafeBufferPointer < UInt8 > , 
-  maximumNestingLevel: Int? = nil, 
-  parseTransition: IncrementalParseTransition? = nil
+    source: UnsafeBufferPointer < UInt8 > , 
+    maximumNestingLevel: Int? = nil, 
+    parseTransition: IncrementalParseTransition? = nil
   ) -> SourceFileSyntax {
     var parser = Parser(source, maximumNestingLevel: maximumNestingLevel)
     return SourceFileSyntax.parse(from: &parser)
@@ -137,6 +137,6 @@ fileprivate extension Parser {
 
     let unexpected = RawUnexpectedNodesSyntax(elements: remainingTokens, arena: self.arena)
     let withUnexpected = layout.replacingChild(at: layout.children.count - 1, with: unexpected.raw, arena: self.arena)
-    return R.init (withUnexpected)!
+    return R.init(withUnexpected)!
   }
 }