diff options
| -rw-r--r-- | clang-tools-extra/clangd/Selection.cpp | 4 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/unittests/SelectionTests.cpp | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/clang-tools-extra/clangd/Selection.cpp b/clang-tools-extra/clangd/Selection.cpp index 1424825d82b..04076df0c39 100644 --- a/clang-tools-extra/clangd/Selection.cpp +++ b/clang-tools-extra/clangd/Selection.cpp @@ -10,6 +10,7 @@ #include "Logger.h" #include "SourceCode.h" #include "clang/AST/ASTTypeTraits.h" +#include "clang/AST/DeclCXX.h" #include "clang/AST/Expr.h" #include "clang/AST/PrettyPrinter.h" #include "clang/AST/RecursiveASTVisitor.h" @@ -397,6 +398,9 @@ private: // int (*[[s]])(); else if (auto *VD = llvm::dyn_cast<VarDecl>(D)) return VD->getLocation(); + } else if (const auto* CCI = N.get<CXXCtorInitializer>()) { + // : [[b_]](42) + return CCI->getMemberLocation(); } return SourceRange(); } diff --git a/clang-tools-extra/clangd/unittests/SelectionTests.cpp b/clang-tools-extra/clangd/unittests/SelectionTests.cpp index 8895dd82262..7b8b33d8a25 100644 --- a/clang-tools-extra/clangd/unittests/SelectionTests.cpp +++ b/clang-tools-extra/clangd/unittests/SelectionTests.cpp @@ -246,6 +246,17 @@ TEST(SelectionTest, CommonAncestor) { // Tricky case: two VarDecls share a specifier. {"[[int ^a]], b;", "VarDecl"}, {"[[int a, ^b]];", "VarDecl"}, + // Tricky case: CXXConstructExpr wants to claim the whole init range. + { + R"cpp( + class X { X(int); }; + class Y { + X x; + Y() : [[^x(4)]] {} + }; + )cpp", + "CXXCtorInitializer", // Not the CXXConstructExpr! + }, // Tricky case: anonymous struct is a sibling of the VarDecl. {"[[st^ruct {int x;}]] y;", "CXXRecordDecl"}, {"[[struct {int x;} ^y]];", "VarDecl"}, |
