Update swift syntax

Author: kimdv

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: "4727d3c3f81be056cf7f9636d682ac9879270d12"),
+    .package(url: "https://github.com/apple/swift-syntax.git", revision: "94b9021a2e461fc9a4b3bda6f4734119b52e8094"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")),
   ],
   targets: [

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxValidationFile.swift

@@ -15,7 +15,7 @@ import SwiftSyntaxBuilder
 import SyntaxSupport
 import Utils
 
-let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCopyrightHeader(for: "generate-swiftsyntax"))" + .newline) {
+let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: generateCopyrightHeader(for: "generate-swiftsyntax")) {
   try FunctionDeclSyntax(
     """
     /// Check that the `layout` is valid for the given 'SyntaxKind'.
@@ -26,12 +26,12 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo
     """
   ) {
     IfConfigDeclSyntax(
-      clauses: IfConfigClauseListSyntax {
+      clauses: try IfConfigClauseListSyntax {
         IfConfigClauseSyntax(
           poundKeyword: .poundIfKeyword(),
           condition: ExprSyntax("DEBUG"),
           elements: .statements(
-            CodeBlockItemListSyntax {
+            try CodeBlockItemListSyntax {
               DeclSyntax(
                 #"""
                 enum ValidationError: CustomStringConvertible {
@@ -116,7 +116,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo
                 """#
               )
 
-              try! SwitchExprSyntax("switch kind") {
+              try SwitchExprSyntax("switch kind") {
                 SwitchCaseSyntax(
                   """
                   case .token:
@@ -125,7 +125,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo
                 )
 
                 for node in NON_BASE_SYNTAX_NODES {
-                  SwitchCaseSyntax("case .\(raw: node.swiftSyntaxKind):") {
+                  try SwitchCaseSyntax("case .\(raw: node.swiftSyntaxKind):") {
                     if node.isBuildable || node.isMissing {
                       ExprSyntax("assert(layout.count == \(raw: node.children.count))")
                       for (index, child) in node.children.enumerated() {
@@ -144,7 +144,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: "\(generateCo
                         }
                       }
                     } else if node.isSyntaxCollection {
-                      try! ForInStmtSyntax("for (index, element) in layout.enumerated()") {
+                      try ForInStmtSyntax("for (index, element) in layout.enumerated()") {
                         if let collectionElementChoices = node.collectionElementChoices, !collectionElementChoices.isEmpty {
                           let verifiedChoices = ArrayExprSyntax {
                             for choiceName in node.collectionElementChoices! {

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxBaseNodesFile.swift

@@ -142,7 +142,7 @@ let syntaxBaseNodesFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeade
             IfConfigClauseSyntax(
               poundKeyword: .poundIfKeyword(),
               condition: ExprSyntax("DEBUG"),
-              elements: IfConfigClauseSyntax.Elements.statements(
+              elements: .statements(
                 CodeBlockItemListSyntax {
                   try! SwitchExprSyntax("switch data.raw.kind") {
                     SwitchCaseSyntax(

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxRewriterFile.swift

@@ -162,7 +162,7 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader
       """
     )
 
-    IfConfigDeclSyntax(
+    try IfConfigDeclSyntax(
       leadingTrivia:
         """
         // SwiftSyntax requires a lot of stack space in debug builds for syntax tree
@@ -177,8 +177,8 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader
           poundKeyword: .poundIfKeyword(),
           condition: ExprSyntax("DEBUG"),
           elements: .statements(
-            CodeBlockItemListSyntax {
-              try! FunctionDeclSyntax(
+            try CodeBlockItemListSyntax {
+              try FunctionDeclSyntax(
                 """
                 /// Implementation detail of visit(_:). Do not call directly.
                 ///
@@ -225,7 +225,7 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader
           )
         )
         IfConfigClauseSyntax(
-          poundKeyword: .poundElseKeyword(leadingTrivia: .newline),
+          poundKeyword: .poundElseKeyword(),
           elements: .statements(
             CodeBlockItemListSyntax {
               try! FunctionDeclSyntax("private func visit(_ data: SyntaxData) -> Syntax") {
@@ -244,8 +244,7 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: generateCopyrightHeader
             }
           )
         )
-      },
-      poundEndif: .poundEndifKeyword(leadingTrivia: .newline)
+      }
     )
 
     DeclSyntax(

Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift

@@ -88,7 +88,8 @@ public struct DeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
       break
     default:
       fatalError("Unable to create DeclSyntax from \(data.raw.kind)")
-    }#endif 
+    }
+    #endif 
     self._syntaxNode = Syntax(data)
   }
 
@@ -236,7 +237,8 @@ public struct ExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
       break
     default:
       fatalError("Unable to create ExprSyntax from \(data.raw.kind)")
-    }#endif 
+    }
+    #endif 
     self._syntaxNode = Syntax(data)
   }
 
@@ -408,7 +410,8 @@ public struct PatternSyntax: PatternSyntaxProtocol, SyntaxHashable {
       break
     default:
       fatalError("Unable to create PatternSyntax from \(data.raw.kind)")
-    }#endif 
+    }
+    #endif 
     self._syntaxNode = Syntax(data)
   }
 
@@ -539,7 +542,8 @@ public struct StmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
       break
     default:
       fatalError("Unable to create StmtSyntax from \(data.raw.kind)")
-    }#endif 
+    }
+    #endif 
     self._syntaxNode = Syntax(data)
   }
 
@@ -679,7 +683,8 @@ public struct TypeSyntax: TypeSyntaxProtocol, SyntaxHashable {
       break
     default:
       fatalError("Unable to create TypeSyntax from \(data.raw.kind)")
-    }#endif 
+    }
+    #endif 
     self._syntaxNode = Syntax(data)
   }
 

Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift

@@ -12,7 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 /// Check that the `layout` is valid for the given 'SyntaxKind'.
 ///
 /// Note that this only validates the immediate children.
@@ -2362,5 +2361,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
     assertAnyHasNoError(kind, 3, [
         verify(layout[3], as: RawSyntax.self)])
     assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
-  }#endif 
+  }
+  #endif 
 }