Merge pull request #516 from ahoppen/pr/await-contextual-keyword

'await' is now a contextual keyword

Author: ahoppen

Sources/SwiftSyntax/gyb_generated/SyntaxBuilders.swift

@@ -274,7 +274,7 @@ public struct AwaitExprSyntaxBuilder {
 
   internal mutating func buildData() -> SyntaxData {
     if (layout[0] == nil) {
-      layout[0] = RawSyntax.missingToken(TokenKind.identifier(""))
+      layout[0] = RawSyntax.missingToken(TokenKind.contextualKeyword(""))
     }
     if (layout[1] == nil) {
       layout[1] = RawSyntax.missing(SyntaxKind.expr)

Sources/SwiftSyntax/gyb_generated/SyntaxClassification.swift

@@ -65,8 +65,6 @@ extension SyntaxClassification {
     // Separate checks for token nodes (most common checks) versus checks for layout nodes.
     if childKind == .token {
       switch (parentKind, indexInParent) {
-      case (.awaitExpr, 0):
-        return (.keyword, false)
       case (.expressionSegment, 2):
         return (.stringInterpolationAnchor, true)
       case (.ifConfigClause, 0):

Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift

@@ -264,7 +264,7 @@ public enum SyntaxFactory {
   public static func makeBlankAwaitExpr(presence: SourcePresence = .present) -> AwaitExprSyntax {
     let data = SyntaxData.forRoot(RawSyntax.create(kind: .awaitExpr,
       layout: [
-      RawSyntax.missingToken(TokenKind.identifier("")),
+      RawSyntax.missingToken(TokenKind.contextualKeyword("")),
       RawSyntax.missing(SyntaxKind.expr),
     ], length: .zero, presence: presence))
     return AwaitExprSyntax(data)

Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxExprNodes.swift

@@ -412,7 +412,7 @@ public struct AwaitExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   ///                   current `awaitKeyword`, if present.
   public func withAwaitKeyword(
     _ newChild: TokenSyntax?) -> AwaitExprSyntax {
-    let raw = newChild?.raw ?? RawSyntax.missingToken(TokenKind.identifier(""))
+    let raw = newChild?.raw ?? RawSyntax.missingToken(TokenKind.contextualKeyword(""))
     let newData = data.replacingChild(raw, at: Cursor.awaitKeyword)
     return AwaitExprSyntax(newData)
   }

Sources/SwiftSyntaxBuilder/gyb_generated/BuildableNodes.swift

@@ -374,7 +374,7 @@ public struct AwaitExpr: ExprBuildable, ExpressibleAsAwaitExpr {
   ) {
     self.init(
       leadingTrivia: leadingTrivia,
-      awaitKeyword: TokenSyntax.identifier(awaitKeyword),
+      awaitKeyword: TokenSyntax.contextualKeyword(awaitKeyword),
       expression: expression
     )
   }

Sources/SwiftSyntaxBuilderGeneration/gyb_generated/ExprNodes.swift

@@ -67,11 +67,10 @@ let EXPR_NODES: [Node] = [
        kind: "Expr",
        children: [
          Child(name: "AwaitKeyword",
-               kind: "IdentifierToken",
+               kind: "ContextualKeywordToken",
                textChoices: [
                  "await"
-               ],
-               classification: "Keyword"),
+               ]),
          Child(name: "Expression",
                kind: "Expr")
        ]),

Sources/SwiftSyntaxParser/gyb_generated/NodeDeclarationHash.swift

@@ -17,6 +17,6 @@
 extension SyntaxParser {
   static func verifyNodeDeclarationHash() -> Bool {
     return String(cString: swiftparse_syntax_structure_versioning_identifier()!) ==
-      "84c73f1874fbfa0bb483a06a809dca361bb63285"
+      "99675ccdcfa965dd6fabc8af900e7545bce5df5d"
   }
 }