Address PR comments

Author: jonsequitur

src/System.CommandLine.Tests/DirectiveTests.cs

@@ -72,14 +72,14 @@ public async Task Multiple_instances_of_the_same_directive_can_be_invoked(bool i
             var testDirective = new TestDirective("test")
             {
                 Action = invokeAsync
-                             ? new AsynchronousNonterminatingTestAction(incrementCallCount, terminating: false)
+                             ? new AsynchronousTestAction(incrementCallCount, terminating: false)
                              : new SynchronousTestAction(incrementCallCount, terminating: false)
             };
 
             var config = new CliConfiguration(new CliRootCommand
             {
                 Action = invokeAsync
-                             ? new AsynchronousNonterminatingTestAction(verifyActionWasCalled, terminating: false)
+                             ? new AsynchronousTestAction(verifyActionWasCalled, terminating: false)
                              : new SynchronousTestAction(verifyActionWasCalled, terminating: false)
             })
             {

src/System.CommandLine.Tests/HelpOptionTests.cs

@@ -179,12 +179,11 @@ public async Task Help_option_with_custom_aliases_default_aliases_replaced(strin
             CliConfiguration config = new(command)
             {
                 Output = new StringWriter(),
-                EnableParseErrorReporting = false
             };
 
             await config.InvokeAsync(helpAlias);
 
-            config.Output.ToString().Should().Be("");
+            config.Output.ToString().Should().NotContain(helpAlias);
         }
     }
 }

src/System.CommandLine.Tests/Invocation/InvocationTests.cs

@@ -5,7 +5,6 @@
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.IO;
-using System.Runtime.InteropServices.ComTypes;
 using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -195,10 +194,10 @@ public async Task Anonymous_RootCommand_int_returning_Action_can_set_custom_resu
         }
 
         [Fact]
-        public void Option_action_takes_precedence_over_command_action()
+        public void Terminating_option_action_short_circuits_command_action()
         {
-            bool wasCalled = false;
-            SynchronousTestAction optionAction = new(_ => wasCalled = true);
+            bool optionActionWasCalled = false;
+            SynchronousTestAction optionAction = new(_ => optionActionWasCalled = true, terminating: true);
             bool commandActionWasCalled = false;
 
             CliOption<bool> option = new("--test")
@@ -214,17 +213,41 @@ public void Option_action_takes_precedence_over_command_action()
                 commandActionWasCalled = true;
             });
 
-            ParseResult parseResult = command.Parse("cmd --test true");
+            ParseResult parseResult = command.Parse("cmd --test");
 
             parseResult.Action.Should().NotBeNull();
-            wasCalled.Should().BeFalse();
+            optionActionWasCalled.Should().BeFalse();
             commandActionWasCalled.Should().BeFalse();
 
             parseResult.Invoke().Should().Be(0);
-            wasCalled.Should().BeTrue();
+            optionActionWasCalled.Should().BeTrue();
             commandActionWasCalled.Should().BeFalse();
         }
 
