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

Add option for element completion commit characters #9379

Merged
merged 11 commits into from
Oct 9, 2023
Merged

Add option for element completion commit characters #9379

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
58a5491
Add new option to control the behaviour
davidwengier Oct 6, 2023
a0a2f8f
fixup
davidwengier Oct 6, 2023
d7444d3
Wire up new option to completion options
davidwengier Oct 6, 2023
d6cdda9
Stop using space as a commit character for tag helpers
davidwengier Oct 6, 2023
2d872a3
String space from commit characters from delegated servers
davidwengier Oct 6, 2023
5506fdc
Cleanup
davidwengier Oct 6, 2023
1c5c46e
Just options monitor directly since it's already here
davidwengier Oct 8, 2023
6f5b2af
Tag helper completion provider tests
davidwengier Oct 8, 2023
e8c2f6c
Tests for HtmlCommitCharacterResponseRewriter
davidwengier Oct 8, 2023
9daddbd
Remove unused parameter
davidwengier Oct 8, 2023
2df13ff
Remove unused parameter
davidwengier Oct 8, 2023
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
Prev Previous commit
Remove unused parameter
  • Loading branch information
@davidwengier
davidwengier committed Oct 8, 2023
commit 2df13ffefec06563c9dbd0ec556150f46e89beb9
3 changes: 0 additions & 3 deletions ...r/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionListProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ internal class RazorCompletionListProvider
{
private readonly IRazorCompletionFactsService _completionFactsService;
private readonly CompletionListCache _completionListCache;
private readonly RazorLSPOptionsMonitor _razorLSPOptionsMonitor;
private readonly ILogger<RazorCompletionListProvider> _logger;
private static readonly Command s_retriggerCompletionCommand = new()
{
Expand All @@ -34,12 +33,10 @@ internal class RazorCompletionListProvider
public RazorCompletionListProvider(
IRazorCompletionFactsService completionFactsService,
CompletionListCache completionListCache,
RazorLSPOptionsMonitor razorLSPOptionsMonitor,
ILoggerFactory loggerFactory)
{
_completionFactsService = completionFactsService;
_completionListCache = completionListCache;
_razorLSPOptionsMonitor = razorLSPOptionsMonitor;
_logger = loggerFactory.CreateLogger<RazorCompletionListProvider>();
}

Expand Down
2 changes: 1 addition & 1 deletion ...t/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/CompletionListProviderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public TestRazorCompletionListProvider(
VSInternalCompletionList completionList,
IEnumerable<string> triggerCharacters,
ILoggerFactory loggerFactory)
: base(null, null, TestRazorLSPOptionsMonitor.Create(), loggerFactory)
: base(null, null, loggerFactory)
{
_completionList = completionList;
TriggerCharacters = triggerCharacters.ToImmutableHashSet();
Expand Down
16 changes: 8 additions & 8 deletions ...crosoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionListProvierTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public async Task GetCompletionListAsync_ProvidesDirectiveCompletionItems()
var documentPath = "C:/path/to/document.cshtml";
var codeDocument = CreateCodeDocument("@");
var documentContext = TestDocumentContext.From(documentPath, codeDocument, hostDocumentVersion: 0);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, TestRazorLSPOptionsMonitor.Create(), LoggerFactory);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, LoggerFactory);

// Act
var completionList = await provider.GetCompletionListAsync(
Expand Down Expand Up @@ -390,7 +390,7 @@ public async Task GetCompletionListAsync_ProvidesDirectiveCompletions_Incomplete
TriggerKind = CompletionTriggerKind.TriggerForIncompleteCompletions,
InvokeKind = VSInternalCompletionInvokeKind.Deletion,
};
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, TestRazorLSPOptionsMonitor.Create(), LoggerFactory);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, LoggerFactory);

// Act
var completionList = await provider.GetCompletionListAsync(
Expand Down Expand Up @@ -418,7 +418,7 @@ public async Task GetCompletionListAsync_ProvidesInjectOnIncomplete_KeywordIn()
var codeDocument = CreateCodeDocument("@in");
codeDocument.SetTagHelperContext(tagHelperContext);
var documentContext = TestDocumentContext.From(documentPath, codeDocument, hostDocumentVersion: 0);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, TestRazorLSPOptionsMonitor.Create(), LoggerFactory);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, LoggerFactory);
var completionContext = new VSInternalCompletionContext()
{
TriggerKind = CompletionTriggerKind.TriggerForIncompleteCompletions,
Expand Down Expand Up @@ -452,7 +452,7 @@ public async Task GetCompletionListAsync_DoesNotProvideInjectOnInvoked()
var codeDocument = CreateCodeDocument("@inje");
codeDocument.SetTagHelperContext(tagHelperContext);
var documentContext = TestDocumentContext.From(documentPath, codeDocument, hostDocumentVersion: 0);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, TestRazorLSPOptionsMonitor.Create(), LoggerFactory);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, LoggerFactory);
var completionContext = new VSInternalCompletionContext()
{
TriggerKind = CompletionTriggerKind.TriggerCharacter,
Expand Down Expand Up @@ -480,7 +480,7 @@ public async Task GetCompletionListAsync_ProvidesInjectOnIncomplete()
var codeDocument = CreateCodeDocument("@inje");
codeDocument.SetTagHelperContext(tagHelperContext);
var documentContext = TestDocumentContext.From(documentPath, codeDocument, hostDocumentVersion: 0);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, TestRazorLSPOptionsMonitor.Create(), LoggerFactory);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, LoggerFactory);
var completionContext = new VSInternalCompletionContext()
{
TriggerKind = CompletionTriggerKind.TriggerForIncompleteCompletions,
Expand Down Expand Up @@ -515,7 +515,7 @@ public async Task GetCompletionListAsync_ProvidesTagHelperElementCompletionItems
var codeDocument = CreateCodeDocument("<");
codeDocument.SetTagHelperContext(tagHelperContext);
var documentContext = TestDocumentContext.From(documentPath, codeDocument, hostDocumentVersion: 0);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, TestRazorLSPOptionsMonitor.Create(), LoggerFactory);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, LoggerFactory);

// Act
var completionList = await provider.GetCompletionListAsync(
Expand Down Expand Up @@ -545,7 +545,7 @@ public async Task GetCompletionListAsync_ProvidesTagHelperAttributeItems()
var codeDocument = CreateCodeDocument("<test ");
codeDocument.SetTagHelperContext(tagHelperContext);
var documentContext = TestDocumentContext.From(documentPath, codeDocument, hostDocumentVersion: 0);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, TestRazorLSPOptionsMonitor.Create(), LoggerFactory);
var provider = new RazorCompletionListProvider(_completionFactsService, _completionListCache, LoggerFactory);

// Act
var completionList = await provider.GetCompletionListAsync(
Expand Down Expand Up @@ -580,7 +580,7 @@ public async Task GetCompletionListAsync_ProvidesTagHelperAttributeItems_Attribu
await optionsMonitor.UpdateAsync(optionsMonitor.CurrentValue with { AutoInsertAttributeQuotes = false }, DisposalToken);

var completionFactsService = new RazorCompletionFactsService(GetCompletionProviders(optionsMonitor));
var provider = new RazorCompletionListProvider(completionFactsService, _completionListCache, TestRazorLSPOptionsMonitor.Create(), LoggerFactory);
var provider = new RazorCompletionListProvider(completionFactsService, _completionListCache, LoggerFactory);

// Act
var completionList = await provider.GetCompletionListAsync(
Expand Down
Loading