Check cancellation for task

pointfreeco · Jan 16, 2025 · 23eb7bc · 23eb7bc
1 parent 48795d9
commit 23eb7bc
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Sources/ComposableArchitecture/Effects/Cancellation.swift b/Sources/ComposableArchitecture/Effects/Cancellation.swift
@@ -178,7 +178,11 @@ extension Effect {
         if cancelInFlight {
           $0.cancel(id: id, path: navigationIDPath)
         }
-        let task = Task { try await operation() }
+        let task = Task {
+          let result = try await operation()
+          try Task.checkCancellation()
+          return result
+        }
         let cancellable = AnyCancellable { task.cancel() }
         $0.insert(cancellable, at: id, path: navigationIDPath)
         return (cancellable, task)
@@ -209,7 +213,11 @@ extension Effect {
         if cancelInFlight {
           $0.cancel(id: id, path: navigationIDPath)
         }
-        let task = Task { try await operation() }
+        let task = Task {
+          let result = try await operation()
+          try Task.checkCancellation()
+          return result
+        }
         let cancellable = AnyCancellable { task.cancel() }
         $0.insert(cancellable, at: id, path: navigationIDPath)
         return (cancellable, task)