Make raise available in Option.catch (#3481)

arrow-kt · Sep 10, 2024 · 8ff3beb · 8ff3beb
1 parent 4843a5d
commit 8ff3beb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/arrow-libs/core/arrow-core/api/arrow-core.api b/arrow-libs/core/arrow-core/api/arrow-core.api
@@ -597,15 +597,15 @@ public abstract class arrow/core/Option {
 	public final fun toEither (Lkotlin/jvm/functions/Function0;)Larrow/core/Either;
 	public final fun toList ()Ljava/util/List;
 	public fun toString ()Ljava/lang/String;
-	public static final fun tryCatch (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)Larrow/core/Option;
-	public static final fun tryCatchOrNone (Lkotlin/jvm/functions/Function0;)Larrow/core/Option;
+	public static final fun tryCatch (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Larrow/core/Option;
+	public static final fun tryCatchOrNone (Lkotlin/jvm/functions/Function1;)Larrow/core/Option;
 }
 
 public final class arrow/core/Option$Companion {
 	public final fun fromNullable (Ljava/lang/Object;)Larrow/core/Option;
 	public final fun invoke (Ljava/lang/Object;)Larrow/core/Option;
-	public final fun tryCatch (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;)Larrow/core/Option;
-	public final fun tryCatchOrNone (Lkotlin/jvm/functions/Function0;)Larrow/core/Option;
+	public final fun tryCatch (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Larrow/core/Option;
+	public final fun tryCatchOrNone (Lkotlin/jvm/functions/Function1;)Larrow/core/Option;
 }
 
 public final class arrow/core/OptionKt {

diff --git a/arrow-libs/core/arrow-core/api/arrow-core.klib.api b/arrow-libs/core/arrow-core/api/arrow-core.klib.api
@@ -646,8 +646,8 @@ sealed class <#A: out kotlin/Any?> arrow.core/Option { // arrow.core/Option|null
     final object Companion { // arrow.core/Option.Companion|null[0]
         final fun <#A2: kotlin/Any?> fromNullable(#A2?): arrow.core/Option<#A2> // arrow.core/Option.Companion.fromNullable|fromNullable(0:0?){0§<kotlin.Any?>}[0]
         final fun <#A2: kotlin/Any?> invoke(#A2): arrow.core/Option<#A2> // arrow.core/Option.Companion.invoke|invoke(0:0){0§<kotlin.Any?>}[0]
-        final inline fun <#A2: kotlin/Any?> catch(kotlin/Function0<#A2>): arrow.core/Option<#A2> // arrow.core/Option.Companion.catch|catch(kotlin.Function0<0:0>){0§<kotlin.Any?>}[0]
-        final inline fun <#A2: kotlin/Any?> catch(kotlin/Function1<kotlin/Throwable, arrow.core/Option<#A2>>, kotlin/Function0<#A2>): arrow.core/Option<#A2> // arrow.core/Option.Companion.catch|catch(kotlin.Function1<kotlin.Throwable,arrow.core.Option<0:0>>;kotlin.Function0<0:0>){0§<kotlin.Any?>}[0]
+        final inline fun <#A2: kotlin/Any?> catch(kotlin/Function1<arrow.core.raise/SingletonRaise<arrow.core/None>, #A2>): arrow.core/Option<#A2> // arrow.core/Option.Companion.catch|catch(kotlin.Function1<arrow.core.raise.SingletonRaise<arrow.core.None>,0:0>){0§<kotlin.Any?>}[0]
+        final inline fun <#A2: kotlin/Any?> catch(kotlin/Function1<kotlin/Throwable, arrow.core/Option<#A2>>, kotlin/Function1<arrow.core.raise/SingletonRaise<arrow.core/None>, #A2>): arrow.core/Option<#A2> // arrow.core/Option.Companion.catch|catch(kotlin.Function1<kotlin.Throwable,arrow.core.Option<0:0>>;kotlin.Function1<arrow.core.raise.SingletonRaise<arrow.core.None>,0:0>){0§<kotlin.Any?>}[0]
     }
 }
 

diff --git a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/Option.kt b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/Option.kt
@@ -5,6 +5,7 @@ import arrow.core.raise.EagerEffect
 import arrow.core.raise.Effect
 import arrow.core.raise.SingletonRaise
 import arrow.core.raise.option
+import arrow.core.raise.recover
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
@@ -309,23 +310,19 @@ public sealed class Option<out A> {
     /**
      * Ignores exceptions and returns None if one is thrown
      */
-    public inline fun <A> catch(f: () -> A): Option<A> {
+    public inline fun <A> catch(f: SingletonRaise<None>.() -> A): Option<A> {
       contract { callsInPlace(f, InvocationKind.AT_MOST_ONCE) }
       return catch({ None }, f)
     }
 
     @JvmStatic
     @JvmName("tryCatch")
-    public inline fun <A> catch(recover: (Throwable) -> Option<A>, f: () -> A): Option<A> {
+    public inline fun <A> catch(recover: (Throwable) -> Option<A>, f: SingletonRaise<None>.() -> A): Option<A> {
       contract {
         callsInPlace(f, InvocationKind.AT_MOST_ONCE)
         callsInPlace(recover, InvocationKind.AT_MOST_ONCE)
       }
-      return try {
-        Some(f())
-      } catch (t: Throwable) {
-        recover(t.nonFatalOrThrow())
-      }
+      return recover({ f(SingletonRaise(this)).some() }, { None }, recover)
     }
   }