From ec0123eec7410fb2963fc7d5ceb505d95ed60c81 Mon Sep 17 00:00:00 2001
From: neuecc <ils@neue.cc>
Date: Fri, 22 May 2020 21:42:23 +0900
Subject: [PATCH] rename UniTask.VoidAction -> UniTask.Action,
 UniTask.VoidUnityAction -> UniTask.UnityAction, there return type
 Func<UniTask> -> Func<UniTaskVoid>

---
 .../UniTask/Runtime/UniTask.Factory.cs        | 59 +++++++++++++++----
 src/UniTask/Assets/Scenes/SandboxMain.cs      | 13 +++-
 2 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.Factory.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.Factory.cs
index 75e3cea..4a4d953 100644
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.Factory.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.Factory.cs
@@ -105,34 +105,67 @@ namespace Cysharp.Threading.Tasks
         /// helper of create add UniTaskVoid to delegate.
         /// For example: FooEvent += () => UniTask.Void(async () => { /* */ })
         /// </summary>
-        public static void Void(Func<UniTask> asyncAction)
+        public static void Void(Func<UniTaskVoid> asyncAction)
         {
             asyncAction().Forget();
         }
 
-        public static Action VoidAction(Func<UniTask> asyncAction)
+        /// <summary>
+        /// helper of create add UniTaskVoid to delegate.
+        /// </summary>
+        public static void Void(Func<CancellationToken, UniTaskVoid> asyncAction, CancellationToken cancellationToken)
         {
-            return () => Void(asyncAction);
+            asyncAction(cancellationToken).Forget();
         }
 
-#if UNITY_2018_3_OR_NEWER
-
-        public static UnityEngine.Events.UnityAction VoidUnityAction(Func<UniTask> asyncAction)
-        {
-            return () => Void(asyncAction);
-        }
-
-#endif
-
         /// <summary>
         /// helper of create add UniTaskVoid to delegate.
         /// For example: FooEvent += (sender, e) => UniTask.Void(async arg => { /* */ }, (sender, e))
         /// </summary>
-        public static void Void<T>(Func<T, UniTask> asyncAction, T state)
+        public static void Void<T>(Func<T, UniTaskVoid> asyncAction, T state)
         {
             asyncAction(state).Forget();
         }
 
+        /// <summary>
+        /// helper of create add UniTaskVoid to delegate.
+        /// For example: FooAction = UniTask.Action(async () => { /* */ })
+        /// </summary>
+        public static Action Action(Func<UniTaskVoid> asyncAction)
+        {
+            return () => asyncAction().Forget();
+        }
+
+        /// <summary>
+        /// helper of create add UniTaskVoid to delegate.
+        /// </summary>
+        public static Action Action(Func<CancellationToken, UniTaskVoid> asyncAction, CancellationToken cancellationToken)
+        {
+            return () => asyncAction(cancellationToken).Forget();
+        }
+
+#if UNITY_2018_3_OR_NEWER
+
+        /// <summary>
+        /// Create async void(UniTaskVoid) UnityAction.
+        /// For exampe: onClick.AddListener(UniTask.UnityAction(async () => { /* */ } ))
+        /// </summary>
+        public static UnityEngine.Events.UnityAction UnityAction(Func<UniTaskVoid> asyncAction)
+        {
+            return () => asyncAction().Forget();
+        }
+
+        /// <summary>
+        /// Create async void(UniTaskVoid) UnityAction.
+        /// For exampe: onClick.AddListener(UniTask.UnityAction(FooAsync, this.GetCancellationTokenOnDestroy()))
+        /// </summary>
+        public static UnityEngine.Events.UnityAction UnityAction(Func<CancellationToken, UniTaskVoid> asyncAction, CancellationToken cancellationToken)
+        {
+            return () => asyncAction(cancellationToken).Forget();
+        }
+
+#endif
+
         /// <summary>
         /// Defer the task creation just before call await.
         /// </summary>
diff --git a/src/UniTask/Assets/Scenes/SandboxMain.cs b/src/UniTask/Assets/Scenes/SandboxMain.cs
index 9898ae7..64a4e35 100644
--- a/src/UniTask/Assets/Scenes/SandboxMain.cs
+++ b/src/UniTask/Assets/Scenes/SandboxMain.cs
@@ -142,7 +142,7 @@ public class SandboxMain : MonoBehaviour
     {
         // State<int> Hp { get; }
 
-        
+
 
 
         public Model()
@@ -173,7 +173,7 @@ public class SandboxMain : MonoBehaviour
 
     void Start2()
     {
-        
+
     }
 
 
@@ -260,7 +260,7 @@ public class SandboxMain : MonoBehaviour
 
 
 
-        
+
 
 
         okButton.OnClickAsAsyncEnumerable().ForEachAsync(_ =>
@@ -277,6 +277,13 @@ public class SandboxMain : MonoBehaviour
             this.mcc = null;
         });
 
+
+        okButton.onClick.AddListener(UniTask.UnityAction(async () => await UniTask.Yield()));
+    }
+
+    async UniTaskVoid CloseAsync(CancellationToken cancellationToken = default)
+    {
+        await UniTask.Yield();
     }
 
     async UniTaskVoid CheckDest()