Merge pull request #3064 from armanbilge/fix/syncstep-uncancelable

Handle `Uncancelable` and `OnCancel` in `syncStep` interpreter
typelevel · Jul 7, 2022 · 07359bb · 07359bb
2 parents 7887b34 + 173c899
commit 07359bb
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/core/shared/src/main/scala/cats/effect/IO.scala b/core/shared/src/main/scala/cats/effect/IO.scala
@@ -869,6 +869,13 @@ sealed abstract class IO[+A] private () extends IOPlatform[A] {
             }
             .handleErrorWith(t => interpret(f(t)))
 
+        case IO.Uncancelable(body, _) =>
+          interpret(body(new Poll[IO] {
+            def apply[C](ioc: IO[C]): IO[C] = ioc
+          }))
+
+        case IO.OnCancel(ioa, _) => interpret(ioa)
+
         case _ => SyncIO.pure(Left(io))
       }
 

diff --git a/tests/shared/src/test/scala/cats/effect/IOSpec.scala b/tests/shared/src/test/scala/cats/effect/IOSpec.scala
@@ -1454,6 +1454,31 @@ class IOSpec extends BaseSpec with Discipline with IOPlatformSpecification {
           io must completeAs(())
           i must beEqualTo(1)
       }
+
+      "handle uncancelable" in {
+        val sio = IO.unit.uncancelable.syncStep
+        sio.map(_.bimap(_ => (), _ => ())) must completeAsSync(Right(()))
+      }
+
+      "handle onCancel" in {
+        val sio = IO.unit.onCancel(IO.unit).syncStep
+        sio.map(_.bimap(_ => (), _ => ())) must completeAsSync(Right(()))
+      }
+
+      "synchronously allocate a vanilla resource" in {
+        val sio = Resource.make(IO.unit)(_ => IO.unit).allocated.map(_._1).syncStep
+        sio.map(_.bimap(_ => (), _ => ())) must completeAsSync(Right(()))
+      }
+
+      "synchronously allocate a evalMapped resource" in {
+        val sio = Resource
+          .make(IO.unit)(_ => IO.unit)
+          .evalMap(_ => IO.unit)
+          .allocated
+          .map(_._1)
+          .syncStep
+        sio.map(_.bimap(_ => (), _ => ())) must completeAsSync(Right(()))
+      }
     }
 
     "fiber repeated yielding test" in real {