Remove cancellationToken as an invokable argument

Author: koenbeuk

src/Orleans.CodeGenerator/InvokableGenerator.cs

@@ -504,13 +504,13 @@ private MemberDeclarationSyntax GenerateInvokeInnerMethod(
         {
             var resultTask = IdentifierName("resultTask");
 
+
             // C# var resultTask = this.target.{Method}({params});
             var args = SeparatedList(
-                fields.OfType<MethodParameterFieldDescription>()
-                    .OrderBy(p => p.ParameterOrdinal)
-                    .Select(p => SymbolEqualityComparer.Default.Equals(LibraryTypes.CancellationToken, p.Parameter.Type)
+                method.Method.Parameters
+                    .Select(p => SymbolEqualityComparer.Default.Equals(LibraryTypes.CancellationToken, p.Type)
                         ? Argument(IdentifierName("cancellationToken"))
-                        : Argument(IdentifierName(p.FieldName))));
+                        : Argument(IdentifierName($"arg{p.Ordinal}"))));
 
             var isExtension = method.Key.ProxyBase.IsExtension;
             var getTarget = InvocationExpression(
@@ -691,11 +691,19 @@ private MemberDeclarationSyntax GenerateDisposeMethod(
         }
 
         private MemberDeclarationSyntax GenerateGetArgumentCount(InvokableMethodDescription methodDescription)
-            => methodDescription.Method.Parameters.Length is var count and not 0 ?
+        {
+            var count = methodDescription.Method.Parameters.Length;
+            if (methodDescription.IsCancellable)
+            {
+                count -= 1;
+            }
+
+            return count is not 0 ?
             MethodDeclaration(PredefinedType(Token(SyntaxKind.IntKeyword)), "GetArgumentCount")
                 .WithExpressionBody(ArrowExpressionClause(LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(count))))
                 .WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword), Token(SyntaxKind.OverrideKeyword)))
                 .WithSemicolonToken(Token(SyntaxKind.SemicolonToken)) : null;
+        }
 
         private MemberDeclarationSyntax GenerateGetActivityName(InvokableMethodDescription methodDescription)
         {
@@ -895,6 +903,11 @@ private List<InvokerFieldDescription> GetFieldDescriptions(InvokableMethodDescri
 
             foreach (var parameter in method.Method.Parameters)
             {
+                if (SymbolEqualityComparer.Default.Equals(LibraryTypes.CancellationToken, parameter.Type))
+                {
+                    continue;
+                }
+
                 fields.Add(new MethodParameterFieldDescription(method.CodeGenerator, parameter, $"arg{fieldId}", fieldId, method.TypeParameterSubstitutions));
                 fieldId++;
             }