This is an archive of the discontinued LLVM Phabricator instance.

Differential D153251

[clangd] Index the type of a non-type template parameter
ClosedPublic

Authored by nridge on Jun 19 2023, 12:53 AM.

Details

Reviewers
hokein
Commits
rGc3075023850b: [clangd] Index the type of a non-type template parameter
Summary

Fixes https://github.com/clangd/clangd/issues/1666

Diff Detail

Event Timeline

nridge created this revision.Jun 19 2023, 12:53 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 19 2023, 12:53 AM
Herald added subscribers: kadircet, arphaman. · View Herald Transcript
nridge requested review of this revision.Jun 19 2023, 12:53 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJun 19 2023, 12:53 AM
Herald added subscribers: cfe-commits, MaskRay, ilya-biryukov. · View Herald Transcript
Harbormaster completed remote builds in B239737: Diff 532555.Jun 19 2023, 1:28 AM
hokein added inline comments.Jun 19 2023, 2:35 AM
clang/lib/Index/IndexDecl.cpp
708

since this is a change in clang libindex, I think it would be better to have the unittest in (clang/unittests/Index/IndexTests.cpp).

nridge planned changes to this revision.Jun 19 2023, 11:36 AM
nridge added inline comments.
clang/lib/Index/IndexDecl.cpp
708

Will do

nridge updated this revision to Diff 532798.Jun 19 2023, 11:58 PM

Address review comment

hokein accepted this revision.Jun 20 2023, 12:21 AM

thanks.

This revision is now accepted and ready to land.Jun 20 2023, 12:21 AM
Harbormaster completed remote builds in B239926: Diff 532798.Jun 20 2023, 12:22 AM
Closed by commit rGc3075023850b: [clangd] Index the type of a non-type template parameter (authored by nridge). · Explain WhyJun 20 2023, 12:23 AM
This revision was automatically updated to reflect the committed changes.
nridge added a commit: rGc3075023850b: [clangd] Index the type of a non-type template parameter.

Revision Contents

PathSize
clang/
lib/
Index/
1 line
unittests/
Index/
14 lines

Diff 532807

clang/lib/Index/IndexDecl.cpp

Show First 20 Lines • Show All 699 Lines • ▼ Show 20 Lines for (const NamedDecl *TP : *Params) {
IndexCtx.handleDecl(TP); IndexCtx.handleDecl(TP);
if (const auto *TTP = dyn_cast<TemplateTypeParmDecl>(TP)) { if (const auto *TTP = dyn_cast<TemplateTypeParmDecl>(TP)) {
if (TTP->hasDefaultArgument()) if (TTP->hasDefaultArgument())
IndexCtx.indexTypeSourceInfo(TTP->getDefaultArgumentInfo(), Parent); IndexCtx.indexTypeSourceInfo(TTP->getDefaultArgumentInfo(), Parent);
if (auto *C = TTP->getTypeConstraint()) if (auto *C = TTP->getTypeConstraint())
IndexCtx.handleReference(C->getNamedConcept(), C->getConceptNameLoc(), IndexCtx.handleReference(C->getNamedConcept(), C->getConceptNameLoc(),
Parent, TTP->getLexicalDeclContext()); Parent, TTP->getLexicalDeclContext());
} else if (const auto *NTTP = dyn_cast<NonTypeTemplateParmDecl>(TP)) { } else if (const auto *NTTP = dyn_cast<NonTypeTemplateParmDecl>(TP)) {
IndexCtx.indexTypeSourceInfo(NTTP->getTypeSourceInfo(), Parent);
hokeinUnsubmitted
Not Done
ReplyInline Actions

since this is a change in clang libindex, I think it would be better to have the unittest in (clang/unittests/Index/IndexTests.cpp).

hokein: since this is a change in clang libindex, I think it would be better to have the unittest in…
nridgeAuthorUnsubmitted
Done
ReplyInline Actions

Will do

nridge: Will do
if (NTTP->hasDefaultArgument()) if (NTTP->hasDefaultArgument())
IndexCtx.indexBody(NTTP->getDefaultArgument(), Parent); IndexCtx.indexBody(NTTP->getDefaultArgument(), Parent);
} else if (const auto *TTPD = dyn_cast<TemplateTemplateParmDecl>(TP)) { } else if (const auto *TTPD = dyn_cast<TemplateTemplateParmDecl>(TP)) {
if (TTPD->hasDefaultArgument()) if (TTPD->hasDefaultArgument())
handleTemplateArgumentLoc(TTPD->getDefaultArgument(), Parent, handleTemplateArgumentLoc(TTPD->getDefaultArgument(), Parent,
TP->getLexicalDeclContext()); TP->getLexicalDeclContext());
} }
} }
▲ Show 20 Lines • Show All 102 Lines • Show Last 20 Lines

clang/unittests/Index/IndexTests.cpp

Show First 20 Lines • Show All 386 Lines • ▼ Show 20 LinesTEST(IndexTest, EnumBase) {
tooling::runToolOnCode(std::make_unique<IndexAction>(Index), Code); tooling::runToolOnCode(std::make_unique<IndexAction>(Index), Code);
EXPECT_THAT( EXPECT_THAT(
Index->Symbols, Index->Symbols,
AllOf(Contains(AllOf(QName("MyTypedef"), HasRole(SymbolRole::Reference), AllOf(Contains(AllOf(QName("MyTypedef"), HasRole(SymbolRole::Reference),
WrittenAt(Position(3, 16)))), WrittenAt(Position(3, 16)))),
Contains(AllOf(QName("MyTypedef"), HasRole(SymbolRole::Reference), Contains(AllOf(QName("MyTypedef"), HasRole(SymbolRole::Reference),
WrittenAt(Position(4, 16)))))); WrittenAt(Position(4, 16))))));
} }
TEST(IndexTest, NonTypeTemplateParameter) {
std::string Code = R"cpp(
enum class Foobar { foo };
template <Foobar f>
constexpr void func() {}
)cpp";
auto Index = std::make_shared<Indexer>();
tooling::runToolOnCode(std::make_unique<IndexAction>(Index), Code);
EXPECT_THAT(Index->Symbols,
Contains(AllOf(QName("Foobar"), HasRole(SymbolRole::Reference),
WrittenAt(Position(3, 15)))));
}
} // namespace } // namespace
} // namespace index } // namespace index
} // namespace clang } // namespace clang