Commitbb817c6

Jon Sequeira

committed

unspecified option with preaction and default value has preaction invoked

1 parentc32f786 commitbb817c6Copy full SHA for bb817c6

File tree

+43

-0

lines changed

src
- System.CommandLine.Tests
  - OptionTests.cs
- System.CommandLine/Parsing
  - ParseOperation.cs

+43

-0

lines changed

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -531,5 +531,27 @@ public void Default_value_is_used_when_option_with_ZeroOrOne_arity_is_parsed_wit`
`531`	`531`
`532`	`532`	`parseResult.GetValue(option).Should().Be(42);`
`533`	`533`	`}`
	`534`	`+`
	`535`	`+[Fact]// https://github.com/dotnet/command-line-api/issues/2621`
	`536`	`+publicvoidOption_with_default_value_has_Action_added_to_PreActions_when_not_specified_but_has_default()`
	`537`	`+{`
	`538`	`+varactionInvoked=false;`
	`539`	`+varoption=newOption<bool>("--quiet")`
	`540`	`+{`
	`541`	`+DefaultValueFactory= _=>true,`
	`542`	`+Action=newSynchronousTestAction(_=>actionInvoked=true,terminating:false)`
	`543`	`+};`
	`544`	`+`
	`545`	`+varrootCommand=newRootCommand`
	`546`	`+{`
	`547`	`+option`
	`548`	`+};`
	`549`	`+rootCommand.SetAction(_=>{});`
	`550`	`+`
	`551`	`+varparseResult=rootCommand.Parse("");`
	`552`	`+parseResult.Invoke();`
	`553`	`+`
	`554`	`+actionInvoked.Should().BeTrue();`
	`555`	`+}`
`534`	`556`	`}`
`535`	`557`	`}`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,24 @@ private void AddPreAction(CommandLineAction action)`
`342`	`342`	`_preActions.Add(action);`
`343`	`343`	`}`
`344`	`344`
	`345`	`+privatevoidAddActionsForImplicitOptions()`
	`346`	`+{`
	`347`	`+// Check for options with default values and actions that were implicitly added`
	`348`	`+foreach(varkvpin_symbolResultTree)`
	`349`	`+{`
	`350`	`+if(kvp.KeyisOption{Action:{}action}&&`
	`351`	`+kvp.ValueisOptionResultoptionResult&&`
	`352`	`+optionResult.Implicit)`
	`353`	`+{`
	`354`	`+if(!action.Terminating&&`
	`355`	`+(_primaryActionisnull\|\|_primaryAction!=action))`
	`356`	`+{`
	`357`	`+AddPreAction(action);`
	`358`	`+}`
	`359`	`+}`
	`360`	`+}`
	`361`	`+}`
	`362`	`+`
`345`	`363`	`privatevoidAddCurrentTokenToUnmatched()`
`346`	`364`	`{`
`347`	`365`	`if(CurrentToken.Type==TokenType.DoubleDash)`
`@@ -366,6 +384,9 @@ private void ValidateAndAddDefaultResults()`
`366`	`384`	`currentResult=currentResult.ParentasCommandResult;`
`367`	`385`	`}`
`368`	`386`
	`387`	`+// Add actions for options with default values that were not specified on the command line`
	`388`	`+AddActionsForImplicitOptions();`
	`389`	`+`
`369`	`390`	`if(_primaryActionisnull)`
`370`	`391`	`{`
`371`	`392`	`if(_innermostCommandResultis{Command:{Action:null,HasSubcommands:true}})`

Comments

(0)