From 826aec7bdd307ae853f3c66b8e0f7821b0557b33 Mon Sep 17 00:00:00 2001
From: John Szumski <jszumski@squareup.com>
Date: Thu, 18 Sep 2025 22:04:16 -0700
Subject: [PATCH] Fix Xcode 26 warnings in sources copied from
 ComposableArchitecture that use SwiftSyntax and add dependencies to
 IssueReporting in modules that import it in tests

---
 Package.swift                                 | 19 +++++++--
 .../Sources/Derived/Extensions.swift          | 40 +++++++++----------
 .../Derived/ObservableStateMacro.swift        |  5 ++-
 3 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/Package.swift b/Package.swift
index 37e0222f6..a82278905 100644
--- a/Package.swift
+++ b/Package.swift
@@ -76,6 +76,7 @@ let package = Package(
             dependencies: [
                 "Workflow",
                 .product(name: "CustomDump", package: "swift-custom-dump"),
+                .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
             ],
             path: "WorkflowTesting/Sources",
             linkerSettings: [.linkedFramework("XCTest")]
@@ -144,7 +145,11 @@ let package = Package(
         ),
         .target(
             name: "WorkflowRxSwiftTesting",
-            dependencies: ["WorkflowRxSwift", "WorkflowTesting"],
+            dependencies: [
+                "WorkflowRxSwift",
+                "WorkflowTesting",
+                .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
+            ],
             path: "WorkflowRxSwift/Testing",
             linkerSettings: [.linkedFramework("XCTest")]
         ),
@@ -158,7 +163,11 @@ let package = Package(
         ),
         .target(
             name: "WorkflowCombineTesting",
-            dependencies: ["WorkflowCombine", "WorkflowTesting"],
+            dependencies: [
+                "WorkflowCombine",
+                "WorkflowTesting",
+                .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
+            ],
             path: "WorkflowCombine/Testing",
             linkerSettings: [.linkedFramework("XCTest")]
         ),
@@ -172,7 +181,11 @@ let package = Package(
         ),
         .target(
             name: "WorkflowConcurrencyTesting",
-            dependencies: ["WorkflowConcurrency", "WorkflowTesting"],
+            dependencies: [
+                "WorkflowConcurrency",
+                "WorkflowTesting",
+                .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
+            ],
             path: "WorkflowConcurrency/Testing",
             linkerSettings: [.linkedFramework("XCTest")]
         ),
diff --git a/WorkflowSwiftUIMacros/Sources/Derived/Extensions.swift b/WorkflowSwiftUIMacros/Sources/Derived/Extensions.swift
index 0595241e0..3abc22a4f 100644
--- a/WorkflowSwiftUIMacros/Sources/Derived/Extensions.swift
+++ b/WorkflowSwiftUIMacros/Sources/Derived/Extensions.swift
@@ -1,5 +1,5 @@
 // Derived from
-// https://github.com/pointfreeco/swift-composable-architecture/blob/1.12.1/Sources/ComposableArchitectureMacros/Extensions.swift
+// https://github.com/pointfreeco/swift-composable-architecture/blob/1.22.3/Sources/ComposableArchitectureMacros/Extensions.swift
 
 //===----------------------------------------------------------------------===//
 //
@@ -43,10 +43,7 @@ extension VariableDeclSyntax {
     }
 
     func accessorsMatching(_ predicate: (TokenKind) -> Bool) -> [AccessorDeclSyntax] {
-        let patternBindings = bindings.compactMap { binding in
-            binding.as(PatternBindingSyntax.self)
-        }
-        let accessors: [AccessorDeclListSyntax.Element] = patternBindings.compactMap { patternBinding in
+        let accessors: [AccessorDeclListSyntax.Element] = bindings.compactMap { patternBinding in
             switch patternBinding.accessorBlock?.accessors {
             case .accessors(let accessors):
                 accessors
@@ -54,16 +51,7 @@ extension VariableDeclSyntax {
                 nil
             }
         }.flatMap { $0 }
-        return accessors.compactMap { accessor in
-            guard let decl = accessor.as(AccessorDeclSyntax.self) else {
-                return nil
-            }
-            if predicate(decl.accessorSpecifier.tokenKind) {
-                return decl
-            } else {
-                return nil
-            }
-        }
+        return accessors.compactMap { predicate($0.accessorSpecifier.tokenKind) ? $0 : nil }
     }
 
     var willSetAccessors: [AccessorDeclSyntax] {
@@ -152,7 +140,7 @@ extension TypeSyntax {
                 genericParameters[parameter.name.text] = parameter.inheritedType
             }
         }
-        var iterator = asProtocol(TypeSyntaxProtocol.self).tokens(viewMode: .sourceAccurate)
+        var iterator = asProtocol((any TypeSyntaxProtocol).self).tokens(viewMode: .sourceAccurate)
             .makeIterator()
         guard let base = iterator.next() else {
             return nil
@@ -233,7 +221,7 @@ extension DeclGroupSyntax {
     var memberFunctionStandins: [FunctionDeclSyntax.SignatureStandin] {
         var standins = [FunctionDeclSyntax.SignatureStandin]()
         for member in memberBlock.members {
-            if let function = member.as(MemberBlockItemSyntax.self)?.decl.as(FunctionDeclSyntax.self) {
+            if let function = member.decl.as(FunctionDeclSyntax.self) {
                 standins.append(function.signatureStandin)
             }
         }
@@ -242,7 +230,7 @@ extension DeclGroupSyntax {
 
     func hasMemberFunction(equvalentTo other: FunctionDeclSyntax) -> Bool {
         for member in memberBlock.members {
-            if let function = member.as(MemberBlockItemSyntax.self)?.decl.as(FunctionDeclSyntax.self) {
+            if let function = member.decl.as(FunctionDeclSyntax.self) {
                 if function.isEquivalent(to: other) {
                     return true
                 }
@@ -253,7 +241,7 @@ extension DeclGroupSyntax {
 
     func hasMemberProperty(equivalentTo other: VariableDeclSyntax) -> Bool {
         for member in memberBlock.members {
-            if let variable = member.as(MemberBlockItemSyntax.self)?.decl.as(VariableDeclSyntax.self) {
+            if let variable = member.decl.as(VariableDeclSyntax.self) {
                 if variable.isEquivalent(to: other) {
                     return true
                 }
@@ -264,7 +252,7 @@ extension DeclGroupSyntax {
 
     var definedVariables: [VariableDeclSyntax] {
         memberBlock.members.compactMap { member in
-            if let variableDecl = member.as(MemberBlockItemSyntax.self)?.decl.as(VariableDeclSyntax.self) {
+            if let variableDecl = member.decl.as(VariableDeclSyntax.self) {
                 return variableDecl
             }
             return nil
@@ -300,3 +288,15 @@ extension DeclGroupSyntax {
         self.is(StructDeclSyntax.self)
     }
 }
+
+extension AttributedTypeSyntax {
+    var isInout: Bool {
+        #if canImport(SwiftSyntax600)
+        specifiers.contains(
+            where: { $0.as(SimpleTypeSpecifierSyntax.self)?.specifier.tokenKind == .keyword(.inout) }
+        ) == true
+        #else
+        specifier?.tokenKind == .keyword(.inout)
+        #endif
+    }
+}
diff --git a/WorkflowSwiftUIMacros/Sources/Derived/ObservableStateMacro.swift b/WorkflowSwiftUIMacros/Sources/Derived/ObservableStateMacro.swift
index e8b58b5a3..bb73b44f8 100644
--- a/WorkflowSwiftUIMacros/Sources/Derived/ObservableStateMacro.swift
+++ b/WorkflowSwiftUIMacros/Sources/Derived/ObservableStateMacro.swift
@@ -16,9 +16,12 @@ import SwiftDiagnostics
 import SwiftOperators
 import SwiftSyntax
 import SwiftSyntaxBuilder
-import SwiftSyntaxMacroExpansion
 import SwiftSyntaxMacros
 
+#if !canImport(SwiftSyntax600)
+import SwiftSyntaxMacroExpansion
+#endif
+
 public enum ObservableStateMacro {
     static let moduleName = "WorkflowSwiftUI"