Fix indentation width test trait parameter (#30)

* Fix indentation width test trait parameter Forgot to thread this through when fixing the build for beta 5. * wip --------- Co-authored-by: Brandon Williams <[email protected]>
pointfreeco · Aug 19, 2024 · e243319 · e243319
1 parent c33adc7
commit e243319
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/Sources/MacroTesting/AssertMacro.swift b/Sources/MacroTesting/AssertMacro.swift
@@ -128,17 +128,21 @@ public func assertMacro(
   line: UInt = #line,
   column: UInt = #column
 ) {
+  var indentationWidth = indentationWidth
+    ?? MacroTestingConfiguration.current.indentationWidth
+  var macros = macros
+    ?? MacroTestingConfiguration.current.macros
+  var record = record
+    ?? SnapshotTestingConfiguration.current?.record
   #if canImport(Testing)
-    let record = record ?? SnapshotTestingConfiguration.current?.record ?? Test.current?.record
-  #else
-    let record = record ?? SnapshotTestingConfiguration.current?.record
+    indentationWidth = indentationWidth
+      ?? Test.current?.indentationWidth
+    macros = macros
+      ?? Test.current?.macros
+    record = record
+      ?? Test.current?.record
   #endif
-  withSnapshotTesting(record: record) {
-    #if canImport(Testing)
-      let macros = macros ?? MacroTestingConfiguration.current.macros ?? Test.current?.macros
-    #else
-      let macros = macros ?? MacroTestingConfiguration.current.macros
-    #endif
+  withMacroTesting(indentationWidth: indentationWidth, record: record, macros: macros) {
     guard let macros, !macros.isEmpty else {
       recordIssue(
         """

diff --git a/Sources/MacroTesting/MacrosTestTrait.swift b/Sources/MacroTesting/MacrosTestTrait.swift
@@ -35,6 +35,15 @@
   }
 
   extension Test {
+    var indentationWidth: Trivia? {
+      for trait in traits.reversed() {
+        if let indentationWidth = (trait as? _MacrosTestTrait)?.configuration.indentationWidth {
+          return indentationWidth
+        }
+      }
+      return nil
+    }
+
     var macros: [String: Macro.Type]? {
       for trait in traits.reversed() {
         if let macros = (trait as? _MacrosTestTrait)?.configuration.macros {