Xcode 16 beta 5: Fix test trait (pointfreeco#28)

* Fix test trait

We can't yet leverage custom execution traits, and in fact Xcode 16 beta
5 removed access to them. Instead we can use the task's current test to
access trait information directly from our helpers.

* wip

Author: stephencelis

.swiftpm/configuration/Package.resolved

@@ -17,7 +17,7 @@ let package = Package(
     )
   ],
   dependencies: [
-    .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.17.1"),
+    .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.17.4"),
     .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"601.0.0-prerelease"),
   ],
   targets: [

Package.swift

@@ -9,6 +9,10 @@ import SwiftSyntaxMacroExpansion
 import SwiftSyntaxMacros
 import XCTest
 
+#if canImport(Testing)
+  import Testing
+#endif
+
 /// Asserts that a given Swift source string matches an expected string with all macros expanded.
 ///
 /// To write a macro assertion, you simply pass the mapping of macros to expand along with the
@@ -124,7 +128,12 @@ public func assertMacro(
   line: UInt = #line,
   column: UInt = #column
 ) {
-  withSnapshotTesting(record: record ?? SnapshotTestingConfiguration.current?.record) {
+  #if canImport(Testing)
+    let record = record ?? SnapshotTestingConfiguration.current?.record ?? Test.current?.record
+  #else
+    let record = record ?? SnapshotTestingConfiguration.current?.record
+  #endif
+  withSnapshotTesting(record: record) {
     let macros = macros ?? MacroTestingConfiguration.current.macros
     guard let macros, !macros.isEmpty else {
       recordIssue(

Sources/MacroTesting/AssertMacro.swift

@@ -2,7 +2,7 @@
   import SnapshotTesting
   import SwiftSyntax
   import SwiftSyntaxMacros
-  @_spi(Experimental) import Testing
+  import Testing
 
   @_spi(Experimental)
   extension Trait where Self == _MacrosTestTrait {
@@ -28,24 +28,29 @@
 
   /// A type representing the configuration of snapshot testing.
   @_spi(Experimental)
-  public struct _MacrosTestTrait: CustomExecutionTrait, SuiteTrait, TestTrait {
+  public struct _MacrosTestTrait: SuiteTrait, TestTrait {
     public let isRecursive = true
     let configuration: MacroTestingConfiguration
     let record: SnapshotTestingConfiguration.Record?
+  }
+
+  extension Test {
+    var macros: [String: Macro.Type]? {
+      for trait in traits.reversed() {
+        if let macros = (trait as? _MacrosTestTrait)?.configuration.macros {
+          return macros
+        }
+      }
+      return nil
+    }
 
-    public func execute(
-      _ function: @escaping () async throws -> Void,
-      for test: Test,
-      testCase: Test.Case?
-    ) async throws {
-      try await withMacroTesting(
-        indentationWidth: configuration.indentationWidth,
-        macros: configuration.macros
-      ) {
-        try await withSnapshotTesting(record: record) {
-          try await function()
+    var record: SnapshotTestingConfiguration.Record? {
+      for trait in traits.reversed() {
+        if let macros = (trait as? _MacrosTestTrait)?.record {
+          return macros
         }
       }
+      return nil
     }
   }
 #endif