Added Directive [SPACE] Commit Character (#2043)

* Added Directive [SPACE] Commit Character Fixes: https://github.com/dotnet/aspnetcore/issues/22886 * Refactor
dotnet · Jun 17, 2020 · 4cd6e88 · 4cd6e88
1 parent 7cf2075
commit 4cd6e88
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/...Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionEndpoint.cs b/...Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionEndpoint.cs
@@ -248,6 +248,7 @@ internal bool TryConvert(RazorCompletionItem razorCompletionItem, out Completion
                             SortText = razorCompletionItem.DisplayText,
                             Documentation = descriptionInfo.Description,
                             Kind = CompletionItemKind.Struct,
+                            CommitCharacters = new Container<string>(razorCompletionItem.CommitCharacters),
                         };
 
                         if (razorCompletionItem == DirectiveAttributeTransitionCompletionItemProvider.TransitionCompletionItem)

diff --git a/...src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/DirectiveCompletionItemProvider.cs b/...src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/DirectiveCompletionItemProvider.cs
@@ -15,6 +15,8 @@ namespace Microsoft.CodeAnalysis.Razor.Completion
     [Export(typeof(RazorCompletionItemProvider))]
     internal class DirectiveCompletionItemProvider : RazorCompletionItemProvider
     {
+        private static readonly IReadOnlyCollection<string> DirectiveCommitCharacters = new string[] { " " };
+
         private static readonly IEnumerable<DirectiveDescriptor> DefaultDirectives = new[]
         {
             CSharpCodeParser.AddTagHelperDirectiveDescriptor,
@@ -108,7 +110,8 @@ internal static List<RazorCompletionItem> GetDirectiveCompletionItems(RazorSynta
                 var completionItem = new RazorCompletionItem(
                     completionDisplayText,
                     directive.Directive,
-                    RazorCompletionItemKind.Directive);
+                    RazorCompletionItemKind.Directive,
+                    DirectiveCommitCharacters);
                 var completionDescription = new DirectiveCompletionDescription(directive.Description);
                 completionItem.SetDirectiveCompletionDescription(completionDescription);
                 completionItems.Add(completionItem);

diff --git a/...soft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveCompletionItemProviderTest.cs b/...soft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveCompletionItemProviderTest.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
-using Moq;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.Razor.Completion
@@ -289,6 +288,7 @@ private static void AssertRazorCompletionItem(string completionDisplayText, Dire
             Assert.Equal(item.InsertText, directive.Directive);
             var completionDescription = item.GetDirectiveCompletionDescription();
             Assert.Equal(directive.Description, completionDescription.Description);
+            Assert.Single(item.CommitCharacters, " ");
         }
 
         private static void AssertRazorCompletionItem(DirectiveDescriptor directive, RazorCompletionItem item) =>