Skip to content

Update C# code when Razor components are renamed #12534

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
davidwengier merged 16 commits into from
Dec 7, 2025
Merged

Update C# code when Razor components are renamed #12534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1b5a69f
Failing tests
davidwengier Nov 26, 2025
0ce03d8
Call Roslyn to get additional edits when renaming components
davidwengier Nov 26, 2025
ad9715a
Call our edit helper when mapping edits so we get the full capabiliti…
davidwengier Nov 26, 2025
5cb34b5
When editing a start tag, edit the end tag too
davidwengier Nov 26, 2025
cec69d7
Ensure tooling doesn't see intermediate state changes in the source g…
davidwengier Nov 26, 2025
a6fb3ce
Update old test mocks
davidwengier Nov 26, 2025
ed4e474
Add `@bind` test
davidwengier Dec 1, 2025
45ad529
Merge remote-tracking branch 'upstream/main' into RenameCSharpWhenRen…
davidwengier Dec 1, 2025
ee157f1
Rename after merge
davidwengier Dec 1, 2025
7f85d0f
Filter out empty edits while also mapping in place
davidwengier Dec 1, 2025
38ad2b7
FIx test
davidwengier Dec 1, 2025
90bace2
Merge remote-tracking branch 'upstream/main' into RenameCSharpWhenRen…
davidwengier Dec 1, 2025
fe984e1
Bump Roslyn to 5.3.0-2.25601.4
davidwengier Dec 4, 2025
efc3272
Theorise a test
davidwengier Dec 4, 2025
4c217f5
Merge remote-tracking branch 'upstream/main' into RenameCSharpWhenRen…
davidwengier Dec 6, 2025
2c0aab5
Fix after merge
davidwengier Dec 6, 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
42 changes: 21 additions & 21 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/roslyn dependencies -->
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisAnalyzersPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
<MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.3.0-2.25567.17</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.3.0-2.25567.17</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.25567.17</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.3.0-2.25567.17</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisAnalyzersPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
<MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.3.0-2.25601.4</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.3.0-2.25601.4</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.25601.4</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.3.0-2.25601.4</MicrosoftVisualStudioLanguageServicesPackageVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25603.3</MicrosoftDotNetArcadeSdkPackageVersion>
<!-- dotnet/aspnetcore dependencies -->
Expand Down
84 changes: 42 additions & 42 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,89 @@
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="29eefe27a350eb8b0bcbababa7863a0d1086295d" BarId="293166" />
<ProductDependencies>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0-2.25567.17">
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0-2.25601.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f38878a015e28dedf874b0c98b15bd14906dab63</Sha>
<Sha>a618d6246ead857f8c7de055bfde0f3438aa136a</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
2 changes: 2 additions & 0 deletions ...ler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Syntax/BaseMarkupStartTagSyntax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,6 @@ static bool IsValidToken(SyntaxToken token, out SyntaxToken validToken)
return false;
}
}

public abstract BaseMarkupEndTagSyntax? GetEndTag();
}
5 changes: 5 additions & 0 deletions ...ompiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Syntax/MarkupStartTagSyntax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,9 @@ public bool IsVoidElement()
{
return ParserHelpers.VoidElements.Contains(Name.Content);
}

public override BaseMarkupEndTagSyntax? GetEndTag()
{
return (Parent as MarkupElementSyntax)?.EndTag;
}
}
12 changes: 12 additions & 0 deletions ...icrosoft.CodeAnalysis.Razor.Compiler/src/Language/Syntax/MarkupTagHelperStartTagSyntax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

namespace Microsoft.AspNetCore.Razor.Language.Syntax;

internal partial class MarkupTagHelperStartTagSyntax
{
public override BaseMarkupEndTagSyntax? GetEndTag()
{
return (Parent as MarkupTagHelperElementSyntax)?.EndTag;
}
}
4 changes: 3 additions & 1 deletion src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LspEditMappingService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@
using Microsoft.AspNetCore.Razor.PooledObjects;
using Microsoft.CodeAnalysis.Razor.DocumentMapping;
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
using Microsoft.CodeAnalysis.Razor.Telemetry;
using Microsoft.CodeAnalysis.Razor.Workspaces;

namespace Microsoft.AspNetCore.Razor.LanguageServer;

internal sealed class LspEditMappingService(
IDocumentMappingService documentMappingService,
ITelemetryReporter telemetryReporter,
IFilePathService filePathService,
IDocumentContextFactory documentContextFactory) : AbstractEditMappingService(documentMappingService, filePathService)
IDocumentContextFactory documentContextFactory) : AbstractEditMappingService(documentMappingService, telemetryReporter, filePathService)
{
private readonly IFilePathService _filePathService = filePathService;
private readonly IDocumentContextFactory _documentContextFactory = documentContextFactory;
Expand Down
Loading