small tab completion fix: tab completion to suggest only first from s…

…hort name synonyms
dotnet · Nov 23, 2022 · 4cd8b15 · 4cd8b15
1 parent e489aa8
commit 4cd8b15
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 26 deletions.
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.TabCompletion.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.TabCompletion.cs
@@ -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();

diff --git a/....UnitTests/ParserTests/Approvals/TabCompletionTests.Create_GetAllSuggestions.verified.txt b/....UnitTests/ParserTests/Approvals/TabCompletionTests.Create_GetAllSuggestions.verified.txt
@@ -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,

diff --git a/...Tests/ParserTests/Approvals/TabCompletionTests.RootCommand_GetAllSuggestions.verified.txt b/...Tests/ParserTests/Approvals/TabCompletionTests.RootCommand_GetAllSuggestions.verified.txt
@@ -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,

diff --git a/...s/ParserTests/Approvals/TabCompletionTests.TemplateCommand_GetAllSuggestions.verified.txt b/...s/ParserTests/Approvals/TabCompletionTests.TemplateCommand_GetAllSuggestions.verified.txt
@@ -21,8 +21,8 @@
     Detail:
 The target framework for the project.
 Type: choice
-  net7.0  Target net7.0
-Default: net7.0
+  net8.0  Target net8.0
+Default: net8.0
 
   },
   {
@@ -114,8 +114,8 @@ Default: false
     Detail:
 The target framework for the project.
 Type: choice
-  net7.0  Target net7.0
-Default: net7.0
+  net8.0  Target net8.0
+Default: net8.0
 
   },
   {

diff --git a/...dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt b/...dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt
@@ -16,12 +16,10 @@ nunit
 nunit-test
 page
 proto
-razor
 razorclasslib
 razorcomponent
 react
 sln
-solution
 tool-manifest
 viewimports
 viewstart