+        [Fact]
+        public void Nonterminating_option_action_does_not_short_circuit_command_action()
+        {
+            bool optionActionWasCalled = false;
+            SynchronousTestAction optionAction = new(_ => optionActionWasCalled = true, terminating: false);
+            bool commandActionWasCalled = false;
+
+            CliOption<bool> option = new("--test")
+            {
+                Action = optionAction
+            };
+            CliCommand command = new CliCommand("cmd")
+            {
+                option
+            };
+            command.SetAction(_ => { commandActionWasCalled = true; });
+
+            ParseResult parseResult = command.Parse("cmd --test");
+
+            parseResult.Invoke().Should().Be(0);
+            optionActionWasCalled.Should().BeTrue();
+            commandActionWasCalled.Should().BeTrue();
+        }
+
         [Fact]
         public void When_multiple_options_with_actions_are_present_then_only_the_last_one_is_invoked()
         {
@@ -286,7 +309,7 @@ public void Directive_action_takes_precedence_over_option_action()
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public async Task Nonexclusive_actions_handle_exceptions_and_return_an_error_return_code(bool invokeAsync)
+        public async Task Nontermninating_actions_handle_exceptions_and_return_an_error_return_code(bool invokeAsync)
         {
             var nonexclusiveAction = new NonexclusiveTestAction
             {

src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs

@@ -1,5 +1,7 @@
+using System.CommandLine.Help;
 using System.CommandLine.Invocation;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
@@ -151,14 +153,18 @@ public async Task Arguments_are_not_suggested()
                 argument,
                 command
             };
+
             CliConfiguration configuration = new(rootCommand)
             {
-                EnableParseErrorReporting = false,
                 Output = new StringWriter()
             };
 
             var result = rootCommand.Parse("een", configuration);
 
+            var parseErrorAction = (ParseErrorAction)result.Action;
+            parseErrorAction.ShowHelp = false;
+            parseErrorAction.ShowTypoCorrections = true;
+            
             await result.InvokeAsync();
 
             configuration.Output.ToString().Should().NotContain("the-argument");

src/System.CommandLine.Tests/ParseErrorReportingTests.cs

@@ -1,9 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
 using System.CommandLine.Help;
 using System.CommandLine.Invocation;
 using System.IO;
@@ -23,16 +20,11 @@ public void Parse_error_reporting_reports_error_when_help_is_used_and_required_s
             new HelpOption()
         };
 
-        CliConfiguration config = new (root)
-        {
-            EnableParseErrorReporting = true
-        };
-
-        var parseResult = root.Parse("", config);
+        var parseResult = root.Parse("");
 
         parseResult.Errors.Should().NotBeEmpty();
 
-        var result = config.Invoke("");
+        var result = parseResult.Invoke();
 
         result.Should().Be(1);
     }

src/System.CommandLine.Tests/TestCliActions.cs

@@ -24,11 +24,11 @@ public override int Invoke(ParseResult parseResult)
     }
 }
 
-public class AsynchronousNonterminatingTestAction : AsynchronousCliAction
+public class AsynchronousTestAction : AsynchronousCliAction
 {
     private readonly Action<ParseResult> _invoke;
 
-    public AsynchronousNonterminatingTestAction(Action<ParseResult> invoke, bool terminating = true)
+    public AsynchronousTestAction(Action<ParseResult> invoke, bool terminating = true)
     {
         _invoke = invoke;
         Terminating = terminating;

src/System.CommandLine/CliConfiguration.cs

@@ -65,11 +65,6 @@ public CliConfiguration(CliCommand rootCommand)
         /// </summary>
         public bool EnableDefaultExceptionHandler { get; set; } = true;
 
-        /// <summary>
-        /// Configures the command line to write error information to standard error when there are errors parsing command line input. Enabled by default.
-        /// </summary>
-        public bool EnableParseErrorReporting { get; set; } = true;
-
         /// <summary>
         /// Enables signaling and handling of process termination (Ctrl+C, SIGINT, SIGTERM) via a <see cref="CancellationToken"/> 
         /// that can be passed to a <see cref="CliAction"/> during invocation.

src/System.CommandLine/Invocation/AnonymousAsynchronousCliAction.cs

@@ -6,7 +6,7 @@
 
 namespace System.CommandLine.Invocation;
 
-internal class AnonymousAsynchronousCliAction : AsynchronousCliAction
+internal sealed class AnonymousAsynchronousCliAction : AsynchronousCliAction
 {
     private readonly Func<ParseResult, CancellationToken, Task<int>> _asyncAction;
 

src/System.CommandLine/Invocation/AnonymousSynchronousCliAction.cs

@@ -3,7 +3,7 @@
 
 namespace System.CommandLine.Invocation;
 
-internal class AnonymousSynchronousCliAction : SynchronousCliAction
+internal sealed class AnonymousSynchronousCliAction : SynchronousCliAction
 {
     private readonly Func<ParseResult, int> _syncAction;
 

src/System.CommandLine/Invocation/CliAction.cs

@@ -15,5 +15,5 @@ private protected CliAction()
     /// <summary>
     /// Indicates that the action terminates a command line invocation, and later actions are skipped.
     /// </summary>
-    public bool Terminating { get; protected set; } = true;
+    public bool Terminating { get; protected init; } = true;
 }