Fix ConsoleApp.Run(async) / ConsoleApp.RunAsync(sync) code does not generate correctly

Author: neuecc

sandbox/GeneratorSandbox/Program.cs

@@ -1,13 +1,11 @@
 using ConsoleAppFramework;
 
-var app = ConsoleApp.Create();
 
-app.ConfigureServices(_ => { Console.WriteLine("ConfigureServices"); });
-app.Add("test", () => Console.WriteLine("test output"));
+args = ["--x", "3", "--y", "5"];
 
-for (var i = 0; i < 3; i++)
+await ConsoleApp.RunAsync(args, async (int x, int y) => { });
+
+static void Foo(int x, int y)
 {
-    app.Run(["test"], startHost: false, stopHost: false, disposeServiceProvider: false);
+    Console.WriteLine(x + y);
 }
-
-

src/ConsoleAppFramework/ConsoleAppGenerator.cs

@@ -221,7 +221,7 @@ static void EmitConsoleAppRun(SourceProductionContext sourceProductionContext, C
         {
             var emitter = new Emitter(null);
             var withId = new Emitter.CommandWithId(null, command, -1);
-            emitter.EmitRun(sb, withId, command.IsAsync, null);
+            emitter.EmitRun(sb, withId, commandContext.IsAsync, null);
         }
         sourceProductionContext.AddSource("ConsoleApp.Run.g.cs", sb.ToString().ReplaceLineEndings());
 

tests/ConsoleAppFramework.GeneratorTests/RunTest.cs

@@ -284,4 +284,44 @@ public void ArgumentLastParams()
 
         verifier.Execute(code, "--opt1 abc a b c d", "abc, a|b|c|d");
     }
+
+    [Fact]
+    public void RunAndRunAsyncOverloads()
+    {
+        verifier.Execute("""
+ConsoleApp.Run(args, () => Console.Write("sync"));
+""", "", "sync");
+
+        verifier.Execute("""
+ConsoleApp.Run(args, async () => Console.Write("async"));
+""", "", "async");
+
+        verifier.Execute("""
+await ConsoleApp.RunAsync(args, () => Console.Write("sync"));
+""", "", "sync");
+
+        verifier.Execute("""
+await ConsoleApp.RunAsync(args, async () => Console.Write("async"));
+""", "", "async");
+    }
+
+    [Fact]
+    public void RunAndRunAsyncOverloadsWithCancellationToken()
+    {
+        verifier.Execute("""
+ConsoleApp.Run(args, (CancellationToken cancellationToken) => Console.Write("sync"));
+""", "", "sync");
+
+        verifier.Execute("""
+ConsoleApp.Run(args, async (CancellationToken cancellationToken) => Console.Write("async"));
+""", "", "async");
+
+        verifier.Execute("""
+await ConsoleApp.RunAsync(args, (CancellationToken cancellationToken) => Console.Write("sync"));
+""", "", "sync");
+
+        verifier.Execute("""
+await ConsoleApp.RunAsync(args, async (CancellationToken cancellationToken) => Console.Write("async"));
+""", "", "async");
+    }
 }