Author: Haojian Wu Date: 2019-10-24T10:25:16+02:00 New Revision: bf71e4fe0a68085d29e9e883da1f17ae73945643
URL: https://github.com/llvm/llvm-project/commit/bf71e4fe0a68085d29e9e883da1f17ae73945643 DIFF: https://github.com/llvm/llvm-project/commit/bf71e4fe0a68085d29e9e883da1f17ae73945643.diff LOG: [clangd] Collect name references in the index. Summary: This is used for cross-file rename. When renaming a class, we expect to rename all related constructors/destructors. Reviewers: kadircet, ilya-biryukov Subscribers: MaskRay, jkorous, arphaman, usaxena95, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D69338 Added: Modified: clang-tools-extra/clangd/index/SymbolCollector.cpp clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/index/SymbolCollector.cpp b/clang-tools-extra/clangd/index/SymbolCollector.cpp index 269a699b90ef..b0932dcf97ad 100644 --- a/clang-tools-extra/clangd/index/SymbolCollector.cpp +++ b/clang-tools-extra/clangd/index/SymbolCollector.cpp @@ -263,10 +263,6 @@ bool SymbolCollector::handleDeclOccurence( Decl::FriendObjectKind::FOK_None) && !(Roles & static_cast<unsigned>(index::SymbolRole::Definition))) return true; - // Skip non-semantic references, we should start processing these when we - // decide to implement renaming with index support. - if ((Roles & static_cast<unsigned>(index::SymbolRole::NameReference))) - return true; // A declaration created for a friend declaration should not be used as the // canonical declaration in the index. Use OrigD instead, unless we've already // picked a replacement for D diff --git a/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp b/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp index af1729e3c9e9..798c5bbcd4e6 100644 --- a/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp +++ b/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp @@ -626,6 +626,23 @@ TEST_F(SymbolCollectorTest, Refs) { EXPECT_THAT(Refs, Not(Contains(Pair(findSymbol(MainSymbols, "c").ID, _)))); } +TEST_F(SymbolCollectorTest, NameReferences) { + CollectorOpts.RefFilter = RefKind::All; + CollectorOpts.RefsInHeaders = true; + Annotations Header(R"( + class [[Foo]] { + public: + [[Foo]]() {} + ~[[Foo]]() {} + }; + )"); + CollectorOpts.RefFilter = RefKind::All; + runSymbolCollector(Header.code(), ""); + // When we find references for class Foo, we expect to see all + // constructor/destructor references. + EXPECT_THAT(Refs, Contains(Pair(findSymbol(Symbols, "Foo").ID, + HaveRanges(Header.ranges())))); +} TEST_F(SymbolCollectorTest, HeaderAsMainFile) { CollectorOpts.RefFilter = RefKind::All; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
