Merge remote-tracking branch 'origin/master'

Author: neuecc

src/ConsoleAppFramework/ConsoleAppGenerator.cs

@@ -99,8 +99,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             {
                 if (node.IsKind(SyntaxKind.InvocationExpression))
                 {
-                    var invocationExpression = (node as InvocationExpressionSyntax);
-                    if (invocationExpression == null) return false;
+                    if (node is not InvocationExpressionSyntax invocationExpression) return false;
 
                     var expr = invocationExpression.Expression as MemberAccessExpressionSyntax;
                     if ((expr?.Expression as IdentifierNameSyntax)?.Identifier.Text == "ConsoleApp")
@@ -220,7 +219,8 @@ static void EmitConsoleAppRun(SourceProductionContext sourceProductionContext, C
         using (sb.BeginBlock("internal static partial class ConsoleApp"))
         {
             var emitter = new Emitter(null);
-            var withId = new Emitter.CommandWithId(null, command, -1);
+            var requiredParsableParameterCount = command.Parameters.Count(p => p.IsParsable && p.RequireCheckArgumentParsed);
+            var withId = new Emitter.CommandWithId(null, command, -1, requiredParsableParameterCount);
             emitter.EmitRun(sb, withId, commandContext.IsAsync, null);
         }
         sourceProductionContext.AddSource("ConsoleApp.Run.g.cs", sb.ToString().ReplaceLineEndings());
@@ -274,7 +274,9 @@ static void EmitConsoleAppBuilder(SourceProductionContext sourceProductionContex
                 var command = new Emitter.CommandWithId(
                     FieldType: x!.BuildDelegateSignature(Emitter.CommandWithId.BuildCustomDelegateTypeName(i), out var delegateDef),
                     Command: x!,
-                    Id: i
+                    Id: i,
+
+                    RequiredParsableParameterCount: x!.Parameters.Count(p => p.IsParsable && p.RequireCheckArgumentParsed)
                 );
                 if (delegateDef != null)
                 {

src/ConsoleAppFramework/Emitter.cs

@@ -1,6 +1,5 @@
-using Microsoft.CodeAnalysis;
-using System.Reflection.Metadata;
-using System.Text;
+using System.Text;
+using Microsoft.CodeAnalysis;
 
 namespace ConsoleAppFramework;
 
@@ -16,7 +15,6 @@ public void EmitRun(SourceBuilder sb, CommandWithId commandWithId, bool isRunAsy
         var hasArgument = command.Parameters.Any(x => x.IsArgument);
         var hasValidation = command.Parameters.Any(x => x.HasValidation);
         var parsableParameterCount = command.Parameters.Count(x => x.IsParsable);
-        var requiredParsableParameterCount = command.Parameters.Count(x => x.IsParsable && x.RequireCheckArgumentParsed);
 
         if (command.HasFilter)
         {
@@ -43,7 +41,7 @@ public void EmitRun(SourceBuilder sb, CommandWithId commandWithId, bool isRunAsy
             sb.AppendLine();
         }
 
-        var cancellationTokenName = (emitForBuilder) ? "cancellationToken" : null;
+        var cancellationTokenName = emitForBuilder ? "cancellationToken" : null;
         var cancellationTokenParameter = cancellationTokenName != null ? "CancellationToken cancellationToken" : null;
 
         if (!emitForBuilder)
@@ -94,13 +92,13 @@ public void EmitRun(SourceBuilder sb, CommandWithId commandWithId, bool isRunAsy
                     {
                         noCommandArgsMemory = true; // emit help directly
                         sb.AppendLine($"ReadOnlySpan<string> commandArgs = args;");
-                        sb.AppendLine($"if (TryShowHelpOrVersion(commandArgs, {requiredParsableParameterCount}, {commandWithId.Id})) return;");
+                        sb.AppendLine($"if (TryShowHelpOrVersion(commandArgs, {commandWithId.RequiredParsableParameterCount}, {commandWithId.Id})) return;");
                     }
                 }
 
                 if (!noCommandArgsMemory)
                 {
-                    sb.AppendLine($"if (TryShowHelpOrVersion(commandArgsMemory.Span, {requiredParsableParameterCount}, {commandWithId.Id})) return;");
+                    sb.AppendLine($"if (TryShowHelpOrVersion(commandArgsMemory.Span, {commandWithId.RequiredParsableParameterCount}, {commandWithId.Id})) return;");
                 }
                 sb.AppendLine();
 
@@ -595,7 +593,12 @@ void EmitRunBody(ILookup<string, CommandWithId> groupedCommands, int depth, bool
             {
                 ifBlock = sb.BeginBlock($"if (args.Length == {depth})");
             }
-            EmitLeafCommand(leafCommand);
+
+            var shouldShowGlobalHelp =
+                ifBlock != null &&
+                leafCommand is { Command.IsRootCommand: true, RequiredParsableParameterCount: > 0 };
+
+            EmitLeafCommand(shouldShowGlobalHelp ? null : leafCommand);
             if (ifBlock != null)
             {
                 sb.AppendLine("return;");
@@ -1137,7 +1140,7 @@ string Join(string separator, params string?[] args)
         return sb.ToString();
     }
 
-    internal record CommandWithId(string? FieldType, Command Command, int Id)
+    internal record CommandWithId(string? FieldType, Command Command, int Id, int RequiredParsableParameterCount)
     {
         public static string BuildCustomDelegateTypeName(int id)
         {

tests/ConsoleAppFramework.GeneratorTests/HelpTest.cs

@@ -148,6 +148,23 @@ a b c
 """);
     }
 
+    [Fact]
+    public void NoArgsOnRootShowsSameHelpTextAsHelpWhenParametersAreRequired()
+    {
+        var code = """
+var app = ConsoleApp.Create();
+app.Add("", (int x, int y) => { });
+app.Add("a", (int x, int y) => { });
+app.Add("ab", (int x, int y) => { });
+app.Add("a b c", (int x, int y) => { });
+app.Run(args);
+""";
+        var noArgsOutput = verifier.Error(code, "");
+        var helpOutput = verifier.Error(code, "--help");
+
+        noArgsOutput.ShouldBe(helpOutput);
+    }
+
     [Fact]
     public void SelectLeafHelp()
     {