Add support for renaming nested types with Outer.Inner.cs file naming convention #80727
+247
−5
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #60698
This PR adds support for renaming files that follow the
Outer.Inner.cs
naming convention when renaming nested types. Previously, when renaming a nested type in a file named using this convention, the IDE did not offer to rename the file. This is a common pattern used throughout the Roslyn codebase and in many .NET projects for organizing nested types.Problem
When you have a file like
Outer.Inner.cs
containing:And you invoke rename on the
Inner
symbol, the rename dialog did not offer to rename the file. Similarly, renamingOuter
would not suggest updating the filename.Solution
This PR enhances the rename infrastructure to:
Inner
insideOuter
matches fileOuter.Inner.cs
)A.B.C.cs
for three or more levels of nestingExamples
Renaming the inner type:
Outer.Inner.cs
→Outer.Foo.cs
class Inner
→class Foo
Renaming the outer type:
Outer.Inner.cs
→Bar.Inner.cs
class Outer
→class Bar
Multi-level nesting:
A.B.C.cs
→A.X.C.cs
class B
→class X
(middle type renamed)Implementation Details
WorkspacePathUtilities.cs
Added three new methods to support nested type matching:
SymbolMatchesDocumentName()
- Checks if a symbol's full type hierarchy matches the document name patternGetTypeHierarchy()
- Extracts the containment chain from outermost to innermost typeGetNewDocumentNameForSymbolRename()
- Generates the new filename when a type in the hierarchy is renamedAbstractEditorInlineRenameService.SymbolRenameInfo.cs
Enhanced
GetFileRenameInfo()
to check for nested type patterns in addition to simple type names, returningInlineRenameFileRenameInfo.Allowed
when a match is found.Renamer.RenameSymbolDocumentAction.cs
Updated
GetMatchingTypeDeclarationAsync()
andAnalyzeAsync()
to find and match nested types with document names. Optimized to only create semantic models when the document name contains dots (indicating potential nested types).Testing
Added six comprehensive test cases in
CSharpRenamerTests.cs
covering:Technical Considerations
SymbolEqualityComparer.Default
for proper symbol equality checks.Original prompt
Fixes #60054
💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.