Skip to content
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

Added Directive [SPACE] Commit Character #2043

Merged
2 commits merged into from
Jun 17, 2020
Merged

Added Directive [SPACE] Commit Character #2043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f98d78d
Added Directive [SPACE] Commit Character
TanayParikh Jun 16, 2020
2d845ae
Refactor
TanayParikh Jun 16, 2020
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
1 change: 1 addition & 0 deletions ...Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionEndpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 4 additions & 1 deletion ...src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/DirectiveCompletionItemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...soft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveCompletionItemProviderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) =>
Expand Down