Add token representation to remaining arguments

Before, when adding parsed information to the IRemainingArguments.Parsed,
we used the name of the parsed option ('foo') instead of it's
representation ('--foo'). This commit fixes that.

src/Spectre.Console.Cli/Internal/Parsing/CommandTreeParser.cs

@@ -302,11 +302,7 @@ public CommandTreeParserResult Parse(CommandTreeParserContext context, CommandTr
  var valueToken = stream.Peek();
  if (valueToken?.TokenKind == CommandTreeToken.Kind.String)
  {
- var parseValue = true;
- if (token.TokenKind == CommandTreeToken.Kind.ShortOption && token.IsGrouped)
- {
- parseValue = false;
- }
+ bool parseValue = token is not { TokenKind: CommandTreeToken.Kind.ShortOption, IsGrouped: true };
 
  if (context.State == State.Normal && parseValue)
  {
@@ -333,7 +329,7 @@ public CommandTreeParserResult Parse(CommandTreeParserContext context, CommandTr
  {
  value = stream.Consume(CommandTreeToken.Kind.String)?.Value;
 
- context.AddRemainingArgument(token.Value, value);
+ context.AddRemainingArgument(token.Representation, value);
 
  // Prevent the option and it's non-boolean value from being added to
  // mapped parameters (otherwise an exception will be thrown later
@@ -364,22 +360,22 @@ public CommandTreeParserResult Parse(CommandTreeParserContext context, CommandTr
  // In relaxed parsing mode?
  if (context.ParsingMode == ParsingMode.Relaxed)
  {
- context.AddRemainingArgument(token.Value, value);
+ context.AddRemainingArgument(token.Representation, value);
  }
  }
  }
  }
  else
  {
- context.AddRemainingArgument(token.Value, parseValue ? valueToken.Value : null);
+ context.AddRemainingArgument(token.Representation, parseValue ? valueToken.Value : null);
  }
  }
  else
  {
  if (parameter == null && // Only add tokens which have not been matched to a command parameter
  (context.State == State.Remaining || context.ParsingMode == ParsingMode.Relaxed))
  {
- context.AddRemainingArgument(token.Value, null);
+ context.AddRemainingArgument(token.Representation, null);
  }
  }
 

src/Spectre.Console.Cli/Internal/Parsing/CommandTreeTokenizer.cs

@@ -171,7 +171,7 @@ private static IEnumerable<CommandTreeToken> ScanShortOptions(CommandTreeTokeniz
  }
 
  // Encountered a separator?
- if (current == '=' || current == ':')
+ if (current is '=' or ':')
  {
  break;
  }
@@ -184,7 +184,7 @@ private static IEnumerable<CommandTreeToken> ScanShortOptions(CommandTreeTokeniz
  var value = current.ToString(CultureInfo.InvariantCulture);
  result.Add(result.Count == 0
  ? new CommandTreeToken(CommandTreeToken.Kind.ShortOption, position, value, $"-{value}")
- : new CommandTreeToken(CommandTreeToken.Kind.ShortOption, position + result.Count, value, value));
+ : new CommandTreeToken(CommandTreeToken.Kind.ShortOption, position + result.Count, value, $"-{value}"));
  }
  else if (result.Count == 0 && char.IsDigit(current))
  {

test/Spectre.Console.Cli.Tests/Unit/CommandAppTests.Branches.cs

@@ -89,7 +89,7 @@ public void Should_Be_Unable_To_Parse_Default_Command_Arguments_Relaxed_Parsing(
  //cat.Name.ShouldBe("Kitty"); //<-- Should normally be correct, but instead name will be added to the remaining arguments (see below).
  });
  result.Context.Remaining.Parsed.Count.ShouldBe(1);
- result.Context.ShouldHaveRemainingArgument("name", values: new[] { "Kitty", });
+ result.Context.ShouldHaveRemainingArgument("--name", values: new[] { "Kitty", });
  }
 
  [Fact]

test/Spectre.Console.Cli.Tests/Unit/CommandAppTests.Remaining.cs

@@ -56,7 +56,7 @@ public void Should_Add_Unknown_Flags_To_Remaining_Arguments_RelaxedParsing(strin
 
  // Then
  result.Context.Remaining.Parsed.Count.ShouldBe(1);
- result.Context.ShouldHaveRemainingArgument(unknownFlag.TrimStart('-'), values: new[] { (string)null });
+ result.Context.ShouldHaveRemainingArgument(unknownFlag, values: new[] { (string)null });
  result.Context.Remaining.Raw.Count.ShouldBe(0);
  }
 
@@ -80,7 +80,7 @@ public void Should_Add_Unknown_Flags_When_Grouped_To_Remaining_Arguments_Relaxed
 
  // Then
  result.Context.Remaining.Parsed.Count.ShouldBe(1);
- result.Context.ShouldHaveRemainingArgument("r", values: new[] { (string)null });
+ result.Context.ShouldHaveRemainingArgument("-r", values: new[] { (string)null });
  result.Context.Remaining.Raw.Count.ShouldBe(0);
  }
 
