Skip to content

Fix #1759 #1767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 18, 2022
Merged

Fix #1759 #1767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29dc59d
wip
jonsequitur Jun 12, 2022
bd9915e
fix #1759
jonsequitur Jun 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/System.CommandLine.Tests/ArgumentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ public void OnlyTake_throws_when_called_twice()
}

[Fact]
public void OnlyTake_can_pass_on_all_tokens()
public void OnlyTake_can_pass_on_all_tokens_from_one_multiple_arity_argument_to_another()
{
var argument1 = new Argument<int[]>(result =>
{
Expand All @@ -695,6 +695,29 @@ public void OnlyTake_can_pass_on_all_tokens()

result.GetValueForArgument(argument2).Should().BeEquivalentSequenceTo(1, 2, 3);
}

[Fact] // https://github.com/dotnet/command-line-api/issues/1759
public void OnlyTake_can_pass_on_all_tokens_from_a_single_arity_argument_to_another()
{
var scalar = new Argument<int?>(parse: ctx =>
{
ctx.OnlyTake(0);
return null;
});
Argument<int[]> multiple = new();

var command = new RootCommand
{
scalar,
multiple
};

var result = command.Parse("1 2 3");

result.GetValueForArgument(scalar).Should().BeNull();

result.GetValueForArgument(multiple).Should().BeEquivalentSequenceTo(1, 2, 3);
}
}

protected override Symbol CreateSymbol(string name)
Expand Down
18 changes: 4 additions & 14 deletions src/System.CommandLine/Parsing/ArgumentResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void OnlyTake(int numberOfTokens)
var passedOnTokensCount = _tokens.Count - numberOfTokens;

PassedOnTokens = new List<Token>(_tokens.GetRange(numberOfTokens, passedOnTokensCount));

_tokens.RemoveRange(numberOfTokens, passedOnTokensCount);
}

Expand All @@ -76,11 +76,6 @@ public void OnlyTake(int numberOfTokens)

internal ParseError? CustomError(Argument argument)
{
if (!string.IsNullOrEmpty(ErrorMessage))
{
return new ParseError(ErrorMessage!, this);
}

for (var i = 0; i < argument.Validators.Count; i++)
{
var validateSymbolResult = argument.Validators[i];
Expand All @@ -99,11 +94,11 @@ private ArgumentConversionResult Convert(Argument argument)
{
if (ShouldCheckArity() &&
Parent is { } &&
ArgumentArity.Validate(Parent,
ArgumentArity.Validate(
Parent,
argument,
argument.Arity.MinimumNumberOfValues,
argument.Arity.MaximumNumberOfValues) is ArgumentConversionResult failed &&
failed is not null) // returns null on success
argument.Arity.MaximumNumberOfValues) is { } failed) // returns null on success
{
return failed;
}
Expand Down Expand Up @@ -138,11 +133,6 @@ Parent is { } &&
};
}

if (_conversionResult is not null)
{
return _conversionResult;
}

var success = argument.ConvertArguments(this, out var value);

if (value is ArgumentConversionResult conversionResult)
Expand Down
61 changes: 41 additions & 20 deletions src/System.CommandLine/Parsing/ParseResultVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,18 @@ private void ValidateAndConvertArgumentResults(IReadOnlyList<Argument> arguments
{
for (var i = 0; i < arguments.Count; i++)
{
if (i > 0 && _argumentResults.Count > 1)
{
var previousArgumentResult = _argumentResults[i - 1];

var passedOnTokensCount = previousArgumentResult.PassedOnTokens?.Count;

if (passedOnTokensCount > 0)
{
ShiftPassedOnTokensToNextResult(previousArgumentResult, _argumentResults[i], passedOnTokensCount);
}
Comment on lines +265 to +268
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes perfect sense, nice find!

}

// If this is the current last result but there are more arguments, see if we can shift tokens to the next argument
if (commandArgumentResultCount == i)
{
Expand All @@ -268,18 +280,7 @@ private void ValidateAndConvertArgumentResults(IReadOnlyList<Argument> arguments

var passedOnTokensCount = _innermostCommandResult?.Tokens.Count;

for (var j = previousArgumentResult.Tokens.Count; j < passedOnTokensCount; j++)
{
if (nextArgumentResult.IsArgumentLimitReached)
{
break;
}

if (_innermostCommandResult is not null)
{
nextArgumentResult.AddToken(_innermostCommandResult.Tokens[j]);
}
}
ShiftPassedOnTokensToNextResult(previousArgumentResult, nextArgumentResult, passedOnTokensCount);

_argumentResults.Add(nextArgumentResult);

Expand Down Expand Up @@ -318,6 +319,25 @@ private void ValidateAndConvertArgumentResults(IReadOnlyList<Argument> arguments
}
}
}

void ShiftPassedOnTokensToNextResult(
ArgumentResult previous,
ArgumentResult next,
int? numberOfTokens)
{
for (var j = previous.Tokens.Count; j < numberOfTokens; j++)
{
if (next.IsArgumentLimitReached)
{
break;
}

if (_innermostCommandResult is not null)
{
next.AddToken(_innermostCommandResult.Tokens[j]);
}
}
}
}

private void ValidateCommandResult()
Expand Down Expand Up @@ -487,9 +507,10 @@ private void ValidateAndConvertArgumentResult(ArgumentResult argumentResult)
return;
}

ArgumentConversionResult argumentConversionResult = argumentResult.GetArgumentConversionResult();
if (argumentConversionResult.Result >= ArgumentConversionResultType.Failed
&& argumentConversionResult.Result != ArgumentConversionResultType.FailedArity)
var argumentConversionResult = argumentResult.GetArgumentConversionResult();

if (argumentConversionResult.Result >= ArgumentConversionResultType.Failed &&
argumentConversionResult.Result != ArgumentConversionResultType.FailedArity)
{
if (argument.FirstParent?.Symbol is Option option)
{
Expand All @@ -510,19 +531,19 @@ private void ValidateAndConvertArgumentResult(ArgumentResult argumentResult)

private void PopulateDefaultValues()
{
CommandResult? commandResult = _innermostCommandResult;
var commandResult = _innermostCommandResult;

while (commandResult is { })
{
IReadOnlyList<Option> options = commandResult.Command.Options;
for (int i = 0; i < options.Count; i++)
var options = commandResult.Command.Options;
for (var i = 0; i < options.Count; i++)
{
Symbol symbol = options[i];
Handle(_rootCommandResult!.FindResultForSymbol(symbol), symbol);
}

IReadOnlyList<Argument> arguments = commandResult.Command.Arguments;
for (int i = 0; i < arguments.Count; i++)
var arguments = commandResult.Command.Arguments;
for (var i = 0; i < arguments.Count; i++)
{
Symbol symbol = arguments[i];
Handle(_rootCommandResult!.FindResultForSymbol(symbol), symbol);
Expand Down