Merge pull request #1547 from kimdv/kimdv/bump-syntax-in-code-gen

ahoppen · web-flow · commit 560df352d048 · 2023-04-19T08:50:55.000-07:00
Update swift syntax in code gen
diff --git a/CodeGeneration/Package.swift b/CodeGeneration/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
     .executable(name: "generate-swiftsyntax", targets: ["generate-swiftsyntax"])
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax.git", revision: "39b3336c3f3bfcd4ddbcbf6a111d8814ffe542f3"),
+    .package(url: "https://github.com/apple/swift-syntax.git", revision: "94120e0cf9bf541e54fbc8512934daea23a9ad0c"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")),
   ],
   targets: [
diff --git a/CodeGeneration/Sources/Utils/CodeGenerationFormat.swift b/CodeGeneration/Sources/Utils/CodeGenerationFormat.swift
@@ -66,7 +66,7 @@ public class CodeGenerationFormat: BasicFormat {
 
   public override func visit(_ node: MemberDeclListItemSyntax) -> MemberDeclListItemSyntax {
     let formatted = super.visit(node)
-    if node.indexInParent != 0 && !node.decl.is(EnumCaseDeclSyntax.self) {
+    if node != node.parent?.children(viewMode: .sourceAccurate).first?.as(MemberDeclListItemSyntax.self) && !node.decl.is(EnumCaseDeclSyntax.self) {
       return ensuringTwoLeadingNewlines(node: formatted)
     } else {
       return formatted
@@ -92,10 +92,10 @@ public class CodeGenerationFormat: BasicFormat {
   }
 
   private func ensuringTwoLeadingNewlines<NodeType: SyntaxProtocol>(node: NodeType) -> NodeType {
-    if node.leadingTrivia?.first?.isNewline ?? false {
-      return node.with(\.leadingTrivia, indentedNewline + (node.leadingTrivia ?? []))
+    if node.leadingTrivia.first?.isNewline ?? false {
+      return node.with(\.leadingTrivia, indentedNewline + node.leadingTrivia)
     } else {
-      return node.with(\.leadingTrivia, indentedNewline + indentedNewline + (node.leadingTrivia ?? []))
+      return node.with(\.leadingTrivia, indentedNewline + indentedNewline + node.leadingTrivia)
     }
   }
 
@@ -105,10 +105,10 @@ public class CodeGenerationFormat: BasicFormat {
       self.visit($0).as(SyntaxType.self)!
     }
     formattedChildren = formattedChildren.map {
-      if $0.leadingTrivia?.first?.isNewline == true {
+      if $0.leadingTrivia.first?.isNewline == true {
         return $0
       } else {
-        return $0.with(\.leadingTrivia, indentedNewline + ($0.leadingTrivia ?? []))
+        return $0.with(\.leadingTrivia, indentedNewline + $0.leadingTrivia)
       }
     }
     indentationLevel -= 1
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift
@@ -193,15 +193,15 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
         let params = FunctionParameterListSyntax {
           for child in node.children {
             FunctionParameterSyntax(
-              firstName: child.isUnexpectedNodes ? .wildcardToken(trailingTrivia: .space) : nil,
-              secondName: .identifier(child.swiftName),
+              firstName: child.isUnexpectedNodes ? .wildcardToken(trailingTrivia: .space) : .identifier(child.swiftName),
+              secondName: child.isUnexpectedNodes ? .identifier(child.swiftName) : nil,
               colon: .colonToken(),
               type: child.rawParameterType,
               defaultArgument: child.isUnexpectedNodes ? child.defaultInitialization : nil
             )
           }
 
-          FunctionParameterSyntax("arena: __shared SyntaxArena", for: .functionParameters)
+          FunctionParameterSyntax("arena: __shared SyntaxArena")
         }
         try InitializerDeclSyntax("public init(\(params))") {
           if !node.children.isEmpty {
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodeFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodeFile.swift
@@ -66,18 +66,20 @@ func syntaxNode(emitKind: String) -> SourceFileSyntax {
         )
 
         try! InitializerDeclSyntax("\(node.generateInitializerDeclHeader(optionalBaseAsMissing: false))") {
-          let parameters = FunctionParameterListSyntax {
+          let parameters = ClosureParameterListSyntax {
             for child in node.children {
-              FunctionParameterSyntax(firstName: "\(raw: child.swiftName)")
+              ClosureParameterSyntax(firstName: .identifier(child.swiftName))
             }
           }
 
           let closureSignature = ClosureSignatureSyntax(
             input: .input(
-              ParameterClauseSyntax {
-                FunctionParameterSyntax(firstName: .identifier("arena"))
-                FunctionParameterSyntax(firstName: .wildcardToken())
-              }
+              ClosureParameterClauseSyntax(
+                parameterList: ClosureParameterListSyntax {
+                  ClosureParameterSyntax(firstName: .identifier("arena"))
+                  ClosureParameterSyntax(firstName: .wildcardToken())
+                }
+              )
             )
           )
           let layoutList = ArrayExprSyntax {
@@ -384,13 +386,13 @@ fileprivate extension Node {
     }
 
     let params = FunctionParameterListSyntax {
-      FunctionParameterSyntax("leadingTrivia: Trivia? = nil", for: .functionParameters)
+      FunctionParameterSyntax("leadingTrivia: Trivia? = nil")
 
       for child in children {
         createFunctionParameterSyntax(for: child)
       }
 
-      FunctionParameterSyntax("trailingTrivia: Trivia? = nil", for: .functionParameters)
+      FunctionParameterSyntax("trailingTrivia: Trivia? = nil")
         .with(\.leadingTrivia, .newline)
     }
 
diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/BuildableNodesFile.swift b/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/BuildableNodesFile.swift
@@ -71,10 +71,7 @@ private func createConvenienceInitializer(node: Node) throws -> InitializerDeclS
         produceExpr = ExprSyntax("\(raw: child.swiftName)Builder()")
       }
       builderParameters.append(
-        FunctionParameterSyntax(
-          "@\(raw: builderInitializableType.resultBuilderBaseName) \(raw: child.swiftName)Builder: () throws-> \(raw: builderInitializableType.syntax)",
-          for: .functionParameters
-        )
+        FunctionParameterSyntax("@\(raw: builderInitializableType.resultBuilderBaseName) \(raw: child.swiftName)Builder: () throws-> \(raw: builderInitializableType.syntax)")
       )
     } else {
       produceExpr = convertFromSyntaxProtocolToSyntaxType(child: child)
@@ -95,11 +92,11 @@ private func createConvenienceInitializer(node: Node) throws -> InitializerDeclS
   }
 
   let params = ParameterClauseSyntax {
-    FunctionParameterSyntax("leadingTrivia: Trivia? = nil", for: .functionParameters)
+    FunctionParameterSyntax("leadingTrivia: Trivia? = nil")
     for param in normalParameters + builderParameters {
       param
     }
-    FunctionParameterSyntax("trailingTrivia: Trivia? = nil", for: .functionParameters)
+    FunctionParameterSyntax("trailingTrivia: Trivia? = nil")
   }
 
   return try InitializerDeclSyntax(
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift
@@ -34,19 +34,8 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
   }
   enum ValidationError: CustomStringConvertible {
     case expectedNonNil(expectedKind: RawSyntaxNodeProtocol.Type, file: StaticString, line: UInt)
-    case kindMismatch(
-        expectedKind: RawSyntaxNodeProtocol.Type, 
-        actualKind: SyntaxKind, 
-        file: StaticString, 
-        line: UInt
-      )
-    case tokenMismatch(
-        expectedTokenChoices: [TokenChoice], 
-        actualKind: RawTokenKind, 
-        actualText: SyntaxText, 
-        file: StaticString, 
-        line: UInt
-      )
+    case kindMismatch(expectedKind: RawSyntaxNodeProtocol.Type, actualKind: SyntaxKind, file: StaticString, line: UInt)
+    case tokenMismatch(expectedTokenChoices: [TokenChoice], actualKind: RawTokenKind, actualText: SyntaxText, file: StaticString, line: UInt)
     
 
     var description: String {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public class CodeGenerationFormat: BasicFormat {`
`66`	`66`
`67`	`67`	`public override func visit(_ node: MemberDeclListItemSyntax) -> MemberDeclListItemSyntax {`
`68`	`68`	`let formatted = super.visit(node)`
`69`		`- if node.indexInParent != 0 && !node.decl.is(EnumCaseDeclSyntax.self) {`
	`69`	`+ if node != node.parent?.children(viewMode: .sourceAccurate).first?.as(MemberDeclListItemSyntax.self) && !node.decl.is(EnumCaseDeclSyntax.self) {`
`70`	`70`	`return ensuringTwoLeadingNewlines(node: formatted)`
`71`	`71`	`} else {`
`72`	`72`	`return formatted`
`@@ -92,10 +92,10 @@ public class CodeGenerationFormat: BasicFormat {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`private func ensuringTwoLeadingNewlines<NodeType: SyntaxProtocol>(node: NodeType) -> NodeType {`
`95`		`- if node.leadingTrivia?.first?.isNewline ?? false {`
`96`		`- return node.with(\.leadingTrivia, indentedNewline + (node.leadingTrivia ?? []))`
	`95`	`+ if node.leadingTrivia.first?.isNewline ?? false {`
	`96`	`+ return node.with(\.leadingTrivia, indentedNewline + node.leadingTrivia)`
`97`	`97`	`} else {`
`98`		`- return node.with(\.leadingTrivia, indentedNewline + indentedNewline + (node.leadingTrivia ?? []))`
	`98`	`+ return node.with(\.leadingTrivia, indentedNewline + indentedNewline + node.leadingTrivia)`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`@@ -105,10 +105,10 @@ public class CodeGenerationFormat: BasicFormat {`
`105`	`105`	`self.visit($0).as(SyntaxType.self)!`
`106`	`106`	`}`
`107`	`107`	`formattedChildren = formattedChildren.map {`
`108`		`- if $0.leadingTrivia?.first?.isNewline == true {`
	`108`	`+ if $0.leadingTrivia.first?.isNewline == true {`
`109`	`109`	`return $0`
`110`	`110`	`} else {`
`111`		`- return $0.with(\.leadingTrivia, indentedNewline + ($0.leadingTrivia ?? []))`
	`111`	`+ return $0.with(\.leadingTrivia, indentedNewline + $0.leadingTrivia)`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`indentationLevel -= 1`
Original file line number	Diff line number	Diff line change
`@@ -193,15 +193,15 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {`
`193`	`193`	`let params = FunctionParameterListSyntax {`
`194`	`194`	`for child in node.children {`
`195`	`195`	`FunctionParameterSyntax(`
`196`		`- firstName: child.isUnexpectedNodes ? .wildcardToken(trailingTrivia: .space) : nil,`
`197`		`- secondName: .identifier(child.swiftName),`
	`196`	`+ firstName: child.isUnexpectedNodes ? .wildcardToken(trailingTrivia: .space) : .identifier(child.swiftName),`
	`197`	`+ secondName: child.isUnexpectedNodes ? .identifier(child.swiftName) : nil,`
`198`	`198`	`colon: .colonToken(),`
`199`	`199`	`type: child.rawParameterType,`
`200`	`200`	`defaultArgument: child.isUnexpectedNodes ? child.defaultInitialization : nil`
`201`	`201`	`)`
`202`	`202`	`}`
`203`	`203`
`204`		`- FunctionParameterSyntax("arena: __shared SyntaxArena", for: .functionParameters)`
	`204`	`+ FunctionParameterSyntax("arena: __shared SyntaxArena")`
`205`	`205`	`}`
`206`	`206`	`try InitializerDeclSyntax("public init(\(params))") {`
`207`	`207`	`if !node.children.isEmpty {`
Original file line number	Diff line number	Diff line change
`@@ -66,18 +66,20 @@ func syntaxNode(emitKind: String) -> SourceFileSyntax {`
`66`	`66`	`)`
`67`	`67`
`68`	`68`	`try! InitializerDeclSyntax("\(node.generateInitializerDeclHeader(optionalBaseAsMissing: false))") {`
`69`		`- let parameters = FunctionParameterListSyntax {`
	`69`	`+ let parameters = ClosureParameterListSyntax {`
`70`	`70`	`for child in node.children {`
`71`		`- FunctionParameterSyntax(firstName: "\(raw: child.swiftName)")`
	`71`	`+ ClosureParameterSyntax(firstName: .identifier(child.swiftName))`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`let closureSignature = ClosureSignatureSyntax(`
`76`	`76`	`input: .input(`
`77`		`- ParameterClauseSyntax {`
`78`		`- FunctionParameterSyntax(firstName: .identifier("arena"))`
`79`		`- FunctionParameterSyntax(firstName: .wildcardToken())`
`80`		`- }`
	`77`	`+ ClosureParameterClauseSyntax(`
	`78`	`+ parameterList: ClosureParameterListSyntax {`
	`79`	`+ ClosureParameterSyntax(firstName: .identifier("arena"))`
	`80`	`+ ClosureParameterSyntax(firstName: .wildcardToken())`
	`81`	`+ }`
	`82`	`+ )`
`81`	`83`	`)`
`82`	`84`	`)`
`83`	`85`	`let layoutList = ArrayExprSyntax {`
`@@ -384,13 +386,13 @@ fileprivate extension Node {`
`384`	`386`	`}`
`385`	`387`
`386`	`388`	`let params = FunctionParameterListSyntax {`
`387`		`- FunctionParameterSyntax("leadingTrivia: Trivia? = nil", for: .functionParameters)`
	`389`	`+ FunctionParameterSyntax("leadingTrivia: Trivia? = nil")`
`388`	`390`
`389`	`391`	`for child in children {`
`390`	`392`	`createFunctionParameterSyntax(for: child)`
`391`	`393`	`}`
`392`	`394`
`393`		`- FunctionParameterSyntax("trailingTrivia: Trivia? = nil", for: .functionParameters)`
	`395`	`+ FunctionParameterSyntax("trailingTrivia: Trivia? = nil")`
`394`	`396`	`.with(\.leadingTrivia, .newline)`
`395`	`397`	`}`
`396`	`398`
Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,7 @@ private func createConvenienceInitializer(node: Node) throws -> InitializerDeclS`
`71`	`71`	`produceExpr = ExprSyntax("\(raw: child.swiftName)Builder()")`
`72`	`72`	`}`
`73`	`73`	`builderParameters.append(`
`74`		`- FunctionParameterSyntax(`
`75`		`- "@\(raw: builderInitializableType.resultBuilderBaseName) \(raw: child.swiftName)Builder: () throws-> \(raw: builderInitializableType.syntax)",`
`76`		`- for: .functionParameters`
`77`		`- )`
	`74`	`+ FunctionParameterSyntax("@\(raw: builderInitializableType.resultBuilderBaseName) \(raw: child.swiftName)Builder: () throws-> \(raw: builderInitializableType.syntax)")`
`78`	`75`	`)`
`79`	`76`	`} else {`
`80`	`77`	`produceExpr = convertFromSyntaxProtocolToSyntaxType(child: child)`
`@@ -95,11 +92,11 @@ private func createConvenienceInitializer(node: Node) throws -> InitializerDeclS`
`95`	`92`	`}`
`96`	`93`
`97`	`94`	`let params = ParameterClauseSyntax {`
`98`		`- FunctionParameterSyntax("leadingTrivia: Trivia? = nil", for: .functionParameters)`
	`95`	`+ FunctionParameterSyntax("leadingTrivia: Trivia? = nil")`
`99`	`96`	`for param in normalParameters + builderParameters {`
`100`	`97`	`param`
`101`	`98`	`}`
`102`		`- FunctionParameterSyntax("trailingTrivia: Trivia? = nil", for: .functionParameters)`
	`99`	`+ FunctionParameterSyntax("trailingTrivia: Trivia? = nil")`
`103`	`100`	`}`
`104`	`101`
`105`	`102`	`return try InitializerDeclSyntax(`