Fix compilation error with UniTask

hadashiA · Jun 16, 2024 · 21dd1bb · 21dd1bb
1 parent 5ec983c
commit 21dd1bb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/VContainer/Assets/VContainer/Runtime/Annotations/IAsyncStartable.cs b/VContainer/Assets/VContainer/Runtime/Annotations/IAsyncStartable.cs
@@ -1,8 +1,8 @@
 using System.Threading;
-#if UNITY_2023_1_OR_NEWER
-using UnityEngine;
-#elif VCONTAINER_UNITASK_INTEGRATION
+#if VCONTAINER_UNITASK_INTEGRATION
 using Awaitable = Cysharp.Threading.Tasks.UniTask;
+#elif UNITY_2023_1_OR_NEWER
+using UnityEngine;
 #else
 using Awaitable = System.Threading.Tasks.Task;
 #endif

diff --git a/VContainer/Assets/VContainer/Runtime/Unity/PlayerLoopItem.cs b/VContainer/Assets/VContainer/Runtime/Unity/PlayerLoopItem.cs
@@ -311,30 +311,29 @@ public bool MoveNext()
 #if VCONTAINER_UNITASK_INTEGRATION
                 var task = x.StartAsync(cts.Token);
                 if (exceptionHandler != null)
+                {
                     task.Forget(ex => exceptionHandler.Publish(ex));
+                }
                 else
+                {
                     task.Forget();
+                }
 #else
-                InvokeStartAsync(x);
+                try
+                {
+                    var task = x.StartAsync(cts.Token);
+                    _ = task.Forget(exceptionHandler);
+                }
+                catch (Exception ex)
+                {
+                    if (exceptionHandler == null) throw;
+                    exceptionHandler.Publish(ex);
+                }
 #endif
             }
             return false;
         }
 
-        private void InvokeStartAsync(IAsyncStartable x)
-        {
-            try
-            {
-                var task = x.StartAsync(cts.Token);
-                _ = task.Forget(exceptionHandler);
-            }
-            catch (Exception ex)
-            {
-                if (exceptionHandler == null) throw;
-                exceptionHandler.Publish(ex);
-            }
-        }
-
         public void Dispose()
         {
             lock (entries)