averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63167 from bnbarham/fix-shadowed-rename

Browse Source 
[Index] Handle shorthand if let/closure captures in local rename
This commit is contained in:
Ben Barham
2023-01-25 09:11:55 -08:00
committed by GitHub
parent c707643396 4cc7167b60
commit 4f70a7676b
7 changed files with 60 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Refactoring/Refactoring.cpp
View File

@@ -912,6 +912,11 @@ bool RefactoringActionLocalRename::performChange() {
auto ValueRefCursorInfo = dyn_cast<ResolvedValueRefCursorInfo>(&CursorInfo);
if (ValueRefCursorInfo && ValueRefCursorInfo->getValueD()) {
ValueDecl *VD = ValueRefCursorInfo->typeOrValue();
// The index always uses the outermost shadow for references
if (!ValueRefCursorInfo->getShorthandShadowedDecls().empty()) {
VD = ValueRefCursorInfo->getShorthandShadowedDecls().back();
}
SmallVector<DeclContext *, 8> Scopes;
Optional<RenameRefInfo> RefInfo;