Skip to content

[clangd] Reduce superfluous rename conflicts #121515

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 1 commit into from
Feb 27, 2025
Merged

[clangd] Reduce superfluous rename conflicts #121515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions clang-tools-extra/clangd/refactor/Rename.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,8 @@ const NamedDecl *lookupSiblingWithinEnclosingScope(ASTContext &Ctx,
for (const auto &Child : DS->getDeclGroup())
if (const auto *ND = dyn_cast<NamedDecl>(Child))
if (ND != &RenamedDecl && ND->getDeclName().isIdentifier() &&
ND->getName() == Name)
ND->getName() == Name &&
ND->getIdentifierNamespace() & RenamedDecl.getIdentifierNamespace())
return ND;
return nullptr;
};
Expand Down Expand Up @@ -380,7 +381,9 @@ const NamedDecl *lookupSiblingWithinEnclosingScope(ASTContext &Ctx,
// Also check if there is a name collision with function arguments.
if (const auto *Function = ScopeParent->get<FunctionDecl>())
for (const auto *Parameter : Function->parameters())
if (Parameter->getName() == NewName)
if (Parameter->getName() == NewName &&
Parameter->getIdentifierNamespace() &
RenamedDecl.getIdentifierNamespace())
return Parameter;
return nullptr;
}
Expand All @@ -405,7 +408,9 @@ const NamedDecl *lookupSiblingWithinEnclosingScope(ASTContext &Ctx,
if (const auto *EnclosingFunction = Parent->get<FunctionDecl>()) {
// Check for conflicts with other arguments.
for (const auto *Parameter : EnclosingFunction->parameters())
if (Parameter != &RenamedDecl && Parameter->getName() == NewName)
if (Parameter != &RenamedDecl && Parameter->getName() == NewName &&
Parameter->getIdentifierNamespace() &
RenamedDecl.getIdentifierNamespace())
return Parameter;
// FIXME: We don't modify all references to function parameters when
// renaming from forward declaration now, so using a name colliding with
Expand Down Expand Up @@ -450,7 +455,8 @@ const NamedDecl *lookupSiblingsWithinContext(ASTContext &Ctx,
}
// Lookup may contain the RenameDecl itself, exclude it.
for (const auto *D : LookupResult)
if (D->getCanonicalDecl() != RenamedDecl.getCanonicalDecl())
if (D->getCanonicalDecl() != RenamedDecl.getCanonicalDecl() &&
D->getIdentifierNamespace() & RenamedDecl.getIdentifierNamespace())
return D;
return nullptr;
}
Expand Down
33 changes: 33 additions & 0 deletions clang-tools-extra/clangd/unittests/RenameTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,6 +1269,39 @@ TEST(RenameTest, Renameable) {
)cpp",
"conflict", !HeaderFile, "Conflict"},

{R"cpp(
struct conflict {};
enum v^ar {};
)cpp",
"conflict", !HeaderFile, "conflict"},

{R"cpp(
struct conflict {};
int [[v^ar]];
)cpp",
nullptr, !HeaderFile, "conflict"},

{R"cpp(
enum conflict {};
int [[v^ar]];
)cpp",
nullptr, !HeaderFile, "conflict"},

{R"cpp(
void func(int conflict) {
struct [[t^ag]] {};
}
)cpp",
nullptr, !HeaderFile, "conflict"},

{R"cpp(
void func(void) {
struct conflict {};
int [[v^ar]];
}
)cpp",
nullptr, !HeaderFile, "conflict"},

{R"cpp(
void func(int);
void [[o^therFunc]](double);
Expand Down