fix #2628

jonsequitur · jonsequitur · commit dbc3781d3398 · 2025-07-15T17:14:22.000-07:00
diff --git a/src/System.CommandLine.Tests/VersionOptionTests.cs b/src/System.CommandLine.Tests/VersionOptionTests.cs
@@ -37,7 +37,7 @@ public async Task When_the_version_option_is_specified_then_invocation_is_short_
         {
             var wasCalled = false;
             var rootCommand = new RootCommand();
-            rootCommand.SetAction((_) => wasCalled = true);
+            rootCommand.SetAction(_ => wasCalled = true);
 
             var output = new StringWriter();
 
@@ -46,6 +46,21 @@ public async Task When_the_version_option_is_specified_then_invocation_is_short_
             wasCalled.Should().BeFalse();
         }
 
+        [Fact] // https://github.com/dotnet/command-line-api/issues/2628
+        public void When_the_version_option_is_specified_then_there_are_no_parse_errors_due_to_unspecified_subcommand()
+        {
+            Command subcommand = new("subcommand");
+            RootCommand root = new()
+            {
+                subcommand
+            };
+            subcommand.SetAction(_ => 0);
+
+            var parseResult = root.Parse("--version");
+
+            parseResult.Errors.Should().BeEmpty();
+        }
+
         [Fact]
         public async Task Version_option_appears_in_help()
         {
diff --git a/src/System.CommandLine/ParserConfiguration.cs b/src/System.CommandLine/ParserConfiguration.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Parsing;
-using System.Linq;
 
 namespace System.CommandLine
 {
diff --git a/src/System.CommandLine/Parsing/CommandResult.cs b/src/System.CommandLine/Parsing/CommandResult.cs
@@ -43,17 +43,10 @@ internal CommandResult(
         internal override bool UseDefaultValueFor(ArgumentResult argumentResult)
             => argumentResult.Argument.HasDefaultValue && argumentResult.Tokens.Count == 0;
 
-        /// <param name="completeValidation">Only the inner most command goes through complete validation.</param>
-        internal void Validate(bool completeValidation)
+        internal void Validate(bool isInnermostCommand)
         {
-            if (completeValidation)
+            if (isInnermostCommand)
             {
-                if (Command.Action is null && Command.HasSubcommands)
-                {
-                    SymbolResultTree.InsertFirstError(
-                        new ParseError(LocalizationResources.RequiredCommandWasNotProvided(), this));
-                }
-
                 if (Command.HasValidators)
                 {
                     int errorCountBefore = SymbolResultTree.ErrorCount;
@@ -71,12 +64,12 @@ internal void Validate(bool completeValidation)
 
             if (Command.HasOptions)
             {
-                ValidateOptionsAndAddDefaultResults(completeValidation);
+                ValidateOptionsAndAddDefaultResults(isInnermostCommand);
             }
 
             if (Command.HasArguments)
             {
-                ValidateArgumentsAndAddDefaultResults(completeValidation);
+                ValidateArgumentsAndAddDefaultResults(isInnermostCommand);
             }
         }
 
diff --git a/src/System.CommandLine/Parsing/ParseOperation.cs b/src/System.CommandLine/Parsing/ParseOperation.cs
@@ -63,6 +63,7 @@ internal ParseResult Parse()
 
             ValidateAndAddDefaultResults();
 
+
             if (_isHelpRequested)
             {
                 _symbolResultTree.Errors?.Clear();
@@ -373,17 +374,24 @@ private void AddCurrentTokenToUnmatched()
 
         private void ValidateAndAddDefaultResults()
         {
-            // Only the inner most command goes through complete validation,
+            // Only the innermost command goes through complete validation,
             // for other commands only a subset of options is checked.
-            _innermostCommandResult.Validate(completeValidation: true);
+            _innermostCommandResult.Validate(isInnermostCommand: true);
 
             CommandResult? currentResult = _innermostCommandResult.Parent as CommandResult;
             while (currentResult is not null)
             {
-                currentResult.Validate(completeValidation: false);
+                currentResult.Validate(isInnermostCommand: false);
 
                 currentResult = currentResult.Parent as CommandResult;
             }
+
+            if (_primaryAction is null &&
+                _innermostCommandResult is { Command: { Action: null, HasSubcommands: true } })
+            {
+                _symbolResultTree.InsertFirstError(
+                    new ParseError(LocalizationResources.RequiredCommandWasNotProvided(), _innermostCommandResult));
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// Licensed under the MIT license. See LICENSE file in the project root for full license information.`
`3`	`3`
`4`	`4`	`using System.CommandLine.Parsing;`
`5`		`-using System.Linq;`
`6`	`5`
`7`	`6`	`namespace System.CommandLine`
`8`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,17 +43,10 @@ internal CommandResult(`
`43`	`43`	`internal override bool UseDefaultValueFor(ArgumentResult argumentResult)`
`44`	`44`	`=> argumentResult.Argument.HasDefaultValue && argumentResult.Tokens.Count == 0;`
`45`	`45`
`46`		`- /// <param name="completeValidation">Only the inner most command goes through complete validation.</param>`
`47`		`- internal void Validate(bool completeValidation)`
	`46`	`+ internal void Validate(bool isInnermostCommand)`
`48`	`47`	`{`
`49`		`- if (completeValidation)`
	`48`	`+ if (isInnermostCommand)`
`50`	`49`	`{`
`51`		`- if (Command.Action is null && Command.HasSubcommands)`
`52`		`- {`
`53`		`- SymbolResultTree.InsertFirstError(`
`54`		`- new ParseError(LocalizationResources.RequiredCommandWasNotProvided(), this));`
`55`		`- }`
`56`		`-`
`57`	`50`	`if (Command.HasValidators)`
`58`	`51`	`{`
`59`	`52`	`int errorCountBefore = SymbolResultTree.ErrorCount;`
`@@ -71,12 +64,12 @@ internal void Validate(bool completeValidation)`
`71`	`64`
`72`	`65`	`if (Command.HasOptions)`
`73`	`66`	`{`
`74`		`- ValidateOptionsAndAddDefaultResults(completeValidation);`
	`67`	`+ ValidateOptionsAndAddDefaultResults(isInnermostCommand);`
`75`	`68`	`}`
`76`	`69`
`77`	`70`	`if (Command.HasArguments)`
`78`	`71`	`{`
`79`		`- ValidateArgumentsAndAddDefaultResults(completeValidation);`
	`72`	`+ ValidateArgumentsAndAddDefaultResults(isInnermostCommand);`
`80`	`73`	`}`
`81`	`74`	`}`
`82`	`75`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ internal ParseResult Parse()`
`63`	`63`
`64`	`64`	`ValidateAndAddDefaultResults();`
`65`	`65`
	`66`	`+`
`66`	`67`	`if (_isHelpRequested)`
`67`	`68`	`{`
`68`	`69`	`_symbolResultTree.Errors?.Clear();`
`@@ -373,17 +374,24 @@ private void AddCurrentTokenToUnmatched()`
`373`	`374`
`374`	`375`	`private void ValidateAndAddDefaultResults()`
`375`	`376`	`{`
`376`		`- // Only the inner most command goes through complete validation,`
	`377`	`+ // Only the innermost command goes through complete validation,`
`377`	`378`	`// for other commands only a subset of options is checked.`
`378`		`- _innermostCommandResult.Validate(completeValidation: true);`
	`379`	`+ _innermostCommandResult.Validate(isInnermostCommand: true);`
`379`	`380`
`380`	`381`	`CommandResult? currentResult = _innermostCommandResult.Parent as CommandResult;`
`381`	`382`	`while (currentResult is not null)`
`382`	`383`	`{`
`383`		`- currentResult.Validate(completeValidation: false);`
	`384`	`+ currentResult.Validate(isInnermostCommand: false);`
`384`	`385`
`385`	`386`	`currentResult = currentResult.Parent as CommandResult;`
`386`	`387`	`}`
	`388`	`+`
	`389`	`+ if (_primaryAction is null &&`
	`390`	`+ _innermostCommandResult is { Command: { Action: null, HasSubcommands: true } })`
	`391`	`+ {`
	`392`	`+ _symbolResultTree.InsertFirstError(`
	`393`	`+ new ParseError(LocalizationResources.RequiredCommandWasNotProvided(), _innermostCommandResult));`
	`394`	`+ }`
`387`	`395`	`}`
`388`	`396`	`}`
`389`	`397`	`}`