[clangd] exclude symbols from document outline which do not originate from the main file

[kadircet]

thanks for the fix, a small comment about testing though.

clang-tools-extra/clangd/unittests/FindSymbolsTests.cpp

532

we already have a test case for this but it was passing erroneously, as the include was part of the preamble and never subject to documentoutline traversal.

can you rather update this test to look like:

int DeclarationToFinishPreamble;
#inclube "bar.h"
int test() {}

[ilya-golovenko]

Update existing test and remove redundant one

[ilya-golovenko]

@kadircet Thank you for review!

[kadircet]

btw, do you have commit access or should i land this for you ? (if so please provide your email)

[ilya-golovenko]

In D94753#2500535, @kadircet wrote:

btw, do you have commit access or should i land this for you ? (if so please provide your email)

I've got commit access some time ago. Thanks again!

clang-tools-extra/clangd/FindSymbols.cpp

for (auto &TopLevel : AST.getLocalTopLevelDecls())
       traverseDecl(TopLevel, Results);
     return Results;
   }
 
 private:
   enum class VisitKind { No, OnlyDecl, OnlyChildren, DeclAndChildren };
 
   void traverseDecl(Decl *D, std::vector<DocumentSymbol> &Results) {
+    // Skip symbols which do not originate from the main file.
+    if (!isInsideMainFile(D->getLocation(), AST.getSourceManager()))
+      return;
+
     if (auto *Templ = llvm::dyn_cast<TemplateDecl>(D)) {
       // TemplatedDecl might be null, e.g. concepts.
       if (auto *TD = Templ->getTemplatedDecl())
         D = TD;
     }
 
     VisitKind Visit = shouldVisit(D);
     if (Visit == VisitKind::No)

clang-tools-extra/clangd/unittests/FindSymbolsTests.cpp

TU.Code = R"cpp(
       void foo();
       class Foo {};
       })cpp";
 
   EXPECT_THAT(getSymbols(TU.build()),
               ElementsAre(WithName("foo"), WithName("Foo")));
 }
 
+TEST(DocumentSymbols, InMainFile) {
+  TestTU TU;
+  TU.AdditionalFiles["bar.h"] = "void bar();";
+  TU.Code = R"cpp(
+      namespace ns {
+      #include "bar.h"
+      void foo();
+      })cpp";
+
+  EXPECT_THAT(getSymbols(TU.build()),
+              ElementsAre(AllOf(WithName("ns"), Children(WithName("foo")))));
+}
+
 TEST(DocumentSymbols, NoLocals) {
   TestTU TU;
   TU.Code = R"cpp(
       void test(int FirstParam, int SecondParam) {
         struct LocalClass {};
         int local_var;
       })cpp";
   EXPECT_THAT(getSymbols(TU.build()), ElementsAre(WithName("test")));
EXPECT_THAT(
       ElementsAre(
           AllOf(WithName("(anonymous struct)"), WithKind(SymbolKind::Struct),
                 Children(AllOf(WithName("InUnnamed"),
                                WithKind(SymbolKind::Field), Children()))),
           AllOf(WithName("UnnamedStruct"), WithKind(SymbolKind::Variable),
                 Children())));
 }
 
 TEST(DocumentSymbols, InHeaderFile) {
   TestTU TU;
   TU.AdditionalFiles["bar.h"] = R"cpp(
       int foo() {
       }
       )cpp";
   TU.Code = R"cpp(
       #include "bar.h"
       int test() {