This revision was automatically updated to reflect the committed changes.
kadircet marked an inline comment as done.
Closed by commit rG3d735480bd2a: [clangd] SelectionTree should prefer lexical
declcontext (authored by kadircet).
Changed prior to commit:
https://reviews.llvm.org/D112712?vs=383008&id=383048#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D112712/new/
https://reviews.llvm.org/D112712
Files:
clang-tools-extra/clangd/Selection.cpp
clang-tools-extra/clangd/Selection.h
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
@@ -739,6 +739,21 @@
EXPECT_EQ(1u, Seen) << "one tree for nontrivial selection";
}
+TEST(SelectionTest, DeclContextIsLexical) {
+ llvm::Annotations Test("namespace a { void $1^foo(); } void a::$2^foo();");
+ auto AST = TestTU::withCode(Test.code()).build();
+ {
+ auto ST = SelectionTree::createRight(AST.getASTContext(), AST.getTokens(),
+ Test.point("1"), Test.point("1"));
+ EXPECT_FALSE(ST.commonAncestor()->getDeclContext().isTranslationUnit());
+ }
+ {
+ auto ST = SelectionTree::createRight(AST.getASTContext(), AST.getTokens(),
+ Test.point("2"), Test.point("2"));
+ EXPECT_TRUE(ST.commonAncestor()->getDeclContext().isTranslationUnit());
+ }
+}
+
} // namespace
} // namespace clangd
} // namespace clang
Index: clang-tools-extra/clangd/Selection.h
===================================================================
--- clang-tools-extra/clangd/Selection.h
+++ clang-tools-extra/clangd/Selection.h
@@ -128,8 +128,8 @@
DynTypedNode ASTNode;
// The extent to which this node is covered by the selection.
Selection Selected;
- // Walk up the AST to get the DeclContext of this Node,
- // which is not the node itself.
+ // Walk up the AST to get the lexical DeclContext of this Node, which is
not
+ // the node itself.
const DeclContext &getDeclContext() const;
// Printable node kind, like "CXXRecordDecl" or "AutoTypeLoc".
std::string kind() const;
Index: clang-tools-extra/clangd/Selection.cpp
===================================================================
--- clang-tools-extra/clangd/Selection.cpp
+++ clang-tools-extra/clangd/Selection.cpp
@@ -897,7 +897,7 @@
if (CurrentNode != this)
if (auto *DC = dyn_cast<DeclContext>(Current))
return *DC;
- return *Current->getDeclContext();
+ return *Current->getLexicalDeclContext();
}
}
llvm_unreachable("A tree must always be rooted at TranslationUnitDecl.");
Index: clang-tools-extra/clangd/unittests/SelectionTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/SelectionTests.cpp
+++ clang-tools-extra/clangd/unittests/SelectionTests.cpp
@@ -739,6 +739,21 @@
EXPECT_EQ(1u, Seen) << "one tree for nontrivial selection";
}
+TEST(SelectionTest, DeclContextIsLexical) {
+ llvm::Annotations Test("namespace a { void $1^foo(); } void a::$2^foo();");
+ auto AST = TestTU::withCode(Test.code()).build();
+ {
+ auto ST = SelectionTree::createRight(AST.getASTContext(), AST.getTokens(),
+ Test.point("1"), Test.point("1"));
+ EXPECT_FALSE(ST.commonAncestor()->getDeclContext().isTranslationUnit());
+ }
+ {
+ auto ST = SelectionTree::createRight(AST.getASTContext(), AST.getTokens(),
+ Test.point("2"), Test.point("2"));
+ EXPECT_TRUE(ST.commonAncestor()->getDeclContext().isTranslationUnit());
+ }
+}
+
} // namespace
} // namespace clangd
} // namespace clang
Index: clang-tools-extra/clangd/Selection.h
===================================================================
--- clang-tools-extra/clangd/Selection.h
+++ clang-tools-extra/clangd/Selection.h
@@ -128,8 +128,8 @@
DynTypedNode ASTNode;
// The extent to which this node is covered by the selection.
Selection Selected;
- // Walk up the AST to get the DeclContext of this Node,
- // which is not the node itself.
+ // Walk up the AST to get the lexical DeclContext of this Node, which is not
+ // the node itself.
const DeclContext &getDeclContext() const;
// Printable node kind, like "CXXRecordDecl" or "AutoTypeLoc".
std::string kind() const;
Index: clang-tools-extra/clangd/Selection.cpp
===================================================================
--- clang-tools-extra/clangd/Selection.cpp
+++ clang-tools-extra/clangd/Selection.cpp
@@ -897,7 +897,7 @@
if (CurrentNode != this)
if (auto *DC = dyn_cast<DeclContext>(Current))
return *DC;
- return *Current->getDeclContext();
+ return *Current->getLexicalDeclContext();
}
}
llvm_unreachable("A tree must always be rooted at TranslationUnitDecl.");
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
