Skip to content

Followups to previous PR that need EA changes #11949

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

Merged
merged 10 commits into from
Jun 18, 2025
Merged

Followups to previous PR that need EA changes #11949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6f2390c
Don't hard code the complex edit command name
davidwengier Jun 13, 2025
d7b2933
Specify formatting options instead of using string replacement
davidwengier Jun 13, 2025
f15257d
Update src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/For…
davidwengier Jun 13, 2025
2b94c90
Bump Roslyn
davidwengier Jun 16, 2025
97a80cf
Fix build
davidwengier Jun 16, 2025
d3dcf3e
Respond to API change from PR feedback
davidwengier Jun 16, 2025
240a6b1
WIP - Move to DocumentUri
davidwengier Jun 16, 2025
05c2a06
Respond to DocumentUri changes
davidwengier Jun 17, 2025
8588037
Pass C# formatting settings override around more
davidwengier Jun 17, 2025
7488954
Move away from EditorFeatures
davidwengier Jun 17, 2025
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: 0 additions & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<PackageVersion Include="Microsoft.CodeAnalysis.EditorFeatures" Version="$(MicrosoftCodeAnalysisEditorFeaturesPackageVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="$(MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="$(MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="$(MicrosoftCodeAnalysisExternalAccessFSharpVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="$(MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="$(MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion)" />
Expand Down
84 changes: 40 additions & 44 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,89 +2,85 @@
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="f5705c8f4c5079bba77bae8698ba1583bde0388c" BarId="269610" />
<ProductDependencies>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.0.0-1.25230.6">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-1.25316.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-1.25230.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
<Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.25230.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
41 changes: 20 additions & 21 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,26 @@
-->
<PropertyGroup Label="Automated">
<MicrosoftCodeAnalysisAnalyzersPackageVersion>3.12.0-beta1.25230.6</MicrosoftCodeAnalysisAnalyzersPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-1.25230.6</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.0.0-1.25230.6</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-1.25230.6</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-1.25316.1</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.0.0-1.25316.1</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-1.25316.1</MicrosoftVisualStudioLanguageServicesPackageVersion>
<!--
Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
but are present in Version.Details.xml for source-build PVP flow. See the comment in Version.Details.xml for more information.
Expand Down
2 changes: 1 addition & 1 deletion ...ks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCodeActionsBenchmark.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public async Task RazorLightbulbAsync()
Context = new VSInternalCodeActionContext(),
TextDocument = new VSTextDocumentIdentifier
{
Uri = DocumentUri!
DocumentUri = new(DocumentUri!)
},
};

Expand Down
2 changes: 1 addition & 1 deletion ...rks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCompletionBenchmark.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public async Task RazorCompletionAsync()
Context = new VSInternalCompletionContext { },
TextDocument = new TextDocumentIdentifier
{
Uri = DocumentUri!,
DocumentUri = new(DocumentUri!),
},
};

Expand Down
2 changes: 1 addition & 1 deletion ...ks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDiagnosticsBenchmark.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void Setup()
var uri = new Uri(razorFilePath);
Request = new VSInternalDocumentDiagnosticsParams
{
TextDocument = new TextDocumentIdentifier { Uri = uri }
TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) }
};
var sourceDocument = RazorSourceDocument.Create(GetFileContents(), UTF8Encoding.UTF8, RazorSourceDocumentProperties.Default);
var codeDocument = RazorCodeDocument.Create(sourceDocument, RazorParserOptions.Default, RazorCodeGenerationOptions.DesignTimeDefault);
Expand Down
2 changes: 1 addition & 1 deletion ...NetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensRangeEndpointBenchmark.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public async Task InitializeRazorSemanticAsync()
[Benchmark(Description = "Razor Semantic Tokens Range Endpoint")]
public async Task RazorSemanticTokensRangeEndpointRangesAsync()
{
var textDocumentIdentifier = new TextDocumentIdentifier { Uri = DocumentUri };
var textDocumentIdentifier = new TextDocumentIdentifier { DocumentUri = new(DocumentUri) };
var request = new SemanticTokensRangeParams { Range = Range, TextDocument = textDocumentIdentifier };

await SemanticTokensRangeEndpoint.HandleRequestAsync(request, RequestContext, CancellationToken);
Expand Down
4 changes: 2 additions & 2 deletions src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CapabilitiesManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ private async Task<string> ComputeRootPathAsync()

if (initializeParams.WorkspaceFolders is [var firstFolder, ..])
{
return firstFolder.Uri.GetAbsoluteOrUNCPath();
return firstFolder.DocumentUri.GetAbsoluteOrUNCPath();
}

// WorkspaceFolders was added in LSP3.6, fall back to RootUri

#pragma warning disable CS0618 // Type or member is obsolete
if (initializeParams.RootUri is Uri rootUri)
if (initializeParams.RootDocumentUri is DocumentUri rootUri)
{
return rootUri.GetAbsoluteOrUNCPath();
}
Expand Down
6 changes: 3 additions & 3 deletions ...azor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/RoslynCodeActionHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ public async Task<string> GetFormattedNewFileContentsAsync(IProjectSnapshot proj
{
Project = new TextDocumentIdentifier
{
Uri = new Uri(projectSnapshot.FilePath, UriKind.Absolute)
DocumentUri = new(new Uri(projectSnapshot.FilePath, UriKind.Absolute))
},
Document = new TextDocumentIdentifier
{
Uri = csharpFileUri
DocumentUri = new(csharpFileUri)
},
Contents = newFileContent
};
Expand All @@ -55,7 +55,7 @@ public async Task<string> GetFormattedNewFileContentsAsync(IProjectSnapshot proj
{
var tdi = codeBehindUri is null
? documentContext.GetTextDocumentIdentifierAndVersion()
: new TextDocumentIdentifierAndVersion(new TextDocumentIdentifier() { Uri = codeBehindUri }, 1);
: new TextDocumentIdentifierAndVersion(new TextDocumentIdentifier() { DocumentUri = new(codeBehindUri) }, 1);
var delegatedParams = new DelegatedSimplifyMethodParams(
tdi,
RequiresVirtualDocument: codeBehindUri == null,
Expand Down
Loading
Loading