#include "clang/Tooling/Refactoring/Lookup.h"
#include "TestVisitor.h"
+#include "clang/AST/TypeLoc.h"
+#include "clang/Basic/SourceLocation.h"
using namespace clang;
namespace {
struct GetDeclsVisitor : TestVisitor<GetDeclsVisitor> {
std::function<void(CallExpr *)> OnCall;
std::function<void(RecordTypeLoc)> OnRecordTypeLoc;
+ std::function<void(UsingTypeLoc)> OnUsingTypeLoc;
SmallVector<Decl *, 4> DeclStack;
bool VisitCallExpr(CallExpr *Expr) {
return true;
}
+ bool VisitUsingTypeLoc(UsingTypeLoc Loc) {
+ if (OnUsingTypeLoc)
+ OnUsingTypeLoc(Loc);
+ return true;
+ }
+
bool TraverseDecl(Decl *D) {
DeclStack.push_back(D);
bool Ret = TestVisitor::TraverseDecl(D);
TEST(LookupTest, replaceNestedClassName) {
GetDeclsVisitor Visitor;
- auto replaceRecordTypeLoc = [&](RecordTypeLoc TLoc,
- StringRef ReplacementString) {
- const auto *FD = cast<CXXRecordDecl>(TLoc.getDecl());
+ auto replaceTypeLoc = [&](const NamedDecl *ND, SourceLocation Loc,
+ StringRef ReplacementString) {
return tooling::replaceNestedName(
- nullptr, TLoc.getBeginLoc(), Visitor.DeclStack.back()->getDeclContext(),
- FD, ReplacementString);
+ nullptr, Loc, Visitor.DeclStack.back()->getDeclContext(), ND,
+ ReplacementString);
};
Visitor.OnRecordTypeLoc = [&](RecordTypeLoc Type) {
// Filter Types by name since there are other `RecordTypeLoc` in the test
// file.
if (Type.getDecl()->getQualifiedNameAsString() == "a::b::Foo") {
- EXPECT_EQ("x::Bar", replaceRecordTypeLoc(Type, "::a::x::Bar"));
+ EXPECT_EQ("x::Bar", replaceTypeLoc(Type.getDecl(), Type.getBeginLoc(),
+ "::a::x::Bar"));
}
};
Visitor.runOver("namespace a { namespace b {\n"
"namespace c { Foo f();; }\n"
"} }\n");
- Visitor.OnRecordTypeLoc = [&](RecordTypeLoc Type) {
+ Visitor.OnUsingTypeLoc = [&](UsingTypeLoc Type) {
// Filter Types by name since there are other `RecordTypeLoc` in the test
// file.
// `a::b::Foo` in using shadow decl is not `TypeLoc`.
- if (Type.getDecl()->getQualifiedNameAsString() == "a::b::Foo") {
- EXPECT_EQ("Bar", replaceRecordTypeLoc(Type, "::a::x::Bar"));
+ auto *TD = Type.getFoundDecl()->getTargetDecl();
+ if (TD->getQualifiedNameAsString() == "a::b::Foo") {
+ EXPECT_EQ("Bar", replaceTypeLoc(TD, Type.getBeginLoc(), "::a::x::Bar"));
}
};
Visitor.runOver("namespace a { namespace b { class Foo {}; } }\n"
// it's not visible at [0].
Visitor.OnRecordTypeLoc = [&](RecordTypeLoc Type) {
if (Type.getDecl()->getQualifiedNameAsString() == "x::y::Old") {
- EXPECT_EQ("Foo", replaceRecordTypeLoc(Type, "::x::Foo"));
+ EXPECT_EQ("Foo",
+ replaceTypeLoc(Type.getDecl(), Type.getBeginLoc(), "::x::Foo"));
}
};
Visitor.runOver(R"(