Make unsigned and static properties in TestFailureLocation SPI

Instead, expose `String` and `Int` variants publicly that can be passed directly in to `Issue.record` from `swift-testing`.

Author: ahoppen

Release Notes/600.md

@@ -96,7 +96,7 @@
   - Pull request: https://github.com/apple/swift-syntax/pull/2587
 
 - `SwiftSyntaxMacrosTestSupportFrameworkAgnostic`
-  - Description: A version of the `SwiftSyntaxMacrosTestSupport` module that doesn't depend on `Foundation` or `XCTest` and can thus be used to write macro tests using `swift-testing`. Since swift-syntax can't depend on swift-testing (which would incur a circular dependency since swift-testing depends on swift-syntax), users need to manually specify a failure handler like the following, that fails the swift-testing test: `Issue.record(Comment(rawValue: $0.message), fileID: $0.location.fileID.description, filePath: $0.location.filePath.description, line: Int($0.location.line), column: Int($0.location.column))`
+  - Description: A version of the `SwiftSyntaxMacrosTestSupport` module that doesn't depend on `Foundation` or `XCTest` and can thus be used to write macro tests using `swift-testing`. Since swift-syntax can't depend on swift-testing (which would incur a circular dependency since swift-testing depends on swift-syntax), users need to manually specify a failure handler like the following, that fails the swift-testing test: `Issue.record("\($0.message)", fileID: $0.location.fileID, filePath: $0.location.filePath, line: $0.location.line, column: $0.location.column)`
   - Pull request: https://github.com/apple/swift-syntax/pull/2647
 
 ## API Behavior Changes

Sources/SwiftSyntaxMacrosTestSupport/Assertions.swift

@@ -14,13 +14,13 @@
 public import SwiftSyntax
 public import SwiftSyntaxMacroExpansion
 public import SwiftSyntaxMacros
-public import SwiftSyntaxMacrosTestSupportFrameworkAgnostic
+@_spi(XCTestFailureLocation) public import SwiftSyntaxMacrosTestSupportFrameworkAgnostic
 private import XCTest
 #else
 import SwiftSyntax
 import SwiftSyntaxMacroExpansion
 import SwiftSyntaxMacros
-import SwiftSyntaxMacrosTestSupportFrameworkAgnostic
+@_spi(XCTestFailureLocation) import SwiftSyntaxMacrosTestSupportFrameworkAgnostic
 import XCTest
 #endif
 
@@ -118,7 +118,7 @@ public func assertMacroExpansion(
     testFileName: testFileName,
     indentationWidth: indentationWidth,
     failureHandler: {
-      XCTFail($0.message, file: $0.location.filePath, line: $0.location.line)
+      XCTFail($0.message, file: $0.location.staticFilePath, line: $0.location.unsignedLine)
     },
     fileID: "",  // Not used in the failure handler
     filePath: file,

Sources/SwiftSyntaxMacrosTestSupportFrameworkAgnostic/Assertions.swift

@@ -35,21 +35,28 @@ import _SwiftSyntaxTestSupportFrameworkAgnostic
 /// Defines the location at which the a test failure should be anchored. This is typically the location where the
 /// assertion function is called.
 public struct TestFailureLocation {
-  public let fileID: StaticString
-  public let filePath: StaticString
-  public let line: UInt
-  public let column: UInt
+  @_spi(XCTestFailureLocation) public let staticFileID: StaticString
+  public var fileID: String { staticFileID.description }
+
+  @_spi(XCTestFailureLocation) public let staticFilePath: StaticString
+  public var filePath: String { staticFilePath.description }
+
+  @_spi(XCTestFailureLocation) public let unsignedLine: UInt
+  public var line: Int { Int(unsignedLine) }
+
+  @_spi(XCTestFailureLocation) public let unsignedColumn: UInt
+  public var column: Int { Int(unsignedColumn) }
 
   public init(
     fileID: StaticString,
     filePath: StaticString,
     line: UInt,
     column: UInt
   ) {
-    self.fileID = fileID
-    self.filePath = filePath
-    self.line = line
-    self.column = column
+    self.staticFileID = fileID
+    self.staticFilePath = filePath
+    self.unsignedLine = line
+    self.unsignedColumn = column
   }
 
   fileprivate init(underlying: _SwiftSyntaxTestSupportFrameworkAgnostic.TestFailureLocation) {
@@ -65,10 +72,10 @@ public struct TestFailureLocation {
   /// import `_SwiftSyntaxTestSupportFrameworkAgnostic` privately and don't expose its internal types.
   fileprivate var underlying: _SwiftSyntaxTestSupportFrameworkAgnostic.TestFailureLocation {
     _SwiftSyntaxTestSupportFrameworkAgnostic.TestFailureLocation(
-      fileID: self.fileID,
-      filePath: self.filePath,
-      line: self.line,
-      column: self.column
+      fileID: self.staticFileID,
+      filePath: self.staticFilePath,
+      line: self.unsignedLine,
+      column: self.unsignedColumn
     )
   }
 }