Added Colon as a Commit Character

dotnet · Apr 29, 2020 · bc89c59 · bc89c59
1 parent 646983a
commit bc89c59
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/...Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionEndpoint.cs b/...Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionEndpoint.cs
@@ -264,6 +264,7 @@ internal bool TryConvert(RazorCompletionItem razorCompletionItem, out Completion
                             FilterText = razorCompletionItem.InsertText,
                             SortText = razorCompletionItem.InsertText,
                             Kind = CompletionItemKind.TypeParameter,
+                            CommitCharacters = new Container<string>(razorCompletionItem.CommitCharacters),
                         };
 
                         var indexerCompletion = razorCompletionItem.DisplayText.EndsWith("...");

diff --git a/...soft.CodeAnalysis.Razor.Workspaces/Completion/DirectiveAttributeCompletionItemProvider.cs b/...soft.CodeAnalysis.Razor.Workspaces/Completion/DirectiveAttributeCompletionItemProvider.cs
@@ -16,6 +16,8 @@ namespace Microsoft.CodeAnalysis.Razor.Completion
     [Export(typeof(RazorCompletionItemProvider))]
     internal class DirectiveAttributeCompletionItemProvider : DirectiveAttributeCompletionItemProviderBase
     {
+        private static readonly IReadOnlyCollection<string> ElementCommitCharacters = new HashSet<string> { ":" };
+
         private readonly TagHelperFactsService _tagHelperFactsService;
 
         [ImportingConstructor]
@@ -153,7 +155,8 @@ internal IReadOnlyList<RazorCompletionItem> GetAttributeCompletions(
                 var razorCompletionItem = new RazorCompletionItem(
                     completion.Key,
                     insertText,
-                    RazorCompletionItemKind.DirectiveAttribute);
+                    RazorCompletionItemKind.DirectiveAttribute,
+                    ElementCommitCharacters);
                 var completionDescription = new AttributeCompletionDescription(completion.Value.ToArray());
                 razorCompletionItem.SetAttributeCompletionDescription(completionDescription);
 

diff --git a/...rosoft.CodeAnalysis.Razor.Workspaces/Completion/MarkupTransitionCompletionItemProvider.cs b/...rosoft.CodeAnalysis.Razor.Workspaces/Completion/MarkupTransitionCompletionItemProvider.cs
@@ -15,7 +15,7 @@ namespace Microsoft.CodeAnalysis.Razor.Completion
 {
     internal class MarkupTransitionCompletionItemProvider : RazorCompletionItemProvider
     {
-        private static readonly IReadOnlyCollection<string> ElementCommitCharacters = new HashSet<string>{">"};
+        private static readonly IReadOnlyCollection<string> ElementCommitCharacters = new HashSet<string>{ ">" };
 
         private readonly HtmlFactsService _htmlFactsService;
 

diff --git a/...zor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/HtmlCSharp/InitializeHandler.cs b/...zor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/HtmlCSharp/InitializeHandler.cs
@@ -18,7 +18,7 @@ internal class InitializeHandler : IRequestHandler<InitializeParams, InitializeR
             {
                 CompletionProvider = new CompletionOptions()
                 {
-                    AllCommitCharacters = new[] { " ", ".", ";", ">", "=" }, // This is necessary to workaround a bug where the commit character in CompletionItem is not respected.
+                    AllCommitCharacters = new[] { " ", ".", ";", ">", "=", ":" }, // This is necessary to workaround a bug where the commit character in CompletionItem is not respected.
                     ResolveProvider = true,
                     TriggerCharacters = new[] { ".", "@", "<", "&", "\\", "/", "'", "\"", "=", ":", " ", "(" }
                 },