@@ -189,10 +189,10 @@ public void Should_Register_Remaining_Parsed_Arguments_With_Context()
 
  // Then
  result.Context.Remaining.Parsed.Count.ShouldBe(4);
- result.Context.ShouldHaveRemainingArgument("foo", values: new[] { "bar", "baz" });
- result.Context.ShouldHaveRemainingArgument("b", values: new[] { (string)null });
- result.Context.ShouldHaveRemainingArgument("a", values: new[] { (string)null });
- result.Context.ShouldHaveRemainingArgument("r", values: new[] { (string)null });
+ result.Context.ShouldHaveRemainingArgument("--foo", values: new[] { "bar", "baz" });
+ result.Context.ShouldHaveRemainingArgument("-b", values: new[] { (string)null });
+ result.Context.ShouldHaveRemainingArgument("-a", values: new[] { (string)null });
+ result.Context.ShouldHaveRemainingArgument("-r", values: new[] { (string)null });
  }
 
  [Fact]
@@ -280,7 +280,7 @@ public void Should_Convert_Flags_To_Remaining_Arguments_If_Cannot_Be_Assigned(bo
 
  // Then
  result.Context.Remaining.Parsed.Count.ShouldBe(1);
- result.Context.ShouldHaveRemainingArgument("good-boy", values: new[] { "Please be good Rufus!" });
+ result.Context.ShouldHaveRemainingArgument("--good-boy", values: new[] { "Please be good Rufus!" });
 
  result.Context.Remaining.Raw.Count.ShouldBe(0); // nb. there are no "raw" remaining arguments on the command line
  }

test/Spectre.Console.Cli.Tests/Unit/CommandAppTests.Version.cs

@@ -51,7 +51,7 @@ public void Should_Execute_Command_Not_Output_Application_Version_To_The_Console
 
  // Then
  result.Output.ShouldBe(string.Empty);
- result.Context.ShouldHaveRemainingArgument("version", new[] { (string)null });
+ result.Context.ShouldHaveRemainingArgument("--version", new[] { (string)null });
  }
 
  [Fact]
@@ -70,7 +70,7 @@ public void Should_Execute_Default_Command_Not_Output_Application_Version_To_The
 
  // Then
  result.Output.ShouldBe(string.Empty);
- result.Context.ShouldHaveRemainingArgument("version", new[] { (string)null });
+ result.Context.ShouldHaveRemainingArgument("--version", new[] { (string)null });
  }
 
  [Fact]

test/Spectre.Console.Cli.Tests/Unit/CommandAppTests.cs

@@ -215,7 +215,7 @@ public void Should_Preserve_Quotes_Hyphen_Delimiters_Spaces()
  dog.Name.ShouldBe("\" -Rufus --' ");
  });
  result.Context.Remaining.Parsed.Count.ShouldBe(1);
- result.Context.ShouldHaveRemainingArgument("order-by", values: new[] { "\"-size\"", " ", string.Empty });
+ result.Context.ShouldHaveRemainingArgument("--order-by", values: new[] { "\"-size\"", " ", string.Empty });
  }
 
  [Fact]
@@ -844,7 +844,7 @@ public void Should_Add_Unknown_Option_To_Remaining_Arguments_In_Relaxed_Mode()
  // Then
  result.Context.ShouldNotBeNull();
  result.Context.Remaining.Parsed.Count.ShouldBe(1);
- result.Context.ShouldHaveRemainingArgument("foo", values: new[] { "bar" });
+ result.Context.ShouldHaveRemainingArgument("--foo", values: new[] { "bar" });
  }
 
  [Fact]
@@ -875,8 +875,8 @@ public void Should_Add_Unknown_Option_To_Remaining_Arguments_In_Strict_Mode()
  // Then
  result.Context.ShouldNotBeNull();
  result.Context.Remaining.Parsed.Count.ShouldBe(2);
- result.Context.ShouldHaveRemainingArgument("foo", values: new[] { "bar" });
- result.Context.ShouldHaveRemainingArgument("f", values: new[] { "baz" });
+ result.Context.ShouldHaveRemainingArgument("--foo", values: new[] { "bar" });
+ result.Context.ShouldHaveRemainingArgument("-f", values: new[] { "baz" });
  result.Context.Remaining.Raw.Count.ShouldBe(5);
  result.Context.Remaining.Raw.ShouldBe(new[]
  {
@@ -909,7 +909,7 @@ public void Should_Add_Unknown_Boolean_Option_To_Remaining_Arguments_In_Relaxed_
  // Then
  result.Context.ShouldNotBeNull();
  result.Context.Remaining.Parsed.Count.ShouldBe(1);
- result.Context.ShouldHaveRemainingArgument("foo", values: new[] { (string)null });
+ result.Context.ShouldHaveRemainingArgument("--foo", values: new[] { (string)null });
  }
 
  [Fact]