Remove TokenList option from CodeBlockItem

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/gyb_generated/CommonNodes.swift

@@ -89,9 +89,7 @@ public let COMMON_NODES: [Node] = [
                  Child(name: "Stmt",
                        kind: "Stmt"),
                  Child(name: "Expr",
-                       kind: "Expr"),
-                 Child(name: "TokenList",
-                       kind: "TokenList")
+                       kind: "Expr")
                ]),
          Child(name: "Semicolon",
                kind: "SemicolonToken",

Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxNodes.swift

@@ -406,18 +406,16 @@ public struct RawCodeBlockItemSyntax: RawSyntaxNodeProtocol {
     case `decl`(RawDeclSyntax)
     case `stmt`(RawStmtSyntax)
     case `expr`(RawExprSyntax)
-    case `tokenList`(RawTokenListSyntax)
 
     public static func isKindOf(_ raw: RawSyntax) -> Bool {
-      return RawDeclSyntax.isKindOf(raw) || RawStmtSyntax.isKindOf(raw) || RawExprSyntax.isKindOf(raw) || RawTokenListSyntax.isKindOf(raw)
+      return RawDeclSyntax.isKindOf(raw) || RawStmtSyntax.isKindOf(raw) || RawExprSyntax.isKindOf(raw)
     }
 
     public var raw: RawSyntax {
       switch self {
       case .decl(let node): return node.raw
       case .stmt(let node): return node.raw
       case .expr(let node): return node.raw
-      case .tokenList(let node): return node.raw
       }
     }
 
@@ -434,10 +432,6 @@ public struct RawCodeBlockItemSyntax: RawSyntaxNodeProtocol {
         self = .expr(node)
         return
       }
-      if let node = RawTokenListSyntax(other) {
-        self = .tokenList(node)
-        return
-      }
       return nil
     }
   }

Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxValidation.swift

@@ -117,7 +117,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
       verify(layout[1], as: RawSyntax.self),
       verify(layout[1], as: RawSyntax.self),
       verify(layout[1], as: RawSyntax.self),
-      verify(layout[1], as: RawSyntax.self),
     ])
     assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
     assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self))

Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxNodes.swift

@@ -72,13 +72,11 @@ public struct CodeBlockItemSyntax: SyntaxProtocol, SyntaxHashable {
     case `decl`(DeclSyntax)
     case `stmt`(StmtSyntax)
     case `expr`(ExprSyntax)
-    case `tokenList`(TokenListSyntax)
     public var _syntaxNode: Syntax {
       switch self {
       case .decl(let node): return node._syntaxNode
       case .stmt(let node): return node._syntaxNode
       case .expr(let node): return node._syntaxNode
-      case .tokenList(let node): return node._syntaxNode
       }
     }
     init(_ data: SyntaxData) { self.init(Syntax(data))! }
@@ -91,9 +89,6 @@ public struct CodeBlockItemSyntax: SyntaxProtocol, SyntaxHashable {
     public init<Node: ExprSyntaxProtocol>(_ node: Node) {
       self = .expr(ExprSyntax(node))
     }
-    public init(_ node: TokenListSyntax) {
-      self = .tokenList(node)
-    }
     public init?<S: SyntaxProtocol>(_ node: S) {
       if let node = node.as(DeclSyntax.self) {
         self = .decl(node)
@@ -107,10 +102,6 @@ public struct CodeBlockItemSyntax: SyntaxProtocol, SyntaxHashable {
         self = .expr(node)
         return
       }
-      if let node = node.as(TokenListSyntax.self) {
-        self = .tokenList(node)
-        return
-      }
       return nil
     }
 
@@ -119,7 +110,6 @@ public struct CodeBlockItemSyntax: SyntaxProtocol, SyntaxHashable {
         .node(DeclSyntax.self),
         .node(StmtSyntax.self),
         .node(ExprSyntax.self),
-        .node(TokenListSyntax.self),
       ])
     }
   }

gyb_syntax_support/CommonNodes.py

@@ -40,7 +40,6 @@
                        Child('Decl', kind='Decl'),
                        Child('Stmt', kind='Stmt'),
                        Child('Expr', kind='Expr'),
-                       Child('TokenList', kind='TokenList'),
                    ]),
              Child('Semicolon', kind='SemicolonToken',
                    description="""