nridge created this revision.
nridge added a reviewer: sammccall.
Herald added subscribers: cfe-commits, usaxena95, kadircet, arphaman, jkorous,
MaskRay, ilya-biryukov.
Herald added a project: clang.
nridge marked an inline comment as done.
nridge added inline comments.
================
Comment at: clang-tools-extra/clangd/XRefs.cpp:234
ParsedAST &AST, llvm::StringRef MainFilePath,
- const SymbolIndex *Index) {
+ const SymbolIndex *Index, bool *IsDependentName) {
const SourceManager &SM = AST.getSourceManager();
----------------
In the future, I can envision expanding this to return additional information,
possibly the AST node itself. For now, I just started with a boolean.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D76451
Files:
clang-tools-extra/clangd/XRefs.cpp
clang-tools-extra/clangd/XRefs.h
clang-tools-extra/clangd/unittests/XRefsTests.cpp
Index: clang-tools-extra/clangd/unittests/XRefsTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/XRefsTests.cpp
+++ clang-tools-extra/clangd/unittests/XRefsTests.cpp
@@ -647,14 +647,40 @@
int myFunction(int);
// Not triggered for token which survived preprocessing.
int var = m^yFunction();
- )cpp",
+ )cpp"};
+
+ for (const char *Test : Tests) {
+ Annotations T(Test);
+ llvm::Optional<Range> WantDecl;
+ if (!T.ranges().empty())
+ WantDecl = T.range();
+
+ auto TU = TestTU::withCode(T.code());
+
+ auto AST = TU.build();
+ auto Index = TU.index();
+ auto Results = locateSymbolNamedTextuallyAt(
+ AST, Index.get(),
+ cantFail(sourceLocationInMainFile(AST.getSourceManager(), T.point())),
+ testPath(TU.Filename), /*IsDependent=*/false);
+
+ if (!WantDecl) {
+ EXPECT_THAT(Results, IsEmpty()) << Test;
+ } else {
+ ASSERT_THAT(Results, ::testing::SizeIs(1)) << Test;
+ EXPECT_EQ(Results[0].PreferredDeclaration.range, *WantDecl) << Test;
+ }
+ }
+} // namespace
+
+TEST(LocateSymbol, TextualDependent) {
+ const char *Tests[] = {
R"cpp(// Dependent type
struct Foo {
- void uniqueMethodName();
+ void [[uniqueMethodName]]();
};
template <typename T>
void f(T t) {
- // Not triggered for token which survived preprocessing.
t->u^niqueMethodName();
}
)cpp"};
@@ -669,10 +695,10 @@
auto AST = TU.build();
auto Index = TU.index();
- auto Results = locateSymbolNamedTextuallyAt(
- AST, Index.get(),
- cantFail(sourceLocationInMainFile(AST.getSourceManager(), T.point())),
- testPath(TU.Filename));
+ // Need to use locateSymbolAt() since we are testing an
+ // interaction between locateASTReferent() and
+ // locateSymbolNamedTextuallyAt().
+ auto Results = locateSymbolAt(AST, T.point(), Index.get());
if (!WantDecl) {
EXPECT_THAT(Results, IsEmpty()) << Test;
@@ -765,17 +791,18 @@
struct Bar {
void $BarLoc[[uniqueMethodName]]();
};
- // Will call u^niqueMethodName() on t.
template <typename T>
- void f(T t);
+ void f(T t) {
+ t.u^niqueMethodName();
+ }
)cpp");
auto TU = TestTU::withCode(T.code());
auto AST = TU.build();
auto Index = TU.index();
- auto Results = locateSymbolNamedTextuallyAt(
- AST, Index.get(),
- cantFail(sourceLocationInMainFile(AST.getSourceManager(), T.point())),
- testPath(TU.Filename));
+ // Need to use locateSymbolAt() since we are testing an
+ // interaction between locateASTReferent() and
+ // locateSymbolNamedTextuallyAt().
+ auto Results = locateSymbolAt(AST, T.point(), Index.get());
EXPECT_THAT(Results,
UnorderedElementsAre(Sym("uniqueMethodName", T.range("FooLoc")),
Sym("uniqueMethodName", T.range("BarLoc"))));
Index: clang-tools-extra/clangd/XRefs.h
===================================================================
--- clang-tools-extra/clangd/XRefs.h
+++ clang-tools-extra/clangd/XRefs.h
@@ -62,7 +62,7 @@
std::vector<LocatedSymbol>
locateSymbolNamedTextuallyAt(ParsedAST &AST, const SymbolIndex *Index,
SourceLocation Loc,
- const std::string &MainFilePath);
+ const std::string &MainFilePath, bool IsDependent);
/// Get all document links
std::vector<DocumentLink> getDocumentLinks(ParsedAST &AST);
Index: clang-tools-extra/clangd/XRefs.cpp
===================================================================
--- clang-tools-extra/clangd/XRefs.cpp
+++ clang-tools-extra/clangd/XRefs.cpp
@@ -22,6 +22,7 @@
#include "index/Relation.h"
#include "index/SymbolLocation.h"
#include "clang/AST/ASTContext.h"
+#include "clang/AST/ASTTypeTraits.h"
#include "clang/AST/Attr.h"
#include "clang/AST/Attrs.inc"
#include "clang/AST/Decl.h"
@@ -136,19 +137,31 @@
return Merged.CanonicalDeclaration;
}
-std::vector<const NamedDecl *> getDeclAtPosition(ParsedAST &AST,
- SourceLocation Pos,
- DeclRelationSet Relations) {
+bool isDependentName(const DynTypedNode &N) {
+ if (const Stmt *S = N.get<Stmt>()) {
+ return llvm::isa<OverloadExpr>(S) ||
+ llvm::isa<CXXDependentScopeMemberExpr>(S) ||
+ llvm::isa<DependentScopeDeclRefExpr>(S);
+ }
+ return false;
+}
+
+std::vector<const NamedDecl *>
+getDeclAtPosition(ParsedAST &AST, SourceLocation Pos, DeclRelationSet Relations,
+ bool *IsDependentName = nullptr) {
unsigned Offset = AST.getSourceManager().getDecomposedSpellingLoc(Pos).second;
std::vector<const NamedDecl *> Result;
- SelectionTree::createEach(AST.getASTContext(), AST.getTokens(), Offset,
- Offset, [&](SelectionTree ST) {
- if (const SelectionTree::Node *N =
- ST.commonAncestor())
- llvm::copy(targetDecl(N->ASTNode, Relations),
- std::back_inserter(Result));
- return !Result.empty();
- });
+ SelectionTree::createEach(
+ AST.getASTContext(), AST.getTokens(), Offset, Offset,
+ [&](SelectionTree ST) {
+ if (const SelectionTree::Node *N = ST.commonAncestor()) {
+ if (IsDependentName && isDependentName(N->ASTNode))
+ *IsDependentName = true;
+ llvm::copy(targetDecl(N->ASTNode, Relations),
+ std::back_inserter(Result));
+ }
+ return !Result.empty();
+ });
return Result;
}
@@ -218,7 +231,7 @@
std::vector<LocatedSymbol>
locateASTReferent(SourceLocation CurLoc, const syntax::Token *TouchedIdentifier,
ParsedAST &AST, llvm::StringRef MainFilePath,
- const SymbolIndex *Index) {
+ const SymbolIndex *Index, bool *IsDependentName) {
const SourceManager &SM = AST.getSourceManager();
// Results follow the order of Symbols.Decls.
std::vector<LocatedSymbol> Result;
@@ -249,7 +262,8 @@
// Emit all symbol locations (declaration or definition) from AST.
DeclRelationSet Relations =
DeclRelation::TemplatePattern | DeclRelation::Alias;
- for (const NamedDecl *D : getDeclAtPosition(AST, CurLoc, Relations)) {
+ for (const NamedDecl *D :
+ getDeclAtPosition(AST, CurLoc, Relations, IsDependentName)) {
// Special case: void foo() ^override: jump to the overridden method.
if (const auto *CMD = llvm::dyn_cast<CXXMethodDecl>(D)) {
const InheritableAttr *Attr = D->getAttr<OverrideAttr>();
@@ -357,10 +371,9 @@
} // namespace
-std::vector<LocatedSymbol>
-locateSymbolNamedTextuallyAt(ParsedAST &AST, const SymbolIndex *Index,
- SourceLocation Loc,
- const std::string &MainFilePath) {
+std::vector<LocatedSymbol> locateSymbolNamedTextuallyAt(
+ ParsedAST &AST, const SymbolIndex *Index, SourceLocation Loc,
+ const std::string &MainFilePath, bool IsDependent) {
const auto &SM = AST.getSourceManager();
// Get the raw word at the specified location.
@@ -388,8 +401,9 @@
// Do not consider tokens that survived preprocessing.
// We are erring on the safe side here, as a user may expect to get
// accurate (as opposed to textual-heuristic) results for such tokens.
- // FIXME: Relax this for dependent code.
- if (tokenSurvivedPreprocessing(WordStart, AST.getTokens()))
+ // For dependent code, we relax this as a textual heuristic allows us
+ // to find results in cases where AST heuristics fall down.
+ if (!IsDependent && tokenSurvivedPreprocessing(WordStart, AST.getTokens()))
return {};
// Additionally filter for signals that the word is likely to be an
@@ -511,12 +525,14 @@
// expansion.)
return {*std::move(Macro)};
- auto ASTResults =
- locateASTReferent(*CurLoc, TouchedIdentifier, AST, *MainFilePath, Index);
+ bool IsDependentName = false;
+ auto ASTResults = locateASTReferent(*CurLoc, TouchedIdentifier, AST,
+ *MainFilePath, Index, &IsDependentName);
if (!ASTResults.empty())
return ASTResults;
- return locateSymbolNamedTextuallyAt(AST, Index, *CurLoc, *MainFilePath);
+ return locateSymbolNamedTextuallyAt(AST, Index, *CurLoc, *MainFilePath,
+ IsDependentName);
}
std::vector<DocumentLink> getDocumentLinks(ParsedAST &AST) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
