Mirrors/spectre.console
1
0
Fork 0
mirror of https://github.com/spectreconsole/spectre.console.git synced 2025-10-25 15:19:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not split remaining args on space

Browse Source 
Closes #186
This commit is contained in:
Patrik Svensson
2020-12-31 12:16:08 +01:00
committed by Patrik Svensson
parent f561d71e4e
commit 5cf41725a5
3 changed files with 81 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Remaining.cs Normal file
View File

@@ -0,0 +1,77 @@
using Shouldly;
using Spectre.Console.Cli;
using Spectre.Console.Testing;
using Spectre.Console.Tests.Data;
using Xunit;
namespace Spectre.Console.Tests.Unit.Cli
{
public sealed partial class CommandAppTests
{
public sealed class Remaining
{
[Fact]
public void Should_Register_Remaining_Parsed_Arguments_With_Context()
{
// Given
var app = new CommandAppFixture();
app.Configure(config =>
{
config.PropagateExceptions();
config.AddBranch<AnimalSettings>("animal", animal =>
{
animal.AddCommand<DogCommand>("dog");
});
});
// When
var (result, _, ctx, _) = app.Run(new[]
{
"animal", "4", "dog", "12", "--",
"--foo", "bar", "--foo", "baz",
"-bar", "\"baz\"", "qux",
"foo bar baz qux",
});
// Then
ctx.Remaining.Parsed.Count.ShouldBe(4);
ctx.ShouldHaveRemainingArgument("foo", values: new[] { "bar", "baz" });
ctx.ShouldHaveRemainingArgument("b", values: new[] { (string)null });
ctx.ShouldHaveRemainingArgument("a", values: new[] { (string)null });
ctx.ShouldHaveRemainingArgument("r", values: new[] { (string)null });
}
[Fact]
public void Should_Register_Remaining_Raw_Arguments_With_Context()
{
// Given
var app = new CommandAppFixture();
app.Configure(config =>
{
config.PropagateExceptions();
config.AddBranch<AnimalSettings>("animal", animal =>
{
animal.AddCommand<DogCommand>("dog");
});
});
// When
var (result, _, ctx, _) = app.Run(new[]
{
"animal", "4", "dog", "12", "--",
"--foo", "bar", "-bar", "\"baz\"", "qux",
"foo bar baz qux",
});
// Then
ctx.Remaining.Raw.Count.ShouldBe(6);
ctx.Remaining.Raw[0].ShouldBe("--foo");
ctx.Remaining.Raw[1].ShouldBe("bar");
ctx.Remaining.Raw[2].ShouldBe("-bar");
ctx.Remaining.Raw[3].ShouldBe("baz");
ctx.Remaining.Raw[4].ShouldBe("qux");
ctx.Remaining.Raw[5].ShouldBe("foo bar baz qux");
}
}
}
}

4
src/Spectre.Console/Cli/Internal/Parsing/CommandTreeTokenizer.cs
View File

@@ -74,6 +74,9 @@ namespace Spectre.Console.Cli.Internal
tokens.Add(ScanString(context, reader));
}
}
// Flush remaining tokens
context.FlushRemaining();
}
return position;
@@ -145,7 +148,6 @@ namespace Spectre.Console.Cli.Internal
// Add to the context
context.AddRemaining(quotedString);
context.FlushRemaining();
return new CommandTreeToken(
CommandTreeToken.Kind.String,

9
src/Spectre.Console/Cli/Internal/Parsing/CommandTreeTokenizerContext.cs
View File

@@ -21,14 +21,7 @@ namespace Spectre.Console.Cli.Internal
{
if (Mode == CommandTreeTokenizer.Mode.Remaining)
{
if (char.IsWhiteSpace(character))
{
FlushRemaining();
}
else
{
_builder.Append(character);
}
_builder.Append(character);
}
}