Replace IdentifierList With DesignatedTypeList

Author: CodaFi

Sources/SwiftParser/Declarations.swift

@@ -1888,27 +1888,21 @@ extension Parser {
     let precedenceAndTypes: RawOperatorPrecedenceAndTypesSyntax?
     if let colon = self.consume(if: .colon) {
       let (unexpectedBeforeIdentifier, identifier) = self.expectIdentifier()
-      let unexpectedBeforeComma: RawUnexpectedNodesSyntax?
-      let comma: RawTokenSyntax?
-      let unexpectedBeforeDesignatedType: RawUnexpectedNodesSyntax?
-      let designatedType: RawTokenSyntax?
-      if self.at(.comma) {
-        (unexpectedBeforeComma, comma) = self.expect(.comma)
-        (unexpectedBeforeDesignatedType, designatedType) = self.expectIdentifier()
-      } else {
-        unexpectedBeforeComma = nil
-        comma = nil
-        unexpectedBeforeDesignatedType = nil
-        designatedType = nil
+      var types = [RawDesignatedTypeElementSyntax]()
+      while let comma = self.consume(if: .comma) {
+        let (unexpectedBeforeDesignatedType, designatedType) = self.expectIdentifier()
+        types.append(RawDesignatedTypeElementSyntax(
+          leadingComma: comma,
+          unexpectedBeforeDesignatedType,
+          name: designatedType,
+          arena: self.arena))
       }
       precedenceAndTypes = RawOperatorPrecedenceAndTypesSyntax(
         colon: colon,
         unexpectedBeforeIdentifier,
         precedenceGroup: identifier,
-        unexpectedBeforeComma,
-        comma: comma,
-        unexpectedBeforeDesignatedType,
-        designatedType: designatedType,
+        designatedTypes: RawDesignatedTypeListSyntax(
+          elements: types, arena: self.arena),
         arena: self.arena)
     } else {
       precedenceAndTypes = nil

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

@@ -234,6 +234,8 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/PatternBindingSyntax>
 - <doc:SwiftSyntax/EnumCaseElementListSyntax>
 - <doc:SwiftSyntax/EnumCaseElementSyntax>
+- <doc:SwiftSyntax/DesignatedTypeListSyntax>
+- <doc:SwiftSyntax/DesignatedTypeElementSyntax>
 - <doc:SwiftSyntax/PrecedenceGroupNameListSyntax>
 - <doc:SwiftSyntax/PrecedenceGroupNameElementSyntax>
 - <doc:SwiftSyntax/ObjCSelectorSyntax>
@@ -328,7 +330,8 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/PatternBindingListSyntax>
 - <doc:SwiftSyntax/EnumCaseElementSyntax>
 - <doc:SwiftSyntax/EnumCaseElementListSyntax>
-- <doc:SwiftSyntax/IdentifierListSyntax>
+- <doc:SwiftSyntax/DesignatedTypeListSyntax>
+- <doc:SwiftSyntax/DesignatedTypeElementSyntax>
 - <doc:SwiftSyntax/OperatorPrecedenceAndTypesSyntax>
 - <doc:SwiftSyntax/PrecedenceGroupAttributeListSyntax>
 - <doc:SwiftSyntax/PrecedenceGroupRelationSyntax>

Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxNodes.swift

@@ -8576,13 +8576,13 @@ public struct RawOperatorDeclSyntax: RawDeclSyntaxNodeProtocol {
 }
 
 @_spi(RawSyntax)
-public struct RawIdentifierListSyntax: RawSyntaxNodeProtocol {
+public struct RawDesignatedTypeListSyntax: RawSyntaxNodeProtocol {
   var layoutView: RawSyntaxLayoutView {
     return raw.layoutView!
   }
 
   public static func isKindOf(_ raw: RawSyntax) -> Bool {
-    return raw.kind == .identifierList
+    return raw.kind == .designatedTypeList
   }
 
   public var raw: RawSyntax
@@ -8596,9 +8596,9 @@ public struct RawIdentifierListSyntax: RawSyntaxNodeProtocol {
     self.init(raw: other.raw)
   }
 
-  public init(elements: [RawTokenSyntax], arena: __shared SyntaxArena) {
+  public init(elements: [RawDesignatedTypeElementSyntax], arena: __shared SyntaxArena) {
     let raw = RawSyntax.makeLayout(
-      kind: .identifierList, uninitializedCount: elements.count, arena: arena) { layout in
+      kind: .designatedTypeList, uninitializedCount: elements.count, arena: arena) { layout in
       guard var ptr = layout.baseAddress else { return }
       for elem in elements {
         ptr.initialize(to: elem.raw)
@@ -8608,8 +8608,61 @@ public struct RawIdentifierListSyntax: RawSyntaxNodeProtocol {
     self.init(raw: raw)
   }
 
-  public var elements: [RawTokenSyntax] {
-    layoutView.children.map { RawTokenSyntax(raw: $0!) }
+  public var elements: [RawDesignatedTypeElementSyntax] {
+    layoutView.children.map { RawDesignatedTypeElementSyntax(raw: $0!) }
+  }
+}
+
+@_spi(RawSyntax)
+public struct RawDesignatedTypeElementSyntax: RawSyntaxNodeProtocol {
+  var layoutView: RawSyntaxLayoutView {
+    return raw.layoutView!
+  }
+
+  public static func isKindOf(_ raw: RawSyntax) -> Bool {
+    return raw.kind == .designatedTypeElement
+  }
+
+  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(
+    _ unexpectedBeforeLeadingComma: RawUnexpectedNodesSyntax? = nil,
+    leadingComma: RawTokenSyntax,
+    _ unexpectedBetweenLeadingCommaAndName: RawUnexpectedNodesSyntax? = nil,
+    name: RawTokenSyntax,
+    arena: __shared SyntaxArena
+  ) {
+    let raw = RawSyntax.makeLayout(
+      kind: .designatedTypeElement, uninitializedCount: 4, arena: arena) { layout in
+      layout.initialize(repeating: nil)
+      layout[0] = unexpectedBeforeLeadingComma?.raw
+      layout[1] = leadingComma.raw
+      layout[2] = unexpectedBetweenLeadingCommaAndName?.raw
+      layout[3] = name.raw
+    }
+    self.init(raw: raw)
+  }
+
+  public var unexpectedBeforeLeadingComma: RawUnexpectedNodesSyntax? {
+    layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
+  }
+  public var leadingComma: RawTokenSyntax {
+    layoutView.children[1].map(RawTokenSyntax.init(raw:))!
+  }
+  public var unexpectedBetweenLeadingCommaAndName: RawUnexpectedNodesSyntax? {
+    layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
+  }
+  public var name: RawTokenSyntax {
+    layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
 }
 
@@ -8639,23 +8692,19 @@ public struct RawOperatorPrecedenceAndTypesSyntax: RawSyntaxNodeProtocol {
     colon: RawTokenSyntax,
     _ unexpectedBetweenColonAndPrecedenceGroup: RawUnexpectedNodesSyntax? = nil,
     precedenceGroup: RawTokenSyntax,
-    _ unexpectedBetweenPrecedenceGroupAndComma: RawUnexpectedNodesSyntax? = nil,
-    comma: RawTokenSyntax?,
-    _ unexpectedBetweenCommaAndDesignatedType: RawUnexpectedNodesSyntax? = nil,
-    designatedType: RawTokenSyntax?,
+    _ unexpectedBetweenPrecedenceGroupAndDesignatedTypes: RawUnexpectedNodesSyntax? = nil,
+    designatedTypes: RawDesignatedTypeListSyntax,
     arena: __shared SyntaxArena
   ) {
     let raw = RawSyntax.makeLayout(
-      kind: .operatorPrecedenceAndTypes, uninitializedCount: 8, arena: arena) { layout in
+      kind: .operatorPrecedenceAndTypes, uninitializedCount: 6, arena: arena) { layout in
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeColon?.raw
       layout[1] = colon.raw
       layout[2] = unexpectedBetweenColonAndPrecedenceGroup?.raw
       layout[3] = precedenceGroup.raw
-      layout[4] = unexpectedBetweenPrecedenceGroupAndComma?.raw
-      layout[5] = comma?.raw
-      layout[6] = unexpectedBetweenCommaAndDesignatedType?.raw
-      layout[7] = designatedType?.raw
+      layout[4] = unexpectedBetweenPrecedenceGroupAndDesignatedTypes?.raw
+      layout[5] = designatedTypes.raw
     }
     self.init(raw: raw)
   }
@@ -8672,17 +8721,11 @@ public struct RawOperatorPrecedenceAndTypesSyntax: RawSyntaxNodeProtocol {
   public var precedenceGroup: RawTokenSyntax {
     layoutView.children[3].map(RawTokenSyntax.init(raw:))!
   }
-  public var unexpectedBetweenPrecedenceGroupAndComma: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenPrecedenceGroupAndDesignatedTypes: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
-  public var comma: RawTokenSyntax? {
-    layoutView.children[5].map(RawTokenSyntax.init(raw:))
-  }
-  public var unexpectedBetweenCommaAndDesignatedType: RawUnexpectedNodesSyntax? {
-    layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
-  }
-  public var designatedType: RawTokenSyntax? {
-    layoutView.children[7].map(RawTokenSyntax.init(raw:))
+  public var designatedTypes: RawDesignatedTypeListSyntax {
+    layoutView.children[5].map(RawDesignatedTypeListSyntax.init(raw:))!
   }
 }
 

Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxValidation.swift

@@ -1230,21 +1230,26 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
     _verify(layout[8], as: RawUnexpectedNodesSyntax?.self)
     _verify(layout[9], as: RawOperatorPrecedenceAndTypesSyntax?.self)
     break
-  case .identifierList:
+  case .designatedTypeList:
     for element in layout {
-      _verify(element, as: RawTokenSyntax.self)
+      _verify(element, as: RawDesignatedTypeElementSyntax.self)
     }
     break
+  case .designatedTypeElement:
+    assert(layout.count == 4)
+    _verify(layout[0], as: RawUnexpectedNodesSyntax?.self)
+    _verify(layout[1], as: RawTokenSyntax.self)
+    _verify(layout[2], as: RawUnexpectedNodesSyntax?.self)
+    _verify(layout[3], as: RawTokenSyntax.self)
+    break
   case .operatorPrecedenceAndTypes:
-    assert(layout.count == 8)
+    assert(layout.count == 6)
     _verify(layout[0], as: RawUnexpectedNodesSyntax?.self)
     _verify(layout[1], as: RawTokenSyntax.self)
     _verify(layout[2], as: RawUnexpectedNodesSyntax?.self)
     _verify(layout[3], as: RawTokenSyntax.self)
     _verify(layout[4], as: RawUnexpectedNodesSyntax?.self)
-    _verify(layout[5], as: RawTokenSyntax?.self)
-    _verify(layout[6], as: RawUnexpectedNodesSyntax?.self)
-    _verify(layout[7], as: RawTokenSyntax?.self)
+    _verify(layout[5], as: RawDesignatedTypeListSyntax.self)
     break
   case .precedenceGroupDecl:
     assert(layout.count == 14)

Sources/SwiftSyntax/gyb_generated/Misc.swift

@@ -313,7 +313,9 @@ extension Syntax {
       return node
     case .operatorDecl(let node):
       return node
-    case .identifierList(let node):
+    case .designatedTypeList(let node):
+      return node
+    case .designatedTypeElement(let node):
       return node
     case .operatorPrecedenceAndTypes(let node):
       return node
@@ -716,7 +718,8 @@ extension SyntaxKind {
     case .enumCaseDecl: return EnumCaseDeclSyntax.self
     case .enumDecl: return EnumDeclSyntax.self
     case .operatorDecl: return OperatorDeclSyntax.self
-    case .identifierList: return IdentifierListSyntax.self
+    case .designatedTypeList: return DesignatedTypeListSyntax.self
+    case .designatedTypeElement: return DesignatedTypeElementSyntax.self
     case .operatorPrecedenceAndTypes: return OperatorPrecedenceAndTypesSyntax.self
     case .precedenceGroupDecl: return PrecedenceGroupDeclSyntax.self
     case .precedenceGroupAttributeList: return PrecedenceGroupAttributeListSyntax.self

Sources/SwiftSyntax/gyb_generated/SyntaxAnyVisitor.swift

@@ -1055,11 +1055,18 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
   override open func visitPost(_ node: OperatorDeclSyntax) {
     visitAnyPost(node._syntaxNode)
   }
-  override open func visit(_ node: IdentifierListSyntax) -> SyntaxVisitorContinueKind {
+  override open func visit(_ node: DesignatedTypeListSyntax) -> SyntaxVisitorContinueKind {
     return visitAny(node._syntaxNode)
   }
 
-  override open func visitPost(_ node: IdentifierListSyntax) {
+  override open func visitPost(_ node: DesignatedTypeListSyntax) {
+    visitAnyPost(node._syntaxNode)
+  }
+  override open func visit(_ node: DesignatedTypeElementSyntax) -> SyntaxVisitorContinueKind {
+    return visitAny(node._syntaxNode)
+  }
+
+  override open func visitPost(_ node: DesignatedTypeElementSyntax) {
     visitAnyPost(node._syntaxNode)
   }
   override open func visit(_ node: OperatorPrecedenceAndTypesSyntax) -> SyntaxVisitorContinueKind {