Invoke WaitAsync directly for Task returning methods

dusrdev · dusrdev · commit 2cc95df85a2f · 2025-11-17T19:10:14.000+02:00
diff --git a/src/ConsoleAppFramework/Emitter.cs b/src/ConsoleAppFramework/Emitter.cs
@@ -386,7 +386,14 @@ public void EmitRun(SourceBuilder sb, CommandWithId commandWithId, bool isRunAsy
 
                 if (hasCancellationToken)
                 {
-                    invokeCommand = $"Task.Run(() => {invokeCommand}).WaitAsync(posixSignalHandler.TimeoutToken)";
+                    if (command.IsAsync)
+                    {
+                        invokeCommand = $"{invokeCommand}.WaitAsync(posixSignalHandler.TimeoutToken)";
+                    }
+                    else
+                    {
+                        invokeCommand = $"Task.Run(() => {invokeCommand}).WaitAsync(posixSignalHandler.TimeoutToken)";
+                    }
                 }
                 if (command.IsAsync || hasCancellationToken)
                 {

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,14 @@ public void EmitRun(SourceBuilder sb, CommandWithId commandWithId, bool isRunAsy`
`386`	`386`
`387`	`387`	`if (hasCancellationToken)`
`388`	`388`	`{`
`389`		`- invokeCommand = $"Task.Run(() => {invokeCommand}).WaitAsync(posixSignalHandler.TimeoutToken)";`
	`389`	`+ if (command.IsAsync)`
	`390`	`+ {`
	`391`	`+ invokeCommand = $"{invokeCommand}.WaitAsync(posixSignalHandler.TimeoutToken)";`
	`392`	`+ }`
	`393`	`+ else`
	`394`	`+ {`
	`395`	`+ invokeCommand = $"Task.Run(() => {invokeCommand}).WaitAsync(posixSignalHandler.TimeoutToken)";`
	`396`	`+ }`
`390`	`397`	`}`
`391`	`398`	`if (command.IsAsync \|\| hasCancellationToken)`
`392`	`399`	`{`