sammccall created this revision.
sammccall added a reviewer: nridge.
Herald added subscribers: kadircet, arphaman.
Herald added a project: All.
sammccall requested review of this revision.
Herald added subscribers: cfe-commits, MaskRay, ilya-biryukov.
Herald added a project: clang-tools-extra.
This behavior was once deliberate, but i've yet to find someone who likes it.
The reference behavior is unchanged: the `foo` within ~foo is still considered
a reference to the type. This means rename etc still works.
fixes https://github.com/clangd/clangd/issues/179
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D136212
Files:
clang-tools-extra/clangd/Selection.cpp
clang-tools-extra/clangd/unittests/SelectionTests.cpp
Index: clang-tools-extra/clangd/unittests/SelectionTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/SelectionTests.cpp
+++ clang-tools-extra/clangd/unittests/SelectionTests.cpp
@@ -466,7 +466,9 @@
{"struct foo { [[int has^h<:32:>]]; };", "FieldDecl"},
{"struct foo { [[op^erator int()]]; };", "CXXConversionDecl"},
{"struct foo { [[^~foo()]]; };", "CXXDestructorDecl"},
- // FIXME: The following to should be class itself instead.
+ {"struct foo { [[~^foo()]]; };", "CXXDestructorDecl"},
+ {"template <class T> struct foo { ~foo<[[^T]]>(){} };",
"TemplateTypeParmTypeLoc"},
+ {"struct foo {}; void bar(foo *f) { [[f->~^foo]](); }", "MemberExpr"},
{"struct foo { [[fo^o(){}]] };", "CXXConstructorDecl"},
{R"cpp(
Index: clang-tools-extra/clangd/Selection.cpp
===================================================================
--- clang-tools-extra/clangd/Selection.cpp
+++ clang-tools-extra/clangd/Selection.cpp
@@ -860,7 +860,7 @@
// is not available to the node's children.
// Usually empty, but sometimes children cover tokens but shouldn't own them.
SourceRange earlySourceRange(const DynTypedNode &N) {
- if (const Decl *D = N.get<Decl>()) {
+ if (const Decl *VD = N.get<VarDecl>()) {
// We want the name in the var-decl to be claimed by the decl itself and
// not by any children. Ususally, we don't need this, because source
// ranges of children are not overlapped with their parent's.
@@ -869,8 +869,22 @@
// auto fun = [bar = foo]() { ... }
// ~~~~~~~~~ VarDecl
// ~~~ |- AutoTypeLoc
- if (const auto *DD = llvm::dyn_cast<VarDecl>(D))
- return DD->getLocation();
+ return VD->getLocation();
+ }
+
+ // When declaring a destructor ~Foo(), attribute Foo to the destructor
+ // rather than the TypeLoc nested inside it.
+ // We still traverse the TypeLoc, because it may contain other targeted
+ // things like the T in ~Foo<T>().
+ if (const auto *CDD = N.get<CXXDestructorDecl>())
+ return CDD->getNameInfo().getNamedTypeInfo()->getTypeLoc().getBeginLoc();
+ if (const Stmt *S = N.get<MemberExpr>()) {
+ if (const auto *ME = llvm::dyn_cast<MemberExpr>(S)) {
+ auto NameInfo = ME->getMemberNameInfo();
+ llvm::errs() << "name " << NameInfo.getAsString() << "\n";
+ if (NameInfo.getName().getNameKind() ==
DeclarationName::CXXDestructorName)
+ return NameInfo.getNamedTypeInfo()->getTypeLoc().getBeginLoc();
+ }
}
return SourceRange();
Index: clang-tools-extra/clangd/unittests/SelectionTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/SelectionTests.cpp
+++ clang-tools-extra/clangd/unittests/SelectionTests.cpp
@@ -466,7 +466,9 @@
{"struct foo { [[int has^h<:32:>]]; };", "FieldDecl"},
{"struct foo { [[op^erator int()]]; };", "CXXConversionDecl"},
{"struct foo { [[^~foo()]]; };", "CXXDestructorDecl"},
- // FIXME: The following to should be class itself instead.
+ {"struct foo { [[~^foo()]]; };", "CXXDestructorDecl"},
+ {"template <class T> struct foo { ~foo<[[^T]]>(){} };", "TemplateTypeParmTypeLoc"},
+ {"struct foo {}; void bar(foo *f) { [[f->~^foo]](); }", "MemberExpr"},
{"struct foo { [[fo^o(){}]] };", "CXXConstructorDecl"},
{R"cpp(
Index: clang-tools-extra/clangd/Selection.cpp
===================================================================
--- clang-tools-extra/clangd/Selection.cpp
+++ clang-tools-extra/clangd/Selection.cpp
@@ -860,7 +860,7 @@
// is not available to the node's children.
// Usually empty, but sometimes children cover tokens but shouldn't own them.
SourceRange earlySourceRange(const DynTypedNode &N) {
- if (const Decl *D = N.get<Decl>()) {
+ if (const Decl *VD = N.get<VarDecl>()) {
// We want the name in the var-decl to be claimed by the decl itself and
// not by any children. Ususally, we don't need this, because source
// ranges of children are not overlapped with their parent's.
@@ -869,8 +869,22 @@
// auto fun = [bar = foo]() { ... }
// ~~~~~~~~~ VarDecl
// ~~~ |- AutoTypeLoc
- if (const auto *DD = llvm::dyn_cast<VarDecl>(D))
- return DD->getLocation();
+ return VD->getLocation();
+ }
+
+ // When declaring a destructor ~Foo(), attribute Foo to the destructor
+ // rather than the TypeLoc nested inside it.
+ // We still traverse the TypeLoc, because it may contain other targeted
+ // things like the T in ~Foo<T>().
+ if (const auto *CDD = N.get<CXXDestructorDecl>())
+ return CDD->getNameInfo().getNamedTypeInfo()->getTypeLoc().getBeginLoc();
+ if (const Stmt *S = N.get<MemberExpr>()) {
+ if (const auto *ME = llvm::dyn_cast<MemberExpr>(S)) {
+ auto NameInfo = ME->getMemberNameInfo();
+ llvm::errs() << "name " << NameInfo.getAsString() << "\n";
+ if (NameInfo.getName().getNameKind() == DeclarationName::CXXDestructorName)
+ return NameInfo.getNamedTypeInfo()->getTypeLoc().getBeginLoc();
+ }
}
return SourceRange();
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
