Don't shadow VersionTupleSyntax.components. (#177)

Since we first wrote the code in VersionTupleSyntaxAdditions.swift, a `components` property has been added to `VersionTupleSyntax`. We shouldn't shadow it with our own property (and we should call it in order to more efficiently and correctly get version info than we do now.)

Author: grynspan

Sources/TestingMacros/Support/Additions/VersionTupleSyntaxAdditions.swift

@@ -13,7 +13,7 @@ public import SwiftSyntax
 extension VersionTupleSyntax {
   /// A type describing the major, minor, and patch components of a version
   /// tuple.
-  struct Components: Comparable, CustomStringConvertible {
+  struct ComponentValues: Comparable, CustomStringConvertible {
     /// The major component.
     var major: UInt64
 
@@ -47,27 +47,23 @@ extension VersionTupleSyntax {
     }
   }
 
-  /// The major, minor, and patch components of this version tuple.
-  var components: Components {
-#if swift(<6.0)
-    let stringComponents = trimmedDescription.split(separator: "." as Character)
-    guard let major = stringComponents.first.flatMap({ UInt64($0) }) else {
-      return Components(major: 0)
+  /// The numeric values of the major, minor, and patch components.
+  var componentValues: ComponentValues {
+    let components = components
+    let startIndex = components.startIndex
+
+    let major = UInt64(major.text) ?? 0
+    let minor: UInt64? = if components.count > 0 {
+      UInt64(components[startIndex].number.text)
+    } else {
+      nil
     }
-    var minor: UInt64?
-    var patch: UInt64?
-    if stringComponents.count > 1 {
-      minor = UInt64(stringComponents[1])
-      if stringComponents.count > 2 {
-        patch = UInt64(stringComponents[2])
-      }
+    let patch: UInt64? = if components.count > 1 {
+      UInt64(components[components.index(after: startIndex)].number.text)
+    } else {
+      nil
     }
-#else
-    let major = UInt64(major.text) ?? 0
-    let minor = minor.map(\.text).flatMap(UInt64.init)
-    let patch = patch.map(\.text).flatMap(UInt64.init)
-#endif
 
-    return Components(major: major, minor: minor, patch: patch)
+    return ComponentValues(major: major, minor: minor, patch: patch)
   }
 }

Sources/TestingMacros/Support/AvailabilityGuards.swift

@@ -65,7 +65,7 @@ private func _createAvailabilityTraitExpr(
   when whenKeyword: Keyword,
   in context: some MacroExpansionContext
 ) -> ExprSyntax {
-  let version: ExprSyntax = availability.version.map(\.components).map { components in
+  let version: ExprSyntax = availability.version.map(\.componentValues).map { components in
     "(\(literal: components.major), \(literal: components.minor), \(literal: components.patch))"
   } ?? "nil"
   let message = availability.message.map(\.trimmed).map(ExprSyntax.init) ?? "nil"
@@ -227,11 +227,11 @@ func createSyntaxNode(
   do {
     let introducedVersion = decl.availability(when: .introduced).lazy
       .filter(\.isSwift)
-      .compactMap(\.version?.components)
+      .compactMap(\.version?.componentValues)
       .max()
     let obsoletedVersion = decl.availability(when: .obsoleted).lazy
       .filter(\.isSwift)
-      .compactMap(\.version?.components)
+      .compactMap(\.version?.componentValues)
       .min()
 
     let swiftVersionGuardExpr: ExprSyntax? = switch (introducedVersion, obsoletedVersion) {