suggestions exclude sibling command aliases

jonsequitur · jonsequitur · commit af42e2bd71f0 · 2020-07-09T11:05:04.000-07:00
diff --git a/src/System.CommandLine.Tests/SuggestionTests.cs b/src/System.CommandLine.Tests/SuggestionTests.cs
@@ -215,6 +215,34 @@ public void When_a_subcommand_has_been_specified_then_its_sibling_commands_will_
                   .NotContain(new[]{"apple", "banana", "cherry"});
         }
 
+        [Fact]
+        public void When_a_subcommand_has_been_specified_then_its_sibling_commands_aliases_will_not_be_suggested()
+        {
+            var apple = new Command("apple")
+            {
+                new Option("--cortland")
+            };
+            apple.AddAlias("apl");
+
+            var banana = new Command("banana")
+            {
+                new Option("--cavendish")
+            };
+            banana.AddAlias("bnn");
+
+            var rootCommand = new RootCommand
+            {
+                apple,
+                banana
+            };
+
+            var result = rootCommand.Parse("banana ");
+
+            result.GetSuggestions()
+                  .Should()
+                  .NotContain(new[] { "apl", "bnn" });
+        }
+
         [Fact]
         public void When_a_subcommand_has_been_specified_then_its_sibling_options_will_be_suggested()
         {
diff --git a/src/System.CommandLine/Parsing/ParseResultExtensions.cs b/src/System.CommandLine/Parsing/ParseResultExtensions.cs
@@ -234,7 +234,7 @@ currentSymbol is ISuggestionSource currentSuggestionSource
                                      .Except(parentSymbol
                                              .Children
                                              .OfType<ICommand>()
-                                             .Select(c => c.Name));
+                                             .SelectMany(c => c.RawAliases));
             }
 
             if (currentSymbolResult is CommandResult commandResult)

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ currentSymbol is ISuggestionSource currentSuggestionSource`
`234`	`234`	`.Except(parentSymbol`
`235`	`235`	`.Children`
`236`	`236`	`.OfType<ICommand>()`
`237`		`- .Select(c => c.Name));`
	`237`	`+ .SelectMany(c => c.RawAliases));`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`if (currentSymbolResult is CommandResult commandResult)`