Skip to content

Commit 499eff3

Browse files
davidwengierdavidwengier
committed
Rename methods
1 parent 8b1dabe commit 499eff3

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

‎src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorProjectService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
1414

1515
internal interface IRazorProjectService
1616
{
17-
Task AddDocumentAsync(string filePath, CancellationToken cancellationToken);
17+
Task AddDocumentToMiscProjectAsync(string filePath, CancellationToken cancellationToken);
1818
Task OpenDocumentAsync(string filePath, SourceText sourceText, int version, CancellationToken cancellationToken);
1919
Task UpdateDocumentAsync(string filePath, SourceText sourceText, int version, CancellationToken cancellationToken);
2020
Task CloseDocumentAsync(string filePath, CancellationToken cancellationToken);

‎src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorProjectService.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ public void Dispose()
4646
_gate.Dispose();
4747
}
4848

49-
public async Task AddDocumentAsync(string filePath, CancellationToken cancellationToken)
49+
public async Task AddDocumentToMiscProjectAsync(string filePath, CancellationToken cancellationToken)
5050
{
5151
using var _ = await _gate.EnterAsync(cancellationToken).ConfigureAwait(false);
5252

53-
await AddDocumentNeedsLocksAsync(filePath, cancellationToken).ConfigureAwait(false);
53+
await AddDocumentToMiscProjectNeedsLocksAsync(filePath, cancellationToken).ConfigureAwait(false);
5454
}
5555

56-
private async Task AddDocumentNeedsLocksAsync(string filePath, CancellationToken cancellationToken)
56+
private async Task AddDocumentToMiscProjectNeedsLocksAsync(string filePath, CancellationToken cancellationToken)
5757
{
5858
var textDocumentPath = FilePathNormalizer.Normalize(filePath);
5959

@@ -122,7 +122,7 @@ public async Task OpenDocumentAsync(string filePath, SourceText sourceText, int
122122
{
123123
// Document hasn't been added. This usually occurs when VSCode trumps all other initialization
124124
// processes and pre-initializes already open documents.
125-
await AddDocumentNeedsLocksAsync(filePath, cancellationToken).ConfigureAwait(false);
125+
await AddDocumentToMiscProjectNeedsLocksAsync(filePath, cancellationToken).ConfigureAwait(false);
126126
}
127127

128128
await ActOnDocumentInMultipleProjectsAsync(

‎src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorFileSynchronizer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal class RazorFileSynchronizer(IRazorProjectService projectService) : IRaz
1717
public Task RazorFileChangedAsync(string filePath, RazorFileChangeKind kind, CancellationToken cancellationToken)
1818
=> kind switch
1919
{
20-
RazorFileChangeKind.Added => _projectService.AddDocumentAsync(filePath, cancellationToken),
20+
RazorFileChangeKind.Added => _projectService.AddDocumentToMiscProjectAsync(filePath, cancellationToken),
2121
RazorFileChangeKind.Removed => _projectService.RemoveDocumentAsync(filePath, cancellationToken),
2222
_ => Task.CompletedTask
2323
};

‎src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultRazorComponentSearchEngineTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ await projectService.AddProjectAsync(
7777
displayName: "",
7878
DisposalToken);
7979

80-
await projectService.AddDocumentAsync(s_componentFilePath1, DisposalToken);
80+
await projectService.AddDocumentToMiscProjectAsync(s_componentFilePath1, DisposalToken);
8181
await projectService.UpdateDocumentAsync(s_componentFilePath1, SourceText.From(""), version: 1, DisposalToken);
8282

83-
await projectService.AddDocumentAsync(s_componentFilePath2, DisposalToken);
83+
await projectService.AddDocumentToMiscProjectAsync(s_componentFilePath2, DisposalToken);
8484
await projectService.UpdateDocumentAsync(s_componentFilePath2, SourceText.From("@namespace Test"), version: 1, DisposalToken);
8585

8686
await projectService.AddProjectAsync(
@@ -91,7 +91,7 @@ await projectService.AddProjectAsync(
9191
displayName: "",
9292
DisposalToken);
9393

94-
await projectService.AddDocumentAsync(s_componentFilePath3, DisposalToken);
94+
await projectService.AddDocumentToMiscProjectAsync(s_componentFilePath3, DisposalToken);
9595
await projectService.UpdateDocumentAsync(s_componentFilePath3, SourceText.From(""), version: 1, DisposalToken);
9696
}
9797

‎src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorFileSynchronizerTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public async Task RazorFileChanged_Added_AddsRazorDocument()
2222
var filePath = "/path/to/file.razor";
2323
var projectService = new StrictMock<IRazorProjectService>();
2424
projectService
25-
.Setup(service => service.AddDocumentAsync(filePath, It.IsAny<CancellationToken>()))
25+
.Setup(service => service.AddDocumentToMiscProjectAsync(filePath, It.IsAny<CancellationToken>()))
2626
.Returns(Task.CompletedTask)
2727
.Verifiable();
2828
var synchronizer = new RazorFileSynchronizer(projectService.Object);
@@ -41,7 +41,7 @@ public async Task RazorFileChanged_Added_AddsCSHTMLDocument()
4141
var filePath = "/path/to/file.cshtml";
4242
var projectService = new StrictMock<IRazorProjectService>();
4343
projectService
44-
.Setup(service => service.AddDocumentAsync(filePath, It.IsAny<CancellationToken>()))
44+
.Setup(service => service.AddDocumentToMiscProjectAsync(filePath, It.IsAny<CancellationToken>()))
4545
.Returns(Task.CompletedTask)
4646
.Verifiable();
4747
var synchronizer = new RazorFileSynchronizer(projectService.Object);

‎src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorProjectServiceTest.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ public async Task CloseDocument_ClosesDocumentInOwnerProject()
439439

440440
var ownerProjectKey = await _projectService.AddProjectAsync(
441441
ProjectFilePath, IntermediateOutputPath, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
442-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
442+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
443443
await _projectService.OpenDocumentAsync(DocumentFilePath, s_emptyText, version: 42, DisposalToken);
444444

445445
var ownerProject = _projectManager.GetLoadedProject(ownerProjectKey);
@@ -472,7 +472,7 @@ public async Task CloseDocument_ClosesDocumentInAllOwnerProjects()
472472
ProjectFilePath, IntermediateOutputPath1, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
473473
var ownerProjectKey2 = await _projectService.AddProjectAsync(
474474
ProjectFilePath, IntermediateOutputPath2, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
475-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
475+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
476476
await _projectService.OpenDocumentAsync(DocumentFilePath, s_emptyText, version: 42, DisposalToken);
477477

478478
var ownerProject1 = _projectManager.GetLoadedProject(ownerProjectKey1);
@@ -499,7 +499,7 @@ public async Task CloseDocument_ClosesDocumentInMiscellaneousProject()
499499
// Arrange
500500
const string DocumentFilePath = "document.cshtml";
501501

502-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
502+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
503503
await _projectService.OpenDocumentAsync(DocumentFilePath, s_emptyText, version: 42, DisposalToken);
504504

505505
var miscProject = await _snapshotResolver.GetMiscellaneousProjectAsync(DisposalToken);
@@ -529,7 +529,7 @@ public async Task OpenDocument_OpensAlreadyAddedDocumentInOwnerProject()
529529

530530
var ownerProjectKey = await _projectService.AddProjectAsync(
531531
ProjectFilePath, IntermediateOutputPath, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
532-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
532+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
533533

534534
var ownerProject = _projectManager.GetLoadedProject(ownerProjectKey);
535535

@@ -561,7 +561,7 @@ public async Task OpenDocument_OpensAlreadyAddedDocumentInAllOwnerProjects()
561561
ProjectFilePath, IntermediateOutputPath1, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
562562
var ownerProjectKey2 = await _projectService.AddProjectAsync(
563563
ProjectFilePath, IntermediateOutputPath2, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
564-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
564+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
565565

566566
var ownerProject1 = _projectManager.GetLoadedProject(ownerProjectKey1);
567567
var ownerProject2 = _projectManager.GetLoadedProject(ownerProjectKey2);
@@ -587,7 +587,7 @@ public async Task OpenDocument_OpensAlreadyAddedDocumentInMiscellaneousProject()
587587
// Arrange
588588
const string DocumentFilePath = "document.cshtml";
589589

590-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
590+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
591591

592592
var miscProject = await _snapshotResolver.GetMiscellaneousProjectAsync(DisposalToken);
593593

@@ -638,14 +638,14 @@ public async Task AddDocument_NoopsIfDocumentIsAlreadyAdded()
638638
// Arrange
639639
const string DocumentFilePath = "document.cshtml";
640640

641-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
641+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
642642

643643
var miscProject = await _snapshotResolver.GetMiscellaneousProjectAsync(DisposalToken);
644644

645645
using var listener = _projectManager.ListenToNotifications();
646646

647647
// Act
648-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
648+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
649649

650650
// Assert
651651
listener.AssertNoNotifications();
@@ -668,7 +668,7 @@ public async Task AddDocument_AddsDocumentToOwnerProject()
668668
using var listener = _projectManager.ListenToNotifications();
669669

670670
// Act
671-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
671+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
672672

673673
// Assert
674674
listener.AssertNotifications(
@@ -688,7 +688,7 @@ public async Task AddDocument_AddsDocumentToMiscellaneousProject()
688688
using var listener = _projectManager.ListenToNotifications();
689689

690690
// Act
691-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
691+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
692692

693693
// Assert
694694
listener.AssertNotifications(
@@ -708,7 +708,7 @@ public async Task RemoveDocument_RemovesDocumentFromOwnerProject()
708708

709709
var ownerProjectKey = await _projectService.AddProjectAsync(
710710
ProjectFilePath, IntermediateOutputPath, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
711-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
711+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
712712

713713
var ownerProject = _projectManager.GetLoadedProject(ownerProjectKey);
714714

@@ -738,7 +738,7 @@ public async Task RemoveDocument_RemovesDocumentFromAllOwnerProjects()
738738
ProjectFilePath, IntermediateOutputPath1, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
739739
var ownerProjectKey2 = await _projectService.AddProjectAsync(
740740
ProjectFilePath, IntermediateOutputPath2, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
741-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
741+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
742742

743743
var ownerProject1 = _projectManager.GetLoadedProject(ownerProjectKey1);
744744
var ownerProject2 = _projectManager.GetLoadedProject(ownerProjectKey2);
@@ -767,7 +767,7 @@ public async Task RemoveOpenDocument_RemovesDocumentFromOwnerProject_MovesToMisc
767767

768768
var ownerProjectKey = await _projectService.AddProjectAsync(
769769
ProjectFilePath, IntermediateOutputPath, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
770-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
770+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
771771
await _projectService.OpenDocumentAsync(DocumentFilePath, s_emptyText, version: 42, DisposalToken);
772772

773773
var ownerProject = _projectManager.GetLoadedProject(ownerProjectKey);
@@ -794,7 +794,7 @@ public async Task RemoveDocument_RemovesDocumentFromMiscellaneousProject()
794794
// Arrange
795795
const string DocumentFilePath = "document.cshtml";
796796

797-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
797+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
798798

799799
var miscProject = await _snapshotResolver.GetMiscellaneousProjectAsync(DisposalToken);
800800

@@ -863,7 +863,7 @@ public async Task UpdateDocument_ChangesDocumentInOwnerProject()
863863

864864
var ownerProjectKey = await _projectService.AddProjectAsync(
865865
ProjectFilePath, IntermediateOutputPath, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
866-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
866+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
867867
await _projectService.OpenDocumentAsync(DocumentFilePath, s_emptyText, version: 42, DisposalToken);
868868

869869
var ownerProject = _projectManager.GetLoadedProject(ownerProjectKey);
@@ -896,7 +896,7 @@ public async Task UpdateDocument_ChangesDocumentInAllOwnerProjects()
896896
ProjectFilePath, IntermediateOutputPath1, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
897897
var ownerProjectKey2 = await _projectService.AddProjectAsync(
898898
ProjectFilePath, IntermediateOutputPath2, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
899-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
899+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
900900
await _projectService.OpenDocumentAsync(DocumentFilePath, s_emptyText, version: 42, DisposalToken);
901901

902902
var ownerProject1 = _projectManager.GetLoadedProject(ownerProjectKey1);
@@ -923,7 +923,7 @@ public async Task UpdateDocument_ChangesDocumentInMiscProject()
923923
// Arrange
924924
const string DocumentFilePath = "document.cshtml";
925925

926-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
926+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
927927
await _projectService.OpenDocumentAsync(DocumentFilePath, s_emptyText, version: 42, DisposalToken);
928928

929929
var miscProject = await _snapshotResolver.GetMiscellaneousProjectAsync(DisposalToken);
@@ -953,7 +953,7 @@ public async Task UpdateDocument_TracksKnownDocumentVersion()
953953

954954
var ownerProjectKey = await _projectService.AddProjectAsync(
955955
ProjectFilePath, IntermediateOutputPath, RazorConfiguration.Default, RootNamespace, displayName: null, DisposalToken);
956-
await _projectService.AddDocumentAsync(DocumentFilePath, DisposalToken);
956+
await _projectService.AddDocumentToMiscProjectAsync(DocumentFilePath, DisposalToken);
957957

958958
var ownerProject = _projectManager.GetLoadedProject(ownerProjectKey);
959959

‎src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Refactoring/RenameEndpointTest.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -644,12 +644,12 @@ await projectManager.UpdateAsync(updater =>
644644
updater.ProjectWorkspaceStateChanged(projectKey1, ProjectWorkspaceState.Create(tagHelpers));
645645
});
646646

647-
await projectService.AddDocumentAsync(s_componentFilePath1, DisposalToken);
648-
await projectService.AddDocumentAsync(s_componentFilePath2, DisposalToken);
649-
await projectService.AddDocumentAsync(s_directoryFilePath1, DisposalToken);
650-
await projectService.AddDocumentAsync(s_directoryFilePath2, DisposalToken);
651-
await projectService.AddDocumentAsync(s_componentFilePath1337, DisposalToken);
652-
await projectService.AddDocumentAsync(s_indexFilePath1, DisposalToken);
647+
await projectService.AddDocumentToMiscProjectAsync(s_componentFilePath1, DisposalToken);
648+
await projectService.AddDocumentToMiscProjectAsync(s_componentFilePath2, DisposalToken);
649+
await projectService.AddDocumentToMiscProjectAsync(s_directoryFilePath1, DisposalToken);
650+
await projectService.AddDocumentToMiscProjectAsync(s_directoryFilePath2, DisposalToken);
651+
await projectService.AddDocumentToMiscProjectAsync(s_componentFilePath1337, DisposalToken);
652+
await projectService.AddDocumentToMiscProjectAsync(s_indexFilePath1, DisposalToken);
653653

654654
await projectService.UpdateDocumentAsync(s_componentFilePath1, SourceText.From(ComponentText1), version: 42, DisposalToken);
655655
await projectService.UpdateDocumentAsync(s_componentFilePath2, SourceText.From(ComponentText2), version: 42, DisposalToken);
@@ -666,9 +666,9 @@ await projectManager.UpdateAsync(updater =>
666666
updater.ProjectWorkspaceStateChanged(projectKey2, ProjectWorkspaceState.Create(tagHelpers));
667667
});
668668

669-
await projectService.AddDocumentAsync(s_componentFilePath3, DisposalToken);
670-
await projectService.AddDocumentAsync(s_componentFilePath4, DisposalToken);
671-
await projectService.AddDocumentAsync(s_componentWithParamFilePath, DisposalToken);
669+
await projectService.AddDocumentToMiscProjectAsync(s_componentFilePath3, DisposalToken);
670+
await projectService.AddDocumentToMiscProjectAsync(s_componentFilePath4, DisposalToken);
671+
await projectService.AddDocumentToMiscProjectAsync(s_componentWithParamFilePath, DisposalToken);
672672

673673
await projectService.UpdateDocumentAsync(s_componentFilePath3, SourceText.From(ComponentText3), version: 42, DisposalToken);
674674
await projectService.UpdateDocumentAsync(s_componentFilePath4, SourceText.From(ComponentText4), version: 42, DisposalToken);

0 commit comments

Comments
 (0)