fixes #176

needed to use the DefaultValue attribute on the Zero member of the CEs
demystifyfp · Apr 15, 2022 · c39d071 · c39d071
1 parent 13e2d7b
commit c39d071
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/src/FsToolkit.ErrorHandling.TaskResult/TaskOptionCE.fs b/src/FsToolkit.ErrorHandling.TaskResult/TaskOptionCE.fs
@@ -514,8 +514,12 @@ type TaskOptionBuilderBase() =
         TaskOptionCode<'TOverall, 'T>(fun sm -> (generator ()).Invoke(&sm))
 
     /// Used to represent no-ops like the implicit empty "else" branch of an "if" expression.
-    // [<DefaultValue>] // TODO: Figureout if this attribute is needed, without it it allows tests to pass with implicit else branches resulting in `Some ()`
-    member inline _.Zero<'TOverall>() : TaskOptionCode<'TOverall, unit> = ResumableCode.Zero()
+    [<DefaultValue>] // TODO: Figureout if this attribute is needed, without it it allows tests to pass with implicit else branches resulting in `Some ()`
+    member inline _.Zero<'TOverall>() : TaskOptionCode<'TOverall, unit> = 
+        TaskOptionCode<_, _>
+            (fun sm ->
+                sm.Data.Result <- ValueSome(Some Unchecked.defaultof<'TOverall>)
+                true)
 
     member inline _.Return(value: 'T) : TaskOptionCode<'T, 'T> =
         TaskOptionCode<'T, _>

diff --git a/src/FsToolkit.ErrorHandling.TaskResult/TaskResultCE.fs b/src/FsToolkit.ErrorHandling.TaskResult/TaskResultCE.fs
@@ -544,7 +544,7 @@ type TaskResultBuilderBase() =
         TaskResultCode<'TOverall, 'Error, 'T>(fun sm -> (generator ()).Invoke(&sm))
 
     /// Used to represent no-ops like the implicit empty "else" branch of an "if" expression.
-    // [<DefaultValue>] // TODO: Figureout if this attribute is needed, without it it allows tests to pass with implicit else branches resulting in `Some ()`
+    [<DefaultValue>]
     member inline _.Zero<'TOverall, 'Error>() : TaskResultCode<'TOverall, 'Error, unit> = ResumableCode.Zero()
 
     member inline _.Return(value: 'T) : TaskResultCode<'T, 'Error, 'T> =

diff --git a/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskOptionCE.fs b/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskOptionCE.fs
@@ -234,6 +234,17 @@ let ceTests =
 
                   Expect.equal actual (Some data) "Should be ok"
               }
+          testCaseTask "If do!" <| fun () -> task {
+              let data = 42
+
+              let taskRes (call : unit -> Task) maybeCall : Task<Option<int>>= taskOption {
+                if true then
+                    do! call ()
+
+                let! (res: string) = maybeCall (): Task<Option<string>>
+                return data }
+              ()
+          }
           testCaseTask "Try With"
           <| fun () ->
               task {

diff --git a/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskResultCE.fs b/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskResultCE.fs
@@ -278,7 +278,20 @@ let ``TaskResultCE combine/zero/delay/run Tests`` =
                       }
 
                   Expect.equal actual (Result.Ok data) "Should be ok"
-              } ]
+              }
+          testCaseTask "If do!" <| fun () -> task {
+              let data = 42
+
+              let taskRes (call : unit -> Task) maybeCall : Task<Result<int,unit>>= taskResult {
+                if true then
+                    do! call ()
+
+                let! (res: string) = maybeCall (): Task<Result<string, unit>>
+                return data }
+              ()
+          }
+
+        ]