diff --git a/clang-tools-extra/clangd/ClangdUnit.cpp b/clang-tools-extra/clangd/ClangdUnit.cpp --- a/clang-tools-extra/clangd/ClangdUnit.cpp +++ b/clang-tools-extra/clangd/ClangdUnit.cpp @@ -61,6 +61,7 @@ } class DeclTrackingASTConsumer : public ASTConsumer { + SourceManager *SM; public: DeclTrackingASTConsumer(std::vector &TopLevelDecls) : TopLevelDecls(TopLevelDecls) {} @@ -70,6 +71,11 @@ if (D->isFromASTFile()) continue; + if (!SM->isInMainFile(D->getLocation())) + // This decl comes from another file and should not be included in the + // top level decls. + continue; + // ObjCMethodDecl are not actually top-level decls. if (isa(D)) continue; @@ -79,6 +85,10 @@ return true; } + virtual void Initialize(ASTContext &Context) override { + SM = &Context.getSourceManager(); + } + private: std::vector &TopLevelDecls; }; diff --git a/clang-tools-extra/clangd/unittests/ClangdUnitTests.cpp b/clang-tools-extra/clangd/unittests/ClangdUnitTests.cpp --- a/clang-tools-extra/clangd/unittests/ClangdUnitTests.cpp +++ b/clang-tools-extra/clangd/unittests/ClangdUnitTests.cpp @@ -83,6 +83,23 @@ EXPECT_THAT(AST.getLocalTopLevelDecls(), ElementsAre(DeclNamed("main"))); } +TEST(ClangdUnitTest, DoesNotGetIncludedTopDecls) { + TestTU TU; + TU.HeaderCode = R"cpp( + template + struct H { + H() {} + }; + )cpp"; + TU.Code = R"cpp( + int main() { + H h; + } + )cpp"; + auto AST = TU.build(); + EXPECT_THAT(AST.getLocalTopLevelDecls(), ElementsAre(DeclNamed("main"))); +} + TEST(ClangdUnitTest, TokensAfterPreamble) { TestTU TU; TU.AdditionalFiles["foo.h"] = R"(