Improve support for Swift Syntax 600 and fix SwiftTesting

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
           [
             "509.0.0..<510.0.0",
             "510.0.0..<511.0.0",
-            "511.0.0..<601.0.0-prerelease",
+            "511.0.0..<601.0.0",
           ]
 
     steps:

.gitignore

@@ -4,4 +4,5 @@
 /Packages
 /*.swiftinterface
 /*.xcodeproj
-xcuserdata/
+xcuserdata/
+tmp

Makefile

@@ -12,7 +12,7 @@ test-swift-syntax-versions:
 	@for version in \
 		"509.0.0..<510.0.0" \
 		"510.0.0..<511.0.0" \
-		"511.0.0..<601.0.0-prerelease"; \
+		"511.0.0..<601.0.0"; \
 	do \
 		echo "\n## Testing SwiftSyntax version $$version"; \
 		$(MAKE) clean; \

Package.resolved

@@ -5,17 +5,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
       "state" : {
-        "revision" : "63d3b45dd249878a41c56274a748ca2c1c9c5230",
-        "version" : "1.17.1"
+        "revision" : "7b0bbbae90c41f848f90ac7b4df6c4f50068256d",
+        "version" : "1.17.5"
       }
     },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax",
+      "location" : "https://github.com/swiftlang/swift-syntax",
       "state" : {
-        "revision" : "303e5c5c36d6a558407d364878df131c3546fad8",
-        "version" : "510.0.2"
+        "revision" : "0687f71944021d616d34d922343dcef086855920",
+        "version" : "600.0.1"
       }
     }
   ],

Package.swift

@@ -30,7 +30,7 @@ let package = Package(
     .conditionalPackage(
       url: "https://github.com/swiftlang/swift-syntax",
       envVar: "SWIFT_SYNTAX_VERSION",
-      default: "509.0.0..<601.0.0-prerelease"
+      default: "509.0.0..<601.0.0"
     ),
   ],
   targets: [

Sources/MacroTesting/AssertMacro.swift

@@ -9,6 +9,10 @@ import SwiftSyntaxMacroExpansion
 import SwiftSyntaxMacros
 import XCTest
 
+#if canImport(Testing)
+  import Testing
+#endif
+
 //let compilableUsages = {
 //  assertMacro { "" }
 //  assertMacro { "" } expansion: { "" }
@@ -190,8 +194,32 @@ public func assertMacro(
   line: UInt = #line,
   column: UInt = #column
 ) {
-  withSnapshotTesting(record: record ?? SnapshotTestingConfiguration.current?.record) {
-    let macros = macros ?? MacroTestingConfiguration.current.macros
+  var indentationWidth =
+    indentationWidth
+    ?? MacroTestingConfiguration.current.indentationWidth
+  var macros =
+    macros
+    ?? MacroTestingConfiguration.current.macros
+  var record =
+    record
+    ?? SnapshotTestingConfiguration.current?.record
+  #if canImport(Testing)
+    indentationWidth =
+      indentationWidth
+      ?? Test.current?.indentationWidth
+    macros =
+      macros
+      ?? Test.current?.macros
+    record =
+      record
+      ?? Test.current?.record
+  #endif
+  withMacroTesting(indentationWidth: indentationWidth, record: record, macros: macros) {
+    #if canImport(Testing)
+      let macros = macros ?? MacroTestingConfiguration.current.macros ?? Test.current?.macros
+    #else
+      let macros = macros ?? MacroTestingConfiguration.current.macros
+    #endif
     guard let macros, !macros.isEmpty else {
       recordIssue(
         """
@@ -249,7 +277,10 @@ public func assertMacro(
       #if canImport(SwiftSyntax600)
         let expandedSourceFile = origSourceFile.expand(
           macros: macros,
-          contextGenerator: { _ in context },
+          contextGenerator: { syntax in
+            BasicMacroExpansionContext(
+              sharingWith: context, lexicalContext: syntax.allMacroLexicalContexts())
+          },
           indentationWidth: indentationWidth
         )
       #else
@@ -311,6 +342,7 @@ public func assertMacro(
             trailingClosureOffset: offset
           ),
           matches: expandedSource,
+          fileID: fileID,
           file: filePath,
           function: function,
           line: line,
@@ -666,13 +698,13 @@ public func withMacroTesting<R>(
   record: SnapshotTestingConfiguration.Record? = nil,
   macros: [String: Macro.Type]? = nil,
   operation: () async throws -> R
-) async rethrows {
+) async rethrows -> R {
   var configuration = MacroTestingConfiguration.current
-  if let indentationWidth = indentationWidth { configuration.indentationWidth = indentationWidth }
-  if let macros = macros { configuration.macros = macros }
+  if let indentationWidth { configuration.indentationWidth = indentationWidth }
+  if let macros { configuration.macros = macros }
   return try await withSnapshotTesting(record: record) {
     try await MacroTestingConfiguration.$current.withValue(configuration) {
-      _ = try await operation()
+      try await operation()
     }
   }
 }
@@ -694,13 +726,13 @@ public func withMacroTesting<R>(
   record: SnapshotTestingConfiguration.Record? = nil,
   macros: [String: Macro.Type]? = nil,
   operation: () throws -> R
-) rethrows {
+) rethrows -> R {
   var configuration = MacroTestingConfiguration.current
-  if let indentationWidth = indentationWidth { configuration.indentationWidth = indentationWidth }
-  if let macros = macros { configuration.macros = macros }
+  if let indentationWidth { configuration.indentationWidth = indentationWidth }
+  if let macros { configuration.macros = macros }
   return try withSnapshotTesting(record: record) {
     try MacroTestingConfiguration.$current.withValue(configuration) {
-      _ = try operation()
+      try operation()
     }
   }
 }
@@ -722,7 +754,7 @@ public func withMacroTesting<R>(
   record: SnapshotTestingConfiguration.Record? = nil,
   macros: [Macro.Type],
   operation: () async throws -> R
-) async rethrows {
+) async rethrows -> R {
   try await withMacroTesting(
     indentationWidth: indentationWidth,
     record: record,
@@ -748,7 +780,7 @@ public func withMacroTesting<R>(
   record: SnapshotTestingConfiguration.Record? = nil,
   macros: [Macro.Type],
   operation: () throws -> R
-) rethrows {
+) rethrows -> R {
   try withMacroTesting(
     indentationWidth: indentationWidth,
     record: record,

Sources/MacroTesting/Internal/Deprecations.swift

@@ -1,4 +1,5 @@
 //import InlineSnapshotTesting
+//@_spi(Internals) import SnapshotTesting
 //import SwiftDiagnostics
 //import SwiftOperators
 //import SwiftParser
@@ -8,6 +9,118 @@
 //import SwiftSyntaxMacros
 //import XCTest
 //
+//// MARK: Deprecated after 0.4.2
+//
+//@available(iOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)")
+//@available(
+//  macOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)"
+//)
+//@available(tvOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)")
+//@available(
+//  visionOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)"
+//)
+//@available(
+//  watchOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)"
+//)
+//@_disfavoredOverload
+//public func withMacroTesting<R>(
+//  indentationWidth: Trivia? = nil,
+//  isRecording: Bool? = nil,
+//  macros: [String: Macro.Type]? = nil,
+//  operation: () async throws -> R
+//) async rethrows {
+//  var configuration = MacroTestingConfiguration.current
+//  if let indentationWidth { configuration.indentationWidth = indentationWidth }
+//  let record: SnapshotTestingConfiguration.Record? = isRecording.map { $0 ? .all : .missing }
+//  if let macros { configuration.macros = macros }
+//  _ = try await withSnapshotTesting(record: record) {
+//    try await MacroTestingConfiguration.$current.withValue(configuration) {
+//      try await operation()
+//    }
+//  }
+//}
+//
+//@available(iOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)")
+//@available(
+//  macOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)"
+//)
+//@available(tvOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)")
+//@available(
+//  visionOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)"
+//)
+//@available(
+//  watchOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)"
+//)
+//@_disfavoredOverload
+//public func withMacroTesting<R>(
+//  indentationWidth: Trivia? = nil,
+//  isRecording: Bool? = nil,
+//  macros: [String: Macro.Type]? = nil,
+//  operation: () throws -> R
+//) rethrows {
+//  var configuration = MacroTestingConfiguration.current
+//  if let indentationWidth { configuration.indentationWidth = indentationWidth }
+//  let record: SnapshotTestingConfiguration.Record? = isRecording.map { $0 ? .all : .missing }
+//  if let macros { configuration.macros = macros }
+//  _ = try withSnapshotTesting(record: record) {
+//    try MacroTestingConfiguration.$current.withValue(configuration) {
+//      try operation()
+//    }
+//  }
+//}
+//
+//@available(iOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)")
+//@available(
+//  macOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)"
+//)
+//@available(tvOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)")
+//@available(
+//  visionOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)"
+//)
+//@available(
+//  watchOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)"
+//)
+//@_disfavoredOverload
+//public func withMacroTesting<R>(
+//  indentationWidth: Trivia? = nil,
+//  isRecording: Bool? = nil,
+//  macros: [Macro.Type],
+//  operation: () async throws -> R
+//) async rethrows {
+//  try await withMacroTesting(
+//    indentationWidth: indentationWidth,
+//    isRecording: isRecording,
+//    macros: Dictionary(macros: macros),
+//    operation: operation
+//  )
+//}
+//
+//@available(iOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)")
+//@available(
+//  macOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)"
+//)
+//@available(tvOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)")
+//@available(
+//  visionOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)"
+//)
+//@available(
+//  watchOS, deprecated, renamed: "withMacroTesting(indentationWidth:record:macros:operation:)"
+//)
+//@_disfavoredOverload
+//public func withMacroTesting<R>(
+//  indentationWidth: Trivia? = nil,
+//  isRecording: Bool? = nil,
+//  macros: [Macro.Type],
+//  operation: () throws -> R
+//) rethrows {
+//  try withMacroTesting(
+//    indentationWidth: indentationWidth,
+//    isRecording: isRecording,
+//    macros: Dictionary(macros: macros),
+//    operation: operation
+//  )
+//}
+//
 //// MARK: Deprecated after 0.1.0
 //
 //@available(*, deprecated, message: "Re-record this assertion")
@@ -16,20 +129,27 @@
 //  record isRecording: Bool? = nil,
 //  of originalSource: () throws -> String,
 //  matches expandedOrDiagnosedSource: () -> String,
-//  file: StaticString = #filePath,
+//  fileID: StaticString = #fileID,
+//  file filePath: StaticString = #filePath,
 //  function: StaticString = #function,
 //  line: UInt = #line,
 //  column: UInt = #column
 //) {
-//  guard isRecording ?? MacroTestingConfiguration.current.isRecording else {
-//    XCTFail("Re-record this assertion", file: file, line: line)
+//  guard isRecording ?? (SnapshotTestingConfiguration.current?.record == .all) else {
+//    recordIssue(
+//      "Re-record this assertion",
+//      fileID: fileID,
+//      filePath: filePath,
+//      line: line,
+//      column: column
+//    )
 //    return
 //  }
 //  assertMacro(
 //    macros,
 //    record: true,
 //    of: originalSource,
-//    file: file,
+//    file: filePath,
 //    function: function,
 //    line: line,
 //    column: column
@@ -42,7 +162,8 @@
 //  record isRecording: Bool? = nil,
 //  of originalSource: () throws -> String,
 //  matches expandedOrDiagnosedSource: () -> String,
-//  file: StaticString = #filePath,
+//  fileID: StaticString = #fileID,
+//  file filePath: StaticString = #filePath,
 //  function: StaticString = #function,
 //  line: UInt = #line,
 //  column: UInt = #column
@@ -52,7 +173,8 @@
 //    record: isRecording,
 //    of: originalSource,
 //    matches: expandedOrDiagnosedSource,
-//    file: file,
+//    fileID: fileID,
+//    file: filePath,
 //    function: function,
 //    line: line,
 //    column: column
@@ -68,12 +190,19 @@
 //  record isRecording: Bool? = nil,
 //  of originalSource: () throws -> String,
 //  matches expandedOrDiagnosedSource: () -> String,
-//  file: StaticString = #filePath,
+//  fileID: StaticString = #fileID,
+//  file filePath: StaticString = #filePath,
 //  function: StaticString = #function,
 //  line: UInt = #line,
 //  column: UInt = #column
 //) {
-//  XCTFail("Delete 'matches' and re-record this assertion", file: file, line: line)
+//  recordIssue(
+//    "Delete 'matches' and re-record this assertion",
+//    fileID: fileID,
+//    filePath: filePath,
+//    line: line,
+//    column: column
+//  )
 //}
 //
 //@available(
@@ -85,7 +214,8 @@
 //  record isRecording: Bool? = nil,
 //  of originalSource: () throws -> String,
 //  matches expandedOrDiagnosedSource: () -> String,
-//  file: StaticString = #filePath,
+//  fileID: StaticString = #fileID,
+//  file filePath: StaticString = #filePath,
 //  function: StaticString = #function,
 //  line: UInt = #line,
 //  column: UInt = #column
@@ -96,7 +226,8 @@
 //    record: isRecording,
 //    of: originalSource,
 //    matches: expandedOrDiagnosedSource,
-//    file: file,
+//    fileID: fileID,
+//    file: filePath,
 //    function: function,
 //    line: line,
 //    column: column