Fix erroneous throw on remainder error

csmir · Nov 15, 2024 · 92d95ab · 92d95ab
1 parent 4d2cb48
commit 92d95ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/src/Commands/Core/ExecutionUtilities.cs b/src/Commands/Core/ExecutionUtilities.cs
@@ -183,15 +183,6 @@ public static async ValueTask<InvokeResult> HandleReturnType<T>(this CommandInfo
                             }
                         }
 
-                        return InvokeResult.FromSuccess(command);
-                    }
-                case IEnumerable @enum:
-                    {
-                        foreach (var item in @enum)
-                        {
-                            await consumer.Send(item);
-                        }
-
                         return InvokeResult.FromSuccess(command);
                     }
                 case object obj:

diff --git a/src/Commands/Reflection/Components/Impl/CommandInfo.cs b/src/Commands/Reflection/Components/Impl/CommandInfo.cs
@@ -85,11 +85,19 @@ internal CommandInfo(
 
             var (minLength, maxLength) = parameters.GetLength();
 
-            if (parameters.Any(x => x.Attributes.Contains<RemainderAttribute>(false)))
+            if (parameters.Any(x => x.IsRemainder))
             {
-                if (parameters.Length > 1 && parameters[^1].IsRemainder)
+                for (var i = 0; i < parameters.Length; i++)
                 {
-                    ThrowHelpers.ThrowInvalidOperation($"{nameof(RemainderAttribute)} can only exist on the last parameter of a command signature.");
+                    var parameter = parameters[i];
+
+                    if (parameter.IsRemainder)
+                    {
+                        if (i != parameters.Length - 1)
+                        {
+                            ThrowHelpers.ThrowInvalidOperation($"{nameof(RemainderAttribute)} can only exist on the last parameter of a command signature.");
+                        }
+                    }
                 }
             }