Skip to content

Commit 2a3ca24

Browse files
dibarbetdibarbet
committed
Do not parse URIs during LSP serialization/deserialization
1 parent 095410a commit 2a3ca24

File tree

103 files changed

+581
-368
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+581
-368
lines changed

‎src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/AbstractVSTypeScriptRequestHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ internal abstract class AbstractVSTypeScriptRequestHandler<TRequestType, TRespon
3131

3232
var textDocumentIdentifier = new VSTextDocumentIdentifier
3333
{
34-
Uri = typeScriptIdentifier.Value.Uri,
34+
Uri = new(typeScriptIdentifier.Value.Uri),
3535
};
3636

3737
if (typeScriptIdentifier.Value.ProjectId != null)

‎src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
using Microsoft.CodeAnalysis.Text;
3232
using Microsoft.CommonLanguageServerProtocol.Framework;
3333
using Nerdbank.Streams;
34+
using Roslyn.LanguageServer.Protocol;
3435
using Roslyn.Utilities;
3536
using StreamJsonRpc;
3637
using Xunit;
@@ -74,7 +75,7 @@ internal class TestSpanMapper : ISpanMappingService
7475
internal static readonly LSP.Location MappedFileLocation = new LSP.Location
7576
{
7677
Range = ProtocolConversions.LinePositionToRange(s_mappedLinePosition),
77-
Uri = ProtocolConversions.CreateAbsoluteUri(s_mappedFilePath)
78+
Uri = ProtocolConversions.CreateAbsoluteDocumentUri(s_mappedFilePath)
7879
};
7980

8081
/// <summary>
@@ -159,7 +160,7 @@ private protected static int CompareLocations(LSP.Location? l1, LSP.Location? l2
159160
if (l2 is null)
160161
return 1;
161162

162-
var compareDocument = l1.Uri.AbsoluteUri.CompareTo(l2.Uri.AbsoluteUri);
163+
var compareDocument = l1.Uri.UriString.CompareTo(l2.Uri.UriString);
163164
var compareRange = CompareRange(l1.Range, l2.Range);
164165
return compareDocument != 0 ? compareDocument : compareRange;
165166
}
@@ -206,7 +207,7 @@ internal static LSP.SymbolInformation CreateSymbolInformation(LSP.SymbolKind kin
206207
return info;
207208
}
208209

209-
private protected static LSP.TextDocumentIdentifier CreateTextDocumentIdentifier(Uri uri, ProjectId? projectContext = null)
210+
private protected static LSP.TextDocumentIdentifier CreateTextDocumentIdentifier(DocumentUri uri, ProjectId? projectContext = null)
210211
{
211212
var documentIdentifier = new LSP.VSTextDocumentIdentifier { Uri = uri };
212213

@@ -474,7 +475,7 @@ protected static async Task RemoveGeneratorAsync(AnalyzerReference reference, Ed
474475

475476
return locations;
476477

477-
static LSP.Location ConvertTextSpanWithTextToLocation(TextSpan span, SourceText text, Uri documentUri)
478+
static LSP.Location ConvertTextSpanWithTextToLocation(TextSpan span, SourceText text, DocumentUri documentUri)
478479
{
479480
var location = new LSP.Location
480481
{
@@ -500,7 +501,7 @@ private static string GetDocumentFilePathFromName(string documentName)
500501
=> "C:\\" + documentName;
501502

502503
private static LSP.DidChangeTextDocumentParams CreateDidChangeTextDocumentParams(
503-
Uri documentUri,
504+
DocumentUri documentUri,
504505
ImmutableArray<(LSP.Range Range, string Text)> changes)
505506
{
506507
var changeEvents = changes.Select(change => new LSP.TextDocumentContentChangeEvent
@@ -519,7 +520,7 @@ private static LSP.DidChangeTextDocumentParams CreateDidChangeTextDocumentParams
519520
};
520521
}
521522

522-
private static LSP.DidOpenTextDocumentParams CreateDidOpenTextDocumentParams(Uri uri, string source, string languageId = "")
523+
private static LSP.DidOpenTextDocumentParams CreateDidOpenTextDocumentParams(DocumentUri uri, string source, string languageId = "")
523524
=> new LSP.DidOpenTextDocumentParams
524525
{
525526
TextDocument = new LSP.TextDocumentItem
@@ -530,7 +531,7 @@ private static LSP.DidOpenTextDocumentParams CreateDidOpenTextDocumentParams(Uri
530531
}
531532
};
532533

533-
private static LSP.DidCloseTextDocumentParams CreateDidCloseTextDocumentParams(Uri uri)
534+
private static LSP.DidCloseTextDocumentParams CreateDidCloseTextDocumentParams(DocumentUri uri)
534535
=> new LSP.DidCloseTextDocumentParams()
535536
{
536537
TextDocument = new LSP.TextDocumentIdentifier
@@ -650,14 +651,14 @@ private static RoslynLanguageServer CreateLanguageServer(Stream inputStream, Str
650651
return languageServer;
651652
}
652653

653-
public async Task<Document> GetDocumentAsync(Uri uri)
654+
public async Task<Document> GetDocumentAsync(DocumentUri uri)
654655
{
655656
var document = await GetCurrentSolution().GetDocumentAsync(new LSP.TextDocumentIdentifier { Uri = uri }, CancellationToken.None).ConfigureAwait(false);
656657
Contract.ThrowIfNull(document, $"Unable to find document with {uri} in solution");
657658
return document;
658659
}
659660

660-
public async Task<SourceText> GetDocumentTextAsync(Uri uri)
661+
public async Task<SourceText> GetDocumentTextAsync(DocumentUri uri)
661662
{
662663
var document = await GetDocumentAsync(uri).ConfigureAwait(false);
663664
return await document.GetTextAsync(CancellationToken.None).ConfigureAwait(false);
@@ -692,7 +693,7 @@ public Task ExecutePreSerializedRequestAsync(string methodName, JsonDocument ser
692693
return _clientRpc.InvokeWithParameterObjectAsync(methodName, serializedRequest);
693694
}
694695

695-
public async Task OpenDocumentAsync(Uri documentUri, string? text = null, string languageId = "")
696+
public async Task OpenDocumentAsync(DocumentUri documentUri, string? text = null, string languageId = "")
696697
{
697698
if (text == null)
698699
{
@@ -706,15 +707,15 @@ public async Task OpenDocumentAsync(Uri documentUri, string? text = null, string
706707
await ExecuteRequestAsync<LSP.DidOpenTextDocumentParams, object>(LSP.Methods.TextDocumentDidOpenName, didOpenParams, CancellationToken.None);
707708
}
708709

709-
public Task ReplaceTextAsync(Uri documentUri, params (LSP.Range Range, string Text)[] changes)
710+
public Task ReplaceTextAsync(DocumentUri documentUri, params (LSP.Range Range, string Text)[] changes)
710711
{
711712
var didChangeParams = CreateDidChangeTextDocumentParams(
712713
documentUri,
713714
[.. changes]);
714715
return ExecuteRequestAsync<LSP.DidChangeTextDocumentParams, object>(LSP.Methods.TextDocumentDidChangeName, didChangeParams, CancellationToken.None);
715716
}
716717

717-
public Task InsertTextAsync(Uri documentUri, params (int Line, int Column, string Text)[] changes)
718+
public Task InsertTextAsync(DocumentUri documentUri, params (int Line, int Column, string Text)[] changes)
718719
{
719720
return ReplaceTextAsync(documentUri, [.. changes.Select(change => (new LSP.Range
720721
{
@@ -723,7 +724,7 @@ public Task InsertTextAsync(Uri documentUri, params (int Line, int Column, strin
723724
}, change.Text))]);
724725
}
725726

726-
public Task DeleteTextAsync(Uri documentUri, params (int StartLine, int StartColumn, int EndLine, int EndColumn)[] changes)
727+
public Task DeleteTextAsync(DocumentUri documentUri, params (int StartLine, int StartColumn, int EndLine, int EndColumn)[] changes)
727728
{
728729
return ReplaceTextAsync(documentUri, [.. changes.Select(change => (new LSP.Range
729730
{
@@ -732,7 +733,7 @@ public Task DeleteTextAsync(Uri documentUri, params (int StartLine, int StartCol
732733
}, string.Empty))]);
733734
}
734735

735-
public Task CloseDocumentAsync(Uri documentUri)
736+
public Task CloseDocumentAsync(DocumentUri documentUri)
736737
{
737738
var didCloseParams = CreateDidCloseTextDocumentParams(documentUri);
738739
return ExecuteRequestAsync<LSP.DidCloseTextDocumentParams, object>(LSP.Methods.TextDocumentDidCloseName, didCloseParams, CancellationToken.None);
@@ -790,7 +791,7 @@ internal async Task WaitForDiagnosticsAsync()
790791

791792
internal T GetRequiredLspService<T>() where T : class, ILspService => LanguageServer.GetTestAccessor().GetRequiredLspService<T>();
792793

793-
internal ImmutableArray<SourceText> GetTrackedTexts() => [.. GetManager().GetTrackedLspText().Values.Select(v => v.Text)];
794+
internal ImmutableArray<SourceText> GetTrackedTexts() => [.. GetManager().GetTrackedLspText().Values.Select(v => v.SourceText)];
794795

795796
internal Task RunCodeAnalysisAsync(ProjectId? projectId)
796797
=> _codeAnalysisService.RunAnalysisAsync(GetCurrentSolution(), projectId, onAfterProjectAnalyzed: _ => { }, CancellationToken.None);

‎src/Features/Lsif/Generator/Generator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public async Task GenerateForProjectAsync(
212212

213213
var contentBase64Encoded = await GetBase64EncodedContentAsync(document, cancellationToken);
214214

215-
var documentVertex = new Graph.LsifDocument(document.GetURI(), GetLanguageKind(semanticModel.Language), contentBase64Encoded, idFactory);
215+
var documentVertex = new Graph.LsifDocument(document.GetURI().GetRequiredParsedUri(), GetLanguageKind(semanticModel.Language), contentBase64Encoded, idFactory);
216216
lsifJsonWriter.Write(documentVertex);
217217
lsifJsonWriter.Write(new Event(Event.EventKind.Begin, documentVertex.GetId(), idFactory));
218218

‎src/Features/Lsif/GeneratorTest/ProjectStructureTests.vb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Namespace Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests
7676
Await TestLsifOutput.GenerateForWorkspaceAsync(workspace, New LineModeLsifJsonWriter(stringWriter))
7777

7878
Dim generatedDocument = Assert.Single(Await workspace.CurrentSolution.Projects.Single().GetSourceGeneratedDocumentsAsync())
79-
Dim uri = SourceGeneratedDocumentUri.Create(generatedDocument.Identity)
79+
Dim uri = SourceGeneratedDocumentUri.Create(generatedDocument.Identity).GetRequiredParsedUri()
8080
Dim outputText = stringWriter.ToString()
8181
Assert.Contains(uri.AbsoluteUri, outputText)
8282
End Function

‎src/LanguageServer/ExternalAccess/CompilerDeveloperSDK/Handler/AbstractCompilerDeveloperSdkLspServiceDocumentRequestHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal abstract class AbstractCompilerDeveloperSdkLspServiceDocumentRequestHan
2222
bool ISolutionRequiredHandler.RequiresLSPSolution => RequiresLSPSolution;
2323

2424
TextDocumentIdentifier ITextDocumentIdentifierHandler<TRequest, TextDocumentIdentifier>.GetTextDocumentIdentifier(TRequest request)
25-
=> new() { Uri = GetTextDocumentIdentifier(request) };
25+
=> new() { Uri = new(GetTextDocumentIdentifier(request)) };
2626
Task<TResponse> IRequestHandler<TRequest, TResponse, LspRequestContext>.HandleRequestAsync(TRequest request, LspRequestContext context, CancellationToken cancellationToken)
2727
=> HandleRequestAsync(request, new RequestContext(context), cancellationToken);
2828
}

‎src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/LspFileChangeWatcherTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public async Task CreatingDirectoryWatchRequestsDirectoryWatch()
6262

6363
var watcher = GetSingleFileWatcher(dynamicCapabilitiesRpcTarget);
6464

65-
Assert.Equal(tempDirectory.Path, watcher.GlobPattern.Second.BaseUri.Second.LocalPath);
65+
Assert.Equal(tempDirectory.Path, watcher.GlobPattern.Second.BaseUri.Second.GetRequiredParsedUri().LocalPath);
6666
Assert.Equal("**/*", watcher.GlobPattern.Second.Pattern);
6767

6868
// Get rid of the registration and it should be gone again
@@ -93,7 +93,7 @@ public async Task CreatingFileWatchRequestsFileWatch()
9393

9494
var watcher = GetSingleFileWatcher(dynamicCapabilitiesRpcTarget);
9595

96-
Assert.Equal("Z:\\", watcher.GlobPattern.Second.BaseUri.Second.LocalPath);
96+
Assert.Equal("Z:\\", watcher.GlobPattern.Second.BaseUri.Second.GetRequiredParsedUri().LocalPath);
9797
Assert.Equal("SingleFile.txt", watcher.GlobPattern.Second.Pattern);
9898

9999
// Get rid of the registration and it should be gone again

‎src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/ServerInitializationTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public ServerInitializationTests(ITestOutputHelper testOutputHelper) : base(test
1818
public async Task TestServerHandlesTextSyncRequestsAsync()
1919
{
2020
await using var server = await CreateLanguageServerAsync();
21-
var document = new VersionedTextDocumentIdentifier { Uri = ProtocolConversions.CreateAbsoluteUri("C:\\\ue25b\ud86d\udeac.cs") };
21+
var document = new VersionedTextDocumentIdentifier { Uri = ProtocolConversions.CreateAbsoluteDocumentUri("C:\\\ue25b\ud86d\udeac.cs") };
2222
var response = await server.ExecuteRequestAsync<DidOpenTextDocumentParams, object>(Methods.TextDocumentDidOpenName, new DidOpenTextDocumentParams
2323
{
2424
TextDocument = new TextDocumentItem

‎src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/FileWatching/LspFileChangeWatcher.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private void WatchedFilesHandler_OnNotificationRaised(object? sender, DidChangeW
104104
{
105105
foreach (var changedFile in e.Changes)
106106
{
107-
var filePath = changedFile.Uri.LocalPath;
107+
var filePath = changedFile.Uri.GetRequiredParsedUri().LocalPath;
108108

109109
// Unfortunately the LSP protocol doesn't give us any hint of which of the file watches we might have sent to the client
110110
// was the one that registered for this change, so we have to check paths to see if this one we should respond to.
@@ -152,7 +152,7 @@ public IWatchedFile EnqueueWatchingFile(string filePath)
152152
// TODO: figure out how I just can do an absolute path watch
153153
GlobPattern = new RelativePattern
154154
{
155-
BaseUri = ProtocolConversions.CreateAbsoluteUri(Path.GetDirectoryName(filePath)!),
155+
BaseUri = ProtocolConversions.CreateAbsoluteDocumentUri(Path.GetDirectoryName(filePath)!),
156156
Pattern = Path.GetFileName(filePath)
157157
}
158158
};

‎src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/Razor/RazorDynamicFileChangedHandler.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Composition;
66
using Microsoft.CodeAnalysis.Host.Mef;
77
using Microsoft.CodeAnalysis.LanguageServer.Handler;
8+
using Roslyn.LanguageServer.Protocol;
89

910
namespace Microsoft.CodeAnalysis.LanguageServer.HostWorkspace.Razor;
1011

@@ -27,7 +28,8 @@ public RazorDynamicFileChangedHandler(RazorDynamicFileInfoProvider razorDynamicF
2728

2829
public Task HandleNotificationAsync(RazorDynamicFileChangedParams request, RequestContext requestContext, CancellationToken cancellationToken)
2930
{
30-
var filePath = ProtocolConversions.GetDocumentFilePathFromUri(request.RazorDocument.Uri);
31+
var parsedUri = request.RazorDocument.Uri.GetRequiredParsedUri();
32+
var filePath = ProtocolConversions.GetDocumentFilePathFromUri(parsedUri);
3133
_razorDynamicFileInfoProvider.Update(filePath);
3234
return Task.CompletedTask;
3335
}

‎src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/Razor/RazorDynamicFileInfoProvider.TextChangesTextLoader.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Microsoft.CodeAnalysis;
77
using Microsoft.CodeAnalysis.LanguageServer.LanguageServer;
88
using Microsoft.CodeAnalysis.Text;
9+
using Roslyn.LanguageServer.Protocol;
910
using Roslyn.Utilities;
1011

1112
namespace Microsoft.CodeAnalysis.LanguageServer.HostWorkspace.Razor;
@@ -18,14 +19,14 @@ private sealed class TextChangesTextLoader(
1819
byte[] checksum,
1920
SourceHashAlgorithm checksumAlgorithm,
2021
int? codePage,
21-
Uri razorUri) : TextLoader
22+
DocumentUri razorUri) : TextLoader
2223
{
2324
private readonly TextDocument? _document = document;
2425
private readonly IEnumerable<RazorDynamicFileUpdate> _updates = updates;
2526
private readonly byte[] _checksum = checksum;
2627
private readonly SourceHashAlgorithm _checksumAlgorithm = checksumAlgorithm;
2728
private readonly int? _codePage = codePage;
28-
private readonly Uri _razorUri = razorUri;
29+
private readonly DocumentUri _razorUri = razorUri;
2930

3031
private readonly Lazy<SourceText> _emptySourceText = new Lazy<SourceText>(() =>
3132
{

0 commit comments

Comments
 (0)