Assembly Defination + async fix

Author: Dimonik333

Assets/CatCode/Commands/CatCode.Commands.asmdef

@@ -0,0 +1,14 @@
+{
+    "name": "CatCode.Commands",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/CatCode/Commands/CatCode.Commands.asmdef.meta

@@ -4,57 +4,61 @@
 
 namespace CatCode.Commands
 {
-    public static class AsyncCommandExtensions
+    public static class CommandAsyncExtensions
     {
         public static Awaitable StartedToAwaitable(this ICommand command, CancellationToken token)
         {
             var tcs = new AwaitableCompletionSource();
+            CancellationTokenRegistration ctr = default;
+
             if (command.State > CommandState.Idle)
-            {
                 tcs.SetResult();
-            }
             else
             {
-                var cts = token.Register(OnCancel);
+                ctr = token.Register(OnCancel);
                 command.Started += OnStarted;
             }
             return tcs.Awaitable;
 
             void OnStarted()
             {
                 command.Started -= OnStarted;
+                ctr.Dispose();
                 tcs.TrySetResult();
             }
 
             void OnCancel()
             {
                 command.Started -= OnStarted;
+                ctr.Dispose();
                 tcs.TrySetCanceled();
             }
         }
 
         public static Awaitable FinishToAwaitable(this ICommand command, CancellationToken token)
         {
             var tcs = new AwaitableCompletionSource();
+            CancellationTokenRegistration ctr = default;
+
             if (command.State == CommandState.Finished)
-            {
                 tcs.SetResult();
-            }
             else
             {
-                var ctr = token.Register(OnCancel);
+                ctr = token.Register(OnCancel);
                 command.Finished += OnFinished;
             }
             return tcs.Awaitable;
 
             void OnFinished()
             {
                 command.Finished -= OnFinished;
+                ctr.Dispose();
                 tcs.TrySetResult();
             }
             void OnCancel()
             {
                 command.Finished -= OnFinished;
+                ctr.Dispose();
                 tcs.TrySetCanceled();
             }
         }
@@ -64,21 +68,23 @@ public static Task StartToTask(this ICommand command, CancellationToken token)
         {
             if (command.State > CommandState.Idle)
                 return Task.CompletedTask;
-
             var tcs = new TaskCompletionSource<bool>();
-            var ctr = token.Register(OnCancel);
+            CancellationTokenRegistration ctr = default;
+            ctr = token.Register(OnCancel);
             command.Started += OnStarted;
             return tcs.Task;
 
             void OnStarted()
             {
                 command.Started -= OnStarted;
+                ctr.Dispose();
                 tcs.TrySetResult(true);
             }
 
             void OnCancel()
             {
                 command.Started -= OnStarted;
+                ctr.Dispose();
                 tcs.TrySetCanceled();
             }
         }
@@ -87,20 +93,23 @@ public static Task FinishToTask(this ICommand command, CancellationToken token)
         {
             if (command.State == CommandState.Finished)
                 return Task.CompletedTask;
-            
+
             var tcs = new TaskCompletionSource<bool>();
-            var ctr = token.Register(OnCancel);
+            CancellationTokenRegistration ctr = default;
+            ctr = token.Register(OnCancel);
             command.Finished += OnFinished;
             return tcs.Task;
 
             void OnFinished()
             {
                 command.Finished -= OnFinished;
+                ctr.Dispose();
                 tcs.TrySetResult(true);
             }
             void OnCancel()
             {
                 command.Finished -= OnFinished;
+                ctr.Dispose();
                 tcs.TrySetCanceled();
             }
         }