Remove TokenList option from CodeBlockItem

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/gyb_generated/AttributeNodes.swift

@@ -18,12 +18,6 @@ public let ATTRIBUTE_NODES: [Node] = [
        kind: "SyntaxCollection",
        element: "Token"),
 
-  Node(name: "NonEmptyTokenList",
-       nameForDiagnostics: "token list",
-       kind: "SyntaxCollection",
-       element: "Token",
-       omitWhenEmpty: true),
-
   Node(name: "Attribute",
        nameForDiagnostics: "attribute",
        description: "An `@` attribute.",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/CommonNodes.swift

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

Sources/SwiftSyntax/Documentation.docc/gyb_generated/SwiftSyntax.md

@@ -337,7 +337,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/PrecedenceGroupAssignmentSyntax>
 - <doc:SwiftSyntax/PrecedenceGroupAssociativitySyntax>
 - <doc:SwiftSyntax/TokenListSyntax>
-- <doc:SwiftSyntax/NonEmptyTokenListSyntax>
 - <doc:SwiftSyntax/AttributeSyntax>
 - <doc:SwiftSyntax/AttributeListSyntax>
 - <doc:SwiftSyntax/SpecializeAttributeSpecListSyntax>

Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxNodes.swift

@@ -406,20 +406,16 @@ public struct RawCodeBlockItemSyntax: RawSyntaxNodeProtocol {
     case `decl`(RawDeclSyntax)
     case `stmt`(RawStmtSyntax)
     case `expr`(RawExprSyntax)
-    case `tokenList`(RawTokenListSyntax)
-    case `nonEmptyTokenList`(RawNonEmptyTokenListSyntax)
 
     public static func isKindOf(_ raw: RawSyntax) -> Bool {
-      return RawDeclSyntax.isKindOf(raw) || RawStmtSyntax.isKindOf(raw) || RawExprSyntax.isKindOf(raw) || RawTokenListSyntax.isKindOf(raw) || RawNonEmptyTokenListSyntax.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
-      case .nonEmptyTokenList(let node): return node.raw
       }
     }
 
@@ -436,14 +432,6 @@ public struct RawCodeBlockItemSyntax: RawSyntaxNodeProtocol {
         self = .expr(node)
         return
       }
-      if let node = RawTokenListSyntax(other) {
-        self = .tokenList(node)
-        return
-      }
-      if let node = RawNonEmptyTokenListSyntax(other) {
-        self = .nonEmptyTokenList(node)
-        return
-      }
       return nil
     }
   }
@@ -10397,46 +10385,6 @@ public struct RawTokenListSyntax: RawSyntaxNodeProtocol {
   }
 }
 
-@_spi(RawSyntax)
-public struct RawNonEmptyTokenListSyntax: RawSyntaxNodeProtocol {
-
-  @_spi(RawSyntax)
-  public var layoutView: RawSyntaxLayoutView {
-    return raw.layoutView!
-  }
-
-  public static func isKindOf(_ raw: RawSyntax) -> Bool {
-    return raw.kind == .nonEmptyTokenList
-  }
-
-  public var raw: RawSyntax
-  init(raw: RawSyntax) {
-    assert(Self.isKindOf(raw))
-    self.raw = raw
-  }
-
-  public init?<Node: RawSyntaxNodeProtocol>(_ other: Node) {
-    guard Self.isKindOf(other.raw) else { return nil }
-    self.init(raw: other.raw)
-  }
-
-  public init(elements: [RawTokenSyntax], arena: __shared SyntaxArena) {
-    let raw = RawSyntax.makeLayout(
-      kind: .nonEmptyTokenList, uninitializedCount: elements.count, arena: arena) { layout in
-      guard var ptr = layout.baseAddress else { return }
-      for elem in elements {
-        ptr.initialize(to: elem.raw)
-        ptr += 1
-      }
-    }
-    self.init(raw: raw)
-  }
-
-  public var elements: [RawTokenSyntax] {
-    layoutView.children.map { RawTokenSyntax(raw: $0!) }
-  }
-}
-
 @_spi(RawSyntax)
 public struct RawAttributeSyntax: RawSyntaxNodeProtocol {
   @frozen // FIXME: Not actually stable, works around a miscompile

Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxValidation.swift

@@ -117,8 +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),
-      verify(layout[1], as: RawSyntax.self),
     ])
     assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
     assertNoError(kind, 3, verify(layout[3], as: RawTokenSyntax?.self))
@@ -1542,11 +1540,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
       assertNoError(kind, index, verify(element, as: RawTokenSyntax.self))
     }
     break
-  case .nonEmptyTokenList:
-    for (index, element) in layout.enumerated() {
-      assertNoError(kind, index, verify(element, as: RawTokenSyntax.self))
-    }
-    break
   case .attribute:
     assert(layout.count == 11)
     assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))

Sources/SwiftSyntax/generated/Misc.swift

@@ -187,7 +187,6 @@ extension Syntax {
       .node(MultipleTrailingClosureElementSyntax.self), 
       .node(NamedOpaqueReturnTypeSyntax.self), 
       .node(NilLiteralExprSyntax.self), 
-      .node(NonEmptyTokenListSyntax.self), 
       .node(ObjCSelectorPieceSyntax.self), 
       .node(ObjCSelectorSyntax.self), 
       .node(OpaqueReturnTypeOfAttributeArgumentsSyntax.self), 
@@ -629,8 +628,6 @@ extension SyntaxKind {
       return NamedOpaqueReturnTypeSyntax.self
     case .nilLiteralExpr: 
       return NilLiteralExprSyntax.self
-    case .nonEmptyTokenList: 
-      return NonEmptyTokenListSyntax.self
     case .objCSelectorPiece: 
       return ObjCSelectorPieceSyntax.self
     case .objCSelector: 
@@ -1168,8 +1165,6 @@ extension SyntaxKind {
       return "named opaque return type"
     case .nilLiteralExpr: 
       return nil
-    case .nonEmptyTokenList: 
-      return "token list"
     case .objCSelectorPiece: 
       return "Objective-C selector piece"
     case .objCSelector: 

Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift

@@ -1401,14 +1401,6 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
     visitAnyPost(node._syntaxNode)
   }
 
-  override open func visit(_ node: NonEmptyTokenListSyntax) -> SyntaxVisitorContinueKind {
-    return visitAny(node._syntaxNode)
-  }
-  
-  override open func visitPost(_ node: NonEmptyTokenListSyntax) {
-    visitAnyPost(node._syntaxNode)
-  }
-  
   override open func visit(_ node: ObjCSelectorPieceSyntax) -> SyntaxVisitorContinueKind {
     return visitAny(node._syntaxNode)
   }

Sources/SwiftSyntax/generated/SyntaxEnum.swift

@@ -354,8 +354,6 @@ public enum SyntaxEnum {
 
   case nilLiteralExpr(NilLiteralExprSyntax)
 
-  case nonEmptyTokenList(NonEmptyTokenListSyntax)
-  
   case objCSelectorPiece(ObjCSelectorPieceSyntax)
 
   case objCSelector(ObjCSelectorSyntax)
@@ -893,8 +891,6 @@ public extension Syntax {
       return .namedOpaqueReturnType(NamedOpaqueReturnTypeSyntax(self)!)
     case .nilLiteralExpr: 
       return .nilLiteralExpr(NilLiteralExprSyntax(self)!)
-    case .nonEmptyTokenList: 
-      return .nonEmptyTokenList(NonEmptyTokenListSyntax(self)!)
     case .objCSelectorPiece: 
       return .objCSelectorPiece(ObjCSelectorPieceSyntax(self)!)
     case .objCSelector: 

Sources/SwiftSyntax/generated/SyntaxKind.swift

@@ -354,8 +354,6 @@ public enum SyntaxKind {
 
   case nilLiteralExpr
 
-  case nonEmptyTokenList
-  
   case objCSelectorPiece
 
   case objCSelector
@@ -612,8 +610,6 @@ public enum SyntaxKind {
       return true
     case .multipleTrailingClosureElementList: 
       return true
-    case .nonEmptyTokenList: 
-      return true
     case .objCSelector: 
       return true
     case .patternBindingList: