[clang-tools-extra] [clangd] Fix call hierarchy to show all callers with same signature (PR #214344)
via cfe-commits
cfe-commits at lists.llvm.org
Thu Nov 12 23:04:14 PST 2026
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff origin/main HEAD --extensions cpp -- clang-tools-extra/clangd/unittests/CallHierarchyMultipleCallersTest.cpp clang-tools-extra/clangd/XRefs.cpp --diff_from_common_commit
``````````
:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/clang-tools-extra/clangd/XRefs.cpp b/clang-tools-extra/clangd/XRefs.cpp
index 8bc7928f2..1718c050b 100644
--- a/clang-tools-extra/clangd/XRefs.cpp
+++ b/clang-tools-extra/clangd/XRefs.cpp
@@ -2622,8 +2622,8 @@ incomingCalls(const CallHierarchyItem &Item, const SymbolIndex *Index) {
// caller is declared in a different file than the calls (e.g. a
// macro-expanded function from a header), which the protocol cannot
// represent as ranges, so we keep the caller's own location.
- auto SymLoc = Caller.Definition ? Caller.Definition
- : Caller.CanonicalDeclaration;
+ auto SymLoc =
+ Caller.Definition ? Caller.Definition : Caller.CanonicalDeclaration;
auto SymFile = indexToLSPLocation(SymLoc, Item.uri.file());
bool IsDefinedInCallFile = false;
if (SymFile) {
diff --git a/clang-tools-extra/clangd/unittests/CallHierarchyMultipleCallersTest.cpp b/clang-tools-extra/clangd/unittests/CallHierarchyMultipleCallersTest.cpp
index 445ef31be..8856e0004 100644
--- a/clang-tools-extra/clangd/unittests/CallHierarchyMultipleCallersTest.cpp
+++ b/clang-tools-extra/clangd/unittests/CallHierarchyMultipleCallersTest.cpp
@@ -102,9 +102,8 @@ TEST(CallHierarchyMultipleCallers, IncomingSameSignatureDifferentFiles) {
<< "Expected 2 callers (main from binary1_main and binary2_main), got "
<< Incoming.size();
if (Incoming.size() >= 2) {
- EXPECT_THAT(Incoming,
- UnorderedElementsAre(from(withName("main")),
- from(withName("main"))));
+ EXPECT_THAT(Incoming, UnorderedElementsAre(from(withName("main")),
+ from(withName("main"))));
}
}
@@ -166,9 +165,8 @@ TEST(CallHierarchyMultipleCallers, IncomingSameHelperInDifferentBinaries) {
<< "Expected 2 callers (process from binary1 and binary2), got "
<< Incoming.size();
if (Incoming.size() >= 2) {
- EXPECT_THAT(Incoming,
- UnorderedElementsAre(from(withName("process")),
- from(withName("process"))));
+ EXPECT_THAT(Incoming, UnorderedElementsAre(from(withName("process")),
+ from(withName("process"))));
}
}
@@ -284,9 +282,8 @@ TEST(CallHierarchyMultipleCallers, IncomingDistinctCallersInSameFile) {
EXPECT_EQ(Incoming.size(), 2u)
<< "Expected 2 callers (caller1 and caller2), got " << Incoming.size();
if (Incoming.size() >= 2) {
- EXPECT_THAT(Incoming,
- UnorderedElementsAre(from(withName("caller1")),
- from(withName("caller2"))));
+ EXPECT_THAT(Incoming, UnorderedElementsAre(from(withName("caller1")),
+ from(withName("caller2"))));
}
}
@@ -312,12 +309,12 @@ TEST(CallHierarchyMultipleCallers, IncomingManySameSignatureCallers) {
const int NumBinaries = 5;
for (int I = 0; I < NumBinaries; ++I) {
std::string Filename = "binary" + std::to_string(I) + "_process.cpp";
- std::string Code =
- "#include \"util.h\"\n"
- "int process() {\n"
- " return util::add(" + std::to_string(I) + ", " +
- std::to_string(I + 1) + ");\n"
- "}\n";
+ std::string Code = "#include \"util.h\"\n"
+ "int process() {\n"
+ " return util::add(" +
+ std::to_string(I) + ", " + std::to_string(I + 1) +
+ ");\n"
+ "}\n";
Workspace.addMainFile(Filename, Code);
}
``````````
</details>
https://github.com/llvm/llvm-project/pull/214344
More information about the cfe-commits
mailing list