D.R.Y. (again)

Author: grynspan

Sources/TestingMacros/Support/Additions/FunctionDeclSyntaxAdditions.swift

@@ -87,7 +87,7 @@ extension FunctionDeclSyntax {
   var xcTestCompatibleSelector: ObjCSelectorPieceListSyntax? {
     // First, look for an @objc attribute with an explicit selector, and use
     // that if found.
-    if objcAttribute = firstAttribute(named: "objc"),
+    if let objcAttribute = attributes(named: "objc", inModuleNamed: "Swift").first,
        case let .objCName(objCName) = objcAttribute.arguments {
       if true == objCName.first?.name?.textWithoutBackticks.hasPrefix("test") {
         return objCName

Sources/TestingMacros/Support/Additions/WithAttributesSyntaxAdditions.swift

@@ -102,33 +102,16 @@ extension WithAttributesSyntax {
     }
   }
 
-  /// Find the first attribute on this syntax node with the given name.
-  ///
-  /// - Parameters:
-  ///   - name: The name of the attribute to search for.
-  ///
-  /// - Returns: The first `AttributeSyntax` node on `self` with the given name,
-  ///   or `nil` if none was found.
-  func firstAttribute(named name: String) -> AttributeSyntax? {
-    attributes.lazy
-      .compactMap { attribute in
-        if case let .attribute(attribute) = attribute {
-          return attribute
-        }
-        return nil
-      }.first { $0.attributeNameText == name }
-  }
-
   /// The first `@available(*, noasync)` or `@_unavailableFromAsync` attribute
   /// on this instance, if any.
   var noasyncAttribute: AttributeSyntax? {
     availability(when: .noasync).first?.attribute
-      ?? firstAttribute(named: "_unavailableFromAsync")
+      ?? attributes(named: "_unavailableFromAsync", inModuleNamed: "Swift").first
   }
 
   /// The first `@_unavailableInEmbedded` attribute on this instance, if any.
   var noembeddedAttribute: AttributeSyntax? {
-    firstAttribute(named: "_unavailableInEmbedded")
+    attributes(named: "_unavailableInEmbedded", inModuleNamed: "Swift").first
   }
 
   /// Find all attributes on this node, if any, with the given name.

Tests/TestingTests/RunnerTests.swift

@@ -827,7 +827,11 @@ final class RunnerTests: XCTestCase {
 
   func testUnavailableInEmbeddedAttribute() async throws {
     let testStarted = expectation(description: "Test started")
+#if !hasFeature(Embedded)
     testStarted.expectedFulfillmentCount = 3
+#else
+    testStarted.isInverted = true
+#endif
     var configuration = Configuration()
     configuration.eventHandler = { event, _ in
       if case .testStarted = event.kind {