Skip to content

[release/7.0.2xx] tab completion to suggest only first from short name synonyms #29235

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 1 commit into from
Dec 12, 2022
Merged

[release/7.0.2xx] tab completion to suggest only first from short name synonyms #29235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.TabCompletion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ internal partial class InstantiateCommand : BaseCommand<InstantiateCommandArgs>
{
private static readonly TimeSpan ConstraintEvaluationTimeout = TimeSpan.FromMilliseconds(1000);

internal static IEnumerable<CompletionItem> GetTemplateNameCompletions(string? tempalteName, IEnumerable<TemplateGroup> templateGroups, IEngineEnvironmentSettings environmentSettings)
internal static IEnumerable<CompletionItem> GetTemplateNameCompletions(string? templateName, IEnumerable<TemplateGroup> templateGroups, IEngineEnvironmentSettings environmentSettings)
{
TemplateConstraintManager constraintManager = new(environmentSettings);
if (string.IsNullOrWhiteSpace(tempalteName))
if (string.IsNullOrWhiteSpace(templateName))
{
return GetAllowedTemplateGroups(constraintManager, templateGroups)
.SelectMany(g => g.ShortNames, (g, shortName) => new CompletionItem(shortName, documentation: g.Description))
.Select(g => new CompletionItem(g.ShortNames[0], documentation: g.Description))
.Distinct()
.OrderBy(c => c.Label, StringComparer.OrdinalIgnoreCase)
.ToArray();
}

IEnumerable<TemplateGroup> matchingTemplateGroups = templateGroups.Where(t => t.ShortNames.Any(sn => sn.StartsWith(tempalteName, StringComparison.OrdinalIgnoreCase)));
IEnumerable<TemplateGroup> matchingTemplateGroups =
templateGroups.Where(t => t.ShortNames.Any(sn => sn.StartsWith(templateName, StringComparison.OrdinalIgnoreCase)));

return GetAllowedTemplateGroups(constraintManager, matchingTemplateGroups)
.SelectMany(g => g.ShortNames, (g, shortName) => new CompletionItem(shortName, documentation: g.Description))
.Where(c => c.Label.StartsWith(tempalteName))
.Select(g => new CompletionItem(g.ShortNames.First(sn => sn.StartsWith(templateName, StringComparison.OrdinalIgnoreCase)), documentation: g.Description))
.Distinct()
.OrderBy(c => c.Label, StringComparer.OrdinalIgnoreCase)
.ToArray();
Expand Down
7 changes: 0 additions & 7 deletions ....UnitTests/ParserTests/Approvals/TabCompletionTests.Create_GetAllSuggestions.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@
InsertText: sln,
Documentation: Create an empty solution containing no projects
},
{
Label: solution,
Kind: Value,
SortText: solution,
InsertText: solution,
Documentation: Create an empty solution containing no projects
},
{
Label: tool-manifest,
Kind: Value,
Expand Down
7 changes: 0 additions & 7 deletions ...Tests/ParserTests/Approvals/TabCompletionTests.RootCommand_GetAllSuggestions.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@
InsertText: sln,
Documentation: Create an empty solution containing no projects
},
{
Label: solution,
Kind: Value,
SortText: solution,
InsertText: solution,
Documentation: Create an empty solution containing no projects
},
{
Label: tool-manifest,
Kind: Value,
Expand Down
2 changes: 0 additions & 2 deletions ...s/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ nunit
nunit-test
page
proto
razor
razorclasslib
razorcomponent
react
sln
solution
tool-manifest
viewimports
viewstart
Expand Down
2 changes: 0 additions & 2 deletions ...sts/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ nunit
nunit-test
page
proto
razor
razorclasslib
razorcomponent
react
sln
solution
tool-manifest
viewimports
viewstart
Expand Down
2 changes: 0 additions & 2 deletions ...dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ nunit
nunit-test
page
proto
razor
razorclasslib
razorcomponent
react
sln
solution
tool-manifest
viewimports
viewstart
Expand Down