Skip to content

Commit b19eff2

Browse files
authored
Better creation of DocumentUris (#11998)
A recent Roslyn update gave us access to a better method.
2 parents e56dfe2 + 520c851 commit b19eff2

22 files changed

+25
-25
lines changed

src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/FoldingRange/CohostFoldingRangeEndpoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
9393
{
9494
var foldingRangeParams = new FoldingRangeParams
9595
{
96-
TextDocument = new TextDocumentIdentifier { DocumentUri = new(razorDocument.CreateUri()) }
96+
TextDocument = new TextDocumentIdentifier { DocumentUri = razorDocument.CreateDocumentUri() }
9797
};
9898

9999
var result = await _requestInvoker.MakeHtmlLspRequestAsync<FoldingRangeParams, FoldingRange[]>(

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RemoteCodeActionsService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private async ValueTask<CodeActionRequestInfo> GetCodeActionRequestInfoAsync(Rem
5151
{
5252
// Since we're here, we may as well fill in the generated document Uri so the other caller won't have to calculate it
5353
var generatedDocument = await context.Snapshot.GetGeneratedDocumentAsync(cancellationToken).ConfigureAwait(false);
54-
csharpRequest.TextDocument.DocumentUri = new(generatedDocument.CreateUri());
54+
csharpRequest.TextDocument.DocumentUri = generatedDocument.CreateDocumentUri();
5555
}
5656
}
5757

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/HtmlDocumentPublisher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public async Task PublishAsync(TextDocument document, SynchronizationResult sync
2424
{
2525
Assumed.True(synchronizationResult.Synchronized);
2626

27-
var request = new HtmlUpdateParameters(new TextDocumentIdentifier { DocumentUri = new(document.CreateUri()) }, synchronizationResult.Checksum.ToString(), htmlText);
27+
var request = new HtmlUpdateParameters(new TextDocumentIdentifier { DocumentUri = document.CreateDocumentUri() }, synchronizationResult.Checksum.ToString(), htmlText);
2828

2929
var clientConnection = _razorClientServerManagerProvider.ClientLanguageServerManager.AssumeNotNull();
3030
await clientConnection.SendRequestAsync("razor/updateHtml", request, cancellationToken).ConfigureAwait(false);

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/HtmlRequestInvoker.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ internal sealed class HtmlRequestInvoker(
4040
var forwardedRequest = new HtmlForwardedRequest<TRequest>(
4141
new TextDocumentIdentifier
4242
{
43-
DocumentUri = new(razorDocument.CreateUri())
43+
DocumentUri = razorDocument.CreateDocumentUri()
4444
},
4545
checksumString,
4646
request);

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CodeActions/CohostCodeActionsEndpointTestBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Could not find code action with name '{codeActionName}'.
138138

139139
var request = new VSCodeActionParams
140140
{
141-
TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(document.CreateUri()) },
141+
TextDocument = new VSTextDocumentIdentifier { DocumentUri = document.CreateDocumentUri() },
142142
Range = range,
143143
Context = new VSInternalCodeActionContext() { Diagnostics = diagnostics.ToArray() }
144144
};

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionEndpointTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ private async Task VerifyCompletionListAsync(
763763
{
764764
TextDocument = new TextDocumentIdentifier()
765765
{
766-
DocumentUri = new(document.CreateUri())
766+
DocumentUri = document.CreateDocumentUri()
767767
},
768768
Position = sourceText.GetPosition(input.Position),
769769
Context = completionContext

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionResolveEndpointTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private async Task VerifyCompletionItemResolveAsync(TestCode input, bool support
6363
requestInvoker,
6464
LoggerFactory);
6565

66-
var textDocumentIdentifier = new TextDocumentIdentifierAndVersion(new TextDocumentIdentifier { DocumentUri = new(document.CreateUri()) }, Version: 0);
66+
var textDocumentIdentifier = new TextDocumentIdentifierAndVersion(new TextDocumentIdentifier { DocumentUri = document.CreateDocumentUri() }, Version: 0);
6767

6868
var context = new DelegatedCompletionResolutionContext(
6969
textDocumentIdentifier,

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentHighlightEndpointTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private async Task VerifyDocumentHighlightsAsync(string input, DocumentHighlight
156156

157157
var request = new DocumentHighlightParams()
158158
{
159-
TextDocument = new TextDocumentIdentifier() { DocumentUri = new(document.CreateUri()) },
159+
TextDocument = new TextDocumentIdentifier() { DocumentUri = document.CreateDocumentUri() },
160160
Position = position
161161
};
162162

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private async Task VerifyFindAllReferencesAsync(TestCode input, bool supportsVSE
107107
var textDocumentPositionParams = new TextDocumentPositionParams
108108
{
109109
Position = position,
110-
TextDocument = new TextDocumentIdentifier { DocumentUri = new(document.CreateUri()) },
110+
TextDocument = new TextDocumentIdentifier { DocumentUri = document.CreateDocumentUri() },
111111
};
112112

113113
var results = await endpoint.GetTestAccessor().HandleRequestAsync(document, position, DisposalToken);

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ private async Task VerifyGoToDefinitionAsync(
276276
var textDocumentPositionParams = new TextDocumentPositionParams
277277
{
278278
Position = position,
279-
TextDocument = new TextDocumentIdentifier { DocumentUri = new(document.CreateUri()) },
279+
TextDocument = new TextDocumentIdentifier { DocumentUri = document.CreateDocumentUri() },
280280
};
281281

282282
return await endpoint.GetTestAccessor().HandleRequestAsync(textDocumentPositionParams, document, DisposalToken);

0 commit comments

Comments
 (0)