Merge branch 'main' into orm

# Conflicts:
#	Sources/SnapshotTesting/AssertSnapshot.swift

.editorconfig

@@ -0,0 +1,9 @@
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true

Package.resolved

@@ -3,10 +3,10 @@
     {
       "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" : "4c6cc0a3b9e8f14b3ae2307c5ccae4de6167ac2c",
+        "version" : "600.0.0-prerelease-2024-06-12"
       }
     }
   ],

Package.swift

@@ -21,7 +21,7 @@ let package = Package(
     ),
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax", "508.0.1"..<"601.0.0")
+    .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"601.0.0-prerelease")
   ],
   targets: [
     .target(

README.md

@@ -46,16 +46,28 @@ Repeat test runs will load this reference and compare it with the runtime value.
 match, the test will fail and describe the difference. Failures can be inspected from Xcode's Report
 Navigator or by inspecting the file URLs of the failure.
 
-You can record a new reference by setting the `record` parameter to `true` on the assertion or
-setting `isRecording` globally.
+You can record a new reference by customizing snapshots inline with the assertion, or using the
+`withSnapshotTesting` tool:
 
-``` swift
-assertSnapshot(of: vc, as: .image, record: true)
-
-// or globally
+```swift
+// Record just this one snapshot
+assertSnapshot(of: vc, as: .image, record: .all)
+
+// Record all snapshots in a scope:
+withSnapshotTesting(record: .all) {
+  assertSnapshot(of: vc1, as: .image)
+  assertSnapshot(of: vc2, as: .image)
+  assertSnapshot(of: vc3, as: .image)
+}
 
-isRecording = true
-assertSnapshot(of: vc, as: .image)
+// Record all snapshots in an XCTestCase subclass:
+class FeatureTests: XCTestCase {
+  override func invokeTest() {
+    withSnapshotTesting(record: .all) {
+      super.invokeTest()
+    }
+  }
+}
 ```
 
 ## Snapshot Anything
@@ -218,9 +230,9 @@ targets: [
   - **`Codable` support**. Snapshot encodable data structures into their JSON and property list
     representations.
   - **Custom diff tool integration**. Configure failure messages to print diff commands for
-    [Kaleidoscope](https://kaleidoscope.app) (or your diff tool of choice).
+    [Kaleidoscope](https://kaleidoscope.app) or your diff tool of choice.
     ``` swift
-    SnapshotTesting.diffTool = "ksdiff"
+    SnapshotTesting.diffToolCommand = { "ksdiff \($0) \($1)" }
     ```
 
 [available-strategies]: https://swiftpackageindex.com/pointfreeco/swift-snapshot-testing/main/documentation/snapshottesting/snapshotting