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: "d856f486d15a61625e90c1740729b3fb5244fad1"),
+    .package(url: "https://github.com/apple/swift-syntax.git", revision: "8e6ae6eef6259c1f50692b509f776e66564ae189"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.1.4")),
   ],
   targets: [

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

@@ -87,17 +87,21 @@ let syntaxBaseNodesFile = SourceFile(leadingTrivia: [.blockComment(generateCopyr
         }
         """)
 
-      InitializerDecl("public init?<S: SyntaxProtocol>(_ node: S)") {
-        SwitchStmt(expression: MemberAccessExpr("node.raw.kind")) {
-          SwitchCaseList {
-            SwitchCase(
+      InitializerDeclSyntax("public init?<S: SyntaxProtocol>(_ node: S)") {
+        SwitchStmt(expression: MemberAccessExprSyntax("node.raw.kind")) {
+          SwitchCaseListSyntax {
+            SwitchCaseSyntax(
               label: .case(SwitchCaseLabel {
                 for childNode in SYNTAX_NODES where childNode.baseKind == node.syntaxKind {
-                  CaseItem(
-                    pattern: EnumCasePattern(
-                      period: .period,
-                      caseName: .identifier(childNode.swiftSyntaxKind))
-                  )
+                    CaseItemSyntax(
+                        pattern: ExpressionPatternSyntax(
+                            expression: MemberAccessExprSyntax(
+                                base: nil,
+                                dot: .periodToken(),
+                                name: .identifier(childNode.swiftSyntaxKind)
+                            )
+                        )
+                    )
                 }
               })) {
                 Expr("self._syntaxNode = node._syntaxNode")
@@ -127,11 +131,15 @@ let syntaxBaseNodesFile = SourceFile(leadingTrivia: [.blockComment(generateCopyr
                     SwitchCase(
                       label: .case(SwitchCaseLabel {
                         for childNode in SYNTAX_NODES where childNode.baseKind == node.syntaxKind {
-                          CaseItem(
-                            pattern: EnumCasePatternSyntax(
-                              period: .period,
-                              caseName: .identifier(childNode.swiftSyntaxKind))
-                          )
+                            CaseItemSyntax(
+                                pattern: ExpressionPatternSyntax(
+                                    expression: MemberAccessExprSyntax(
+                                        base: nil,
+                                        dot: .periodToken(),
+                                        name: .identifier(childNode.swiftSyntaxKind)
+                                    )
+                                )
+                            )
                         }
                       })) {
                         BreakStmt()

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -26,7 +26,7 @@ open class BasicFormat: SyntaxRewriter {
     Trivia(pieces: [.newlines(1), indentation]) 
   }
 
-  private var lastRewrittenToken: TokenSyntax?
+  private var lastRewrittenToken: TokenSyntax? 
 
   private var putNextTokenOnNewLine: Bool = false
 
@@ -48,13 +48,13 @@ open class BasicFormat: SyntaxRewriter {
   open override func visit(_ node: TokenSyntax) -> TokenSyntax {
     var leadingTrivia = node.leadingTrivia
     var trailingTrivia = node.trailingTrivia
-    if requiresLeadingSpace(node) && leadingTrivia.isEmpty && lastRewrittenToken?.trailingTrivia.isEmpty != false {
+    if requiresLeadingSpace(node) && leadingTrivia.isEmpty && lastRewrittenToken? .trailingTrivia.isEmpty != false {
       leadingTrivia += .space
     }
     if requiresTrailingSpace(node) && trailingTrivia.isEmpty {
       trailingTrivia += .space
     }
-    if let keyPath = getKeyPath(Syntax(node)), requiresLeadingNewline(keyPath), !(leadingTrivia.first?.isNewline ?? false) {
+    if let keyPath = getKeyPath(Syntax(node)), requiresLeadingNewline(keyPath), !(leadingTrivia.first? .isNewline ?? false) {
       leadingTrivia = .newline + leadingTrivia
     }
     leadingTrivia = leadingTrivia.indented(indentation: indentation)
@@ -136,7 +136,7 @@ open class BasicFormat: SyntaxRewriter {
   }
 
   open func requiresLeadingSpace(_ token: TokenSyntax) -> Bool {
-    switch (token.previousToken(viewMode: .sourceAccurate)?.tokenKind, token.tokenKind) {
+    switch (token.previousToken(viewMode: .sourceAccurate)? .tokenKind, token.tokenKind) {
     case (.leftParen, .spacedBinaryOperator): 
       return false
     default: 
@@ -164,10 +164,10 @@ open class BasicFormat: SyntaxRewriter {
 
   open func requiresTrailingSpace(_ token: TokenSyntax) -> Bool {
     // Format `[:]` as-is.
-    if token.tokenKind == .colon && token.parent?.kind == .dictionaryExpr {
+    if token.tokenKind == .colon && token.parent? .kind == .dictionaryExpr {
       return false
     }
-    switch (token.tokenKind, token.nextToken(viewMode: .sourceAccurate)?.tokenKind) {
+    switch (token.tokenKind, token.nextToken(viewMode: .sourceAccurate)? .tokenKind) {
     case (.asKeyword, .exclamationMark), // Ensures there is not space in `as!`
      (.asKeyword, .postfixQuestionMark), // Ensures there is not space in `as?`
      (.exclamationMark, .leftParen), // Ensures there is not space in `myOptionalClosure!()`

Sources/SwiftParser/generated/Parser+Entry.swift

@@ -30,7 +30,7 @@ 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 > , 
+    source: UnsafeBufferPointer<UInt8>, 
     maximumNestingLevel: Int? = nil, 
     parseTransition: IncrementalParseTransition? = nil
   ) -> SourceFileSyntax {
@@ -132,7 +132,7 @@ extension TypeSyntax: SyntaxParseable {
 }
 
 fileprivate extension Parser {
-  mutating func parseRemainder < R: RawSyntaxNodeProtocol > (into: R) -> R {
+  mutating func parseRemainder<R: RawSyntaxNodeProtocol>(into: R) -> R {
     guard !into.raw.kind.isSyntaxCollection, let layout = into.raw.layoutView else {
       assertionFailure("Only support parsing of non-collection layout nodes")
       return into
@@ -145,6 +145,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)! 
   }
 }