Make the description of some nodes more clear

Refactor some codes to make them cleaner

Author: StevenWong12

CodeGeneration/Sources/SyntaxSupport/AvailabilityNodes.swift

@@ -121,27 +121,27 @@ public let AVAILABILITY_NODES: [Node] = [
   // version-tuple-element -> '.' interger-literal
   Node(
     name: "VersionComponent",
-    nameForDiagnostics: "version tuple element",
-    description: "An element to represent a dot and number pair",
+    nameForDiagnostics: nil,
+    description: "An element to represent a single component in a version, like `.1`.",
     kind: "Syntax",
     children: [
       Child(
         name: "Period",
         kind: .token(choices: [.token(tokenKind: "PeriodToken")]),
-        description: "The period of this pair"
+        description: "The period of this version component"
       ),
       Child(
         name: "Number",
         kind: .token(choices: [.token(tokenKind: "IntegerLiteralToken")]),
-        description: "The number of this pair"
+        description: "The version number of this component"
       ),
     ]
   ),
 
   // version-list -> version-tuple-element version-list?
   Node(
     name: "VersionComponentList",
-    nameForDiagnostics: "version list",
+    nameForDiagnostics: nil,
     kind: "SyntaxCollection",
     element: "VersionComponent",
     omitWhenEmpty: true
@@ -162,7 +162,6 @@ public let AVAILABILITY_NODES: [Node] = [
       Child(
         name: "Components",
         kind: .collection(kind: "VersionComponentList", collectionElementName: "VersionComponent"),
-        nameForDiagnostics: "components",
         isOptional: true
       ),
     ]

Sources/SwiftParser/Availability.swift

@@ -123,7 +123,7 @@ extension Parser {
         (.obsoleted, let handle)?:
         let argumentLabel = self.eat(handle)
         let (unexpectedBeforeColon, colon) = self.expect(.colon)
-        let version = self.parseVersionTuple()
+        let version = self.parseVersionTuple(maxComponentCount: 3)
         entry = .availabilityLabeledArgument(
           RawAvailabilityLabeledArgumentSyntax(
             label: argumentLabel,
@@ -136,7 +136,7 @@ extension Parser {
       case (.deprecated, let handle)?:
         let argumentLabel = self.eat(handle)
         if let colon = self.consume(if: .colon) {
-          let version = self.parseVersionTuple()
+          let version = self.parseVersionTuple(maxComponentCount: 3)
           entry = .availabilityLabeledArgument(
             RawAvailabilityLabeledArgumentSyntax(
               label: argumentLabel,
@@ -227,7 +227,7 @@ extension Parser {
 
     let version: RawVersionTupleSyntax?
     if self.at(.integerLiteral, .floatingLiteral) {
-      version = self.parseVersionTuple()
+      version = self.parseVersionTuple(maxComponentCount: 3)
     } else {
       version = nil
     }
@@ -258,10 +258,10 @@ extension Parser {
   /// Grammar
   /// =======
   ///
-  ///     platform-version → decimal-digits
-  ///     platform-version → decimal-digits '.' decimal-digits
-  ///     platform-version → decimal-digits '.' decimal-digits '.' decimal-digits
-  mutating func parseVersionTuple(maxComponentCount: Int = 3) -> RawVersionTupleSyntax {
+  ///     version-tuple -> integer-literal version-list?
+  ///     version-list -> version-tuple-element version-list?
+  ///     version-tuple-element -> '.' interger-literal
+  mutating func parseVersionTuple(maxComponentCount: Int) -> RawVersionTupleSyntax {
     if self.at(.floatingLiteral),
       let periodIndex = self.currentToken.tokenText.firstIndex(of: UInt8(ascii: ".")),
       self.currentToken.tokenText[0..<periodIndex].allSatisfy({ Unicode.Scalar($0).isDigit })
@@ -271,26 +271,24 @@ extension Parser {
       let major = self.consumePrefix(SyntaxText(rebasing: self.currentToken.tokenText[0..<periodIndex]), as: .integerLiteral)
 
       var components: [RawVersionComponentSyntax] = []
-      for _ in 1..<maxComponentCount {
+      var trailingComponents: [RawVersionComponentSyntax] = []
+
+      for i in 1... {
         guard let period = self.consume(if: .period) else {
           break
         }
         let version = self.expectDecimalIntegerWithoutRecovery()
 
-        components.append(RawVersionComponentSyntax(period: period, number: version, arena: self.arena))
-      }
+        let versionComponent = RawVersionComponentSyntax(period: period, number: version, arena: self.arena)
 
-      var trailingComponents: [RawVersionComponentSyntax] = []
-      var unexpectedTrailingComponents: RawUnexpectedNodesSyntax?
-
-      repeat {
-        guard let period = self.consume(if: .period) else {
-          break
+        if i < maxComponentCount {
+          components.append(versionComponent)
+        } else {
+          trailingComponents.append(versionComponent)
         }
-        let version = self.expectDecimalIntegerWithoutRecovery()
-        trailingComponents.append(RawVersionComponentSyntax(period: period, number: version, arena: self.arena))
+      }
 
-      } while true
+      var unexpectedTrailingComponents: RawUnexpectedNodesSyntax?
 
       if !trailingComponents.isEmpty {
         unexpectedTrailingComponents = RawUnexpectedNodesSyntax(elements: trailingComponents.compactMap { $0.as(RawSyntax.self) }, arena: self.arena)

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -545,7 +545,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
         handledNodes: [label.id]
       )
 
-      [node.unexpectedBetweenLabelAndColon?.id, node.colon?.id, node.versionTuple?.id].compactMap { $0 }.forEach { handledNodes.append($0) }
+      handledNodes.append(contentsOf: [node.unexpectedBetweenLabelAndColon?.id, node.colon?.id, node.versionTuple?.id].compactMap { $0 })
     }
 
     if let versionTuple = node.versionTuple,

Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

@@ -362,8 +362,6 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "attributes"
   case \VariableDeclSyntax.modifiers:
     return "modifiers"
-  case \VersionTupleSyntax.components:
-    return "components"
   default:
     return nil
   }

Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift

@@ -385,10 +385,6 @@ extension SyntaxKind {
       return "value binding pattern"
     case .variableDecl:
       return "variable"
-    case .versionComponentList:
-      return "version list"
-    case .versionComponent:
-      return "version tuple element"
     case .versionTuple:
       return "version tuple"
     case .whereClause:

Sources/SwiftSyntax/generated/SyntaxCollections.swift

@@ -9905,8 +9905,8 @@ public struct VersionComponentListSyntax: SyntaxCollection, SyntaxHashable {
     let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in
       let raw = RawSyntax.makeLayout(kind: SyntaxKind.versionComponentList,
                                      from: children.map {
-            $0.raw
-          }, arena: arena)
+          $0.raw
+        }, arena: arena)
       return SyntaxData.forRoot(raw)
     }
     self.init(data)
@@ -10074,7 +10074,7 @@ extension VersionComponentListSyntax: BidirectionalCollection {
     return rawChildren.distance(from: start, to: end)
   }
 
-  public subscript (position: SyntaxChildrenIndex) -> Element {
+  public subscript(position: SyntaxChildrenIndex) -> Element {
     let (raw, info) = rawChildren[position]
     let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info)
     let data = SyntaxData(absoluteRaw, parent: Syntax(self))

Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift

@@ -21956,8 +21956,8 @@ public struct RawVersionComponentListSyntax: RawSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .versionComponentList, uninitializedCount: elements.count, arena: arena) { layout in
         guard var ptr = layout.baseAddress else {
-            return
-          }
+          return
+        }
         for elem in elements {
           ptr.initialize(to: elem.raw)
           ptr += 1

Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift

@@ -17434,7 +17434,7 @@ public struct UnderscorePrivateAttributeArgumentsSyntax: SyntaxProtocol, SyntaxH
 
 // MARK: - VersionComponentSyntax
 
-/// An element to represent a dot and number pair
+/// An element to represent a single component in a version, like `.1`.
 public struct VersionComponentSyntax: SyntaxProtocol, SyntaxHashable {
   public let _syntaxNode: Syntax
 
@@ -17501,7 +17501,7 @@ public struct VersionComponentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
 
-  /// The period of this pair
+  /// The period of this version component
   public var period: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
@@ -17520,7 +17520,7 @@ public struct VersionComponentSyntax: SyntaxProtocol, SyntaxHashable {
     }
   }
 
-  /// The number of this pair
+  /// The version number of this component
   public var number: TokenSyntax {
     get {
       return TokenSyntax(data.child(at: 3, parent: Syntax(self))!)

Tests/SwiftParserTest/AvailabilityTests.swift

@@ -163,7 +163,7 @@ final class AvailabilityTests: XCTestCase {
       func test() {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected integer literal in version tuple element", fixIts: ["insert integer literal"]),
+        DiagnosticSpec(message: "expected integer literal in version tuple", fixIts: ["insert integer literal"]),
         DiagnosticSpec(message: "unexpected code '0e10' in attribute"),
       ],
       fixedSource: """
@@ -193,7 +193,7 @@ final class AvailabilityTests: XCTestCase {
       func test() {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected integer literal in version tuple element", fixIts: ["insert integer literal"]),
+        DiagnosticSpec(message: "expected integer literal in version tuple", fixIts: ["insert integer literal"]),
         DiagnosticSpec(message: "unexpected code '0xff' in attribute"),
       ],
       fixedSource: """