mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-27 06:16:06 +00:00
Code Issues Projects Releases Wiki Activity

[clangd] Collect main file refs by default

Browse Source 
This is needed for call hierarchy to be able to find callers of
main-file-only functions.

Differential Revision: https://reviews.llvm.org/D92000
This commit is contained in:
Nathan Ridge 2020-11-23 20:59:36 -05:00
parent d5f0d0c0c4
commit c6cb47b640
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang-tools-extra/clangd/ClangdServer.h
View File

@ -106,7 +106,7 @@ public:
bool BackgroundIndex = false;
/// Store refs to main-file symbols in the index.
bool CollectMainFileRefs = false;
bool CollectMainFileRefs = true;
/// If set, use this index to augment code completion results.
SymbolIndex *StaticIndex = nullptr;

2
clang-tools-extra/clangd/tool/ClangdMain.cpp
View File

@ -494,7 +494,7 @@ opt<bool> CollectMainFileRefs{
"collect-main-file-refs",
cat(Misc),
desc("Store references to main-file-only symbols in the index"),
init(false),
init(ClangdServer::Options().CollectMainFileRefs),
};
#if CLANGD_ENABLE_REMOTE

13
clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
View File

@ -188,8 +188,10 @@ TEST_F(BackgroundIndexTest, IndexTwoFiles) {
size_t CacheHits = 0;
MemoryShardStorage MSS(Storage, CacheHits);
OverlayCDB CDB(/*Base=*/nullptr);
BackgroundIndex Idx(FS, CDB, [&](llvm::StringRef) { return &MSS; },
/*Opts=*/{});
BackgroundIndex::Options Opts;
Opts.CollectMainFileRefs = true;
BackgroundIndex Idx(
FS, CDB, [&](llvm::StringRef) { return &MSS; }, Opts);
tooling::CompileCommand Cmd;
Cmd.Filename = testPath("root/A.cc");
@ -201,7 +203,7 @@ TEST_F(BackgroundIndexTest, IndexTwoFiles) {
EXPECT_THAT(runFuzzyFind(Idx, ""),
UnorderedElementsAre(AllOf(Named("common"), NumReferences(1U)),
AllOf(Named("A_CC"), NumReferences(0U)),
AllOf(Named("g"), NumReferences(0U)),
AllOf(Named("g"), NumReferences(1U)),
AllOf(Named("f_b"), Declared(),
Not(Defined()), NumReferences(0U))));
@ -214,7 +216,7 @@ TEST_F(BackgroundIndexTest, IndexTwoFiles) {
EXPECT_THAT(runFuzzyFind(Idx, ""),
UnorderedElementsAre(AllOf(Named("common"), NumReferences(5U)),
AllOf(Named("A_CC"), NumReferences(0U)),
AllOf(Named("g"), NumReferences(0U)),
AllOf(Named("g"), NumReferences(1U)),
AllOf(Named("f_b"), Declared(), Defined(),
NumReferences(1U))));
@ -238,7 +240,8 @@ TEST_F(BackgroundIndexTest, MainFileRefs) {
FS.Files[testPath("root/A.cc")] =
"#include \"A.h\"\nstatic void main_sym() { (void)header_sym; }";
// Check the behaviour with CollectMainFileRefs = false (the default).
// Check the behaviour with CollectMainFileRefs = false (the default
// at the SymbolCollector level).
{
llvm::StringMap<std::string> Storage;
size_t CacheHits = 